inline emax_u()

This commit is contained in:
Devaev Maxim 2018-09-17 21:15:14 +03:00
parent b3bfef2854
commit 912443eafb
3 changed files with 5 additions and 3 deletions

View File

@ -7,7 +7,6 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/param.h>
#include <linux/videodev2.h>
#include "tools.h"
@ -58,7 +57,7 @@ void device_init(struct device_t *dev, struct device_runtime_t *run) {
dev->height = 480;
dev->format = V4L2_PIX_FMT_YUYV;
dev->standard = V4L2_STD_UNKNOWN;
dev->n_buffers = MAX(sysconf(_SC_NPROCESSORS_ONLN), 1) + 1;
dev->n_buffers = max_u(sysconf(_SC_NPROCESSORS_ONLN), 1) + 1;
dev->jpeg_quality = 80;
dev->timeout = 1;
dev->error_timeout = 1;

View File

@ -10,7 +10,6 @@
#include <signal.h>
#include <pthread.h>
#include <getopt.h>
#include <sys/param.h>
#include "tools.h"
#include "device.h"

View File

@ -75,6 +75,10 @@ unsigned log_level;
#define XIOCTL_RETRIES 4
INLINE unsigned max_u(unsigned a, unsigned b) {
return (a > b ? a : b);
}
INLINE void now_ms(time_t *sec, long *msec) {
struct timespec spec;