From aaed14e9def374eac3cb9af1c9c67399743a26f1 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Sat, 13 Jul 2019 01:06:21 +0300 Subject: [PATCH] wider fps and resolution range --- src/device.h | 10 ++++++---- src/main.c | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/device.h b/src/device.h index 70a39f1..7151455 100644 --- a/src/device.h +++ b/src/device.h @@ -28,11 +28,13 @@ #include -#define VIDEO_MIN_WIDTH 320 -#define VIDEO_MAX_WIDTH 1920 +#define VIDEO_MIN_WIDTH 160 +#define VIDEO_MAX_WIDTH 10240 -#define VIDEO_MIN_HEIGHT 180 -#define VIDEO_MAX_HEIGHT 1200 +#define VIDEO_MIN_HEIGHT 120 +#define VIDEO_MAX_HEIGHT 4320 + +#define VIDEO_MAX_FPS 120 #define STANDARD_UNKNOWN V4L2_STD_UNKNOWN #define STANDARDS_STR "PAL, NTSC, SECAM" diff --git a/src/main.c b/src/main.c index 80d9df1..47e98b9 100644 --- a/src/main.c +++ b/src/main.c @@ -381,7 +381,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e case 'm': OPT_PARSE("pixel format", dev->format, device_parse_format, FORMAT_UNKNOWN); # pragma GCC diagnostic pop case 'a': OPT_PARSE("TV standard", dev->standard, device_parse_standard, STANDARD_UNKNOWN); - case 'f': OPT_NUMBER("--desired-fps", dev->desired_fps, 0, 30, 0); + case 'f': OPT_NUMBER("--desired-fps", dev->desired_fps, 0, VIDEO_MAX_FPS, 0); case 'z': OPT_NUMBER("--min-frame-size", dev->min_frame_size, 0, 8192, 0); case 'n': OPT_SET(dev->persistent, true); case 't': OPT_SET(dev->dv_timings, true); @@ -418,7 +418,7 @@ static int _parse_options(int argc, char *argv[], struct device_t *dev, struct e case 3001: OPT_SET(server->passwd, optarg); case 3002: OPT_SET(server->static_path, optarg); case 'k': OPT_SET(server->blank_path, optarg); - case 'e': OPT_NUMBER("--drop-same-frames", server->drop_same_frames, 0, 30, 0); + case 'e': OPT_NUMBER("--drop-same-frames", server->drop_same_frames, 0, VIDEO_MAX_FPS, 0); case 'l': OPT_SET(server->slowdown, true); case 'R': OPT_RESOLUTION("--fake-resolution", server->fake_width, server->fake_height, false); case 3003: OPT_RESOLUTION_OBSOLETE("--fake-width", "--fake-resolution", server->fake_width, 0, UINT_MAX);