forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-25 00:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2019-10-10 10:44:12 +03:00
parent 6bc26b734e
commit 6175e6974c
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/options.c
View File

@@ -236,15 +236,6 @@ int parse_options(int argc, char *argv[], struct device_t *dev, struct encoder_t
break; \ break; \
} }
# ifdef WITH_OMX
# define OPT_GLITCHED_RESOLUTIONS { \
if (_parse_glitched_resolutions(optarg, encoder) < 0) { \
return -1; \
} \
break; \
}
# endif
# define OPT_PARSE(_name, _dest, _func, _invalid, _available) { \ # define OPT_PARSE(_name, _dest, _func, _invalid, _available) { \
if ((_dest = _func(optarg)) == _invalid) { \ if ((_dest = _func(optarg)) == _invalid) { \
printf("Unknown " _name ": %s; available: %s\n", optarg, _available); \ printf("Unknown " _name ": %s; available: %s\n", optarg, _available); \
@@ -301,7 +292,11 @@ int parse_options(int argc, char *argv[], struct device_t *dev, struct encoder_t
case _O_QUALITY: OPT_NUMBER("--quality", encoder->quality, 1, 100, 0); case _O_QUALITY: OPT_NUMBER("--quality", encoder->quality, 1, 100, 0);
case _O_ENCODER: OPT_PARSE("encoder type", encoder->type, encoder_parse_type, ENCODER_TYPE_UNKNOWN, ENCODER_TYPES_STR); case _O_ENCODER: OPT_PARSE("encoder type", encoder->type, encoder_parse_type, ENCODER_TYPE_UNKNOWN, ENCODER_TYPES_STR);
# ifdef WITH_OMX # ifdef WITH_OMX
case _O_GLITCHED_RESOLUTIONS: OPT_GLITCHED_RESOLUTIONS; case _O_GLITCHED_RESOLUTIONS:
if (_parse_glitched_resolutions(optarg, encoder) < 0) {
return -1;
}
break;
# endif # endif
case _O_DEVICE_TIMEOUT: OPT_NUMBER("--device-timeout", dev->timeout, 1, 60, 0); case _O_DEVICE_TIMEOUT: OPT_NUMBER("--device-timeout", dev->timeout, 1, 60, 0);
case _O_DEVICE_ERROR_DELAY: OPT_NUMBER("--device-error-delay", dev->error_delay, 1, 60, 0); case _O_DEVICE_ERROR_DELAY: OPT_NUMBER("--device-error-delay", dev->error_delay, 1, 60, 0);
@@ -364,9 +359,6 @@ int parse_options(int argc, char *argv[], struct device_t *dev, struct encoder_t
# undef OPT_CTL_AUTO # undef OPT_CTL_AUTO
# undef OPT_CTL # undef OPT_CTL
# undef OPT_PARSE # undef OPT_PARSE
# ifdef WITH_OMX
# undef OPT_GLITCHED_RESOLUTIONS
# endif
# undef OPT_RESOLUTION # undef OPT_RESOLUTION
# undef OPT_NUMBER # undef OPT_NUMBER
# undef OPT_SET # undef OPT_SET