Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Simplify V4L2/USB ifdefs

Browse source 
Define local variables whose value depends on ifdefs, to avoid
cluttering all conditions with ifdefs.
This commit is contained in:
Romain Vimont 2023-05-24 20:44:17 +02:00
parent 6ad46d70b8
commit 751c09f47a
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/src/cli.c
View file

@ -1923,11 +1923,16 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
return false; return false;
} }
bool otg = false;
bool v4l2 = false;
#ifdef HAVE_USB #ifdef HAVE_USB
if (!(opts->playback && opts->video) && !opts->otg) { otg = opts->otg;
#else
if (!(opts->playback && opts->video)) {
#endif #endif
#ifdef HAVE_V4L2
v4l2 = !!opts->v4l2_device;
#endif
if (!(opts->playback && opts->video) && !otg) {
// If video playback is disabled and OTG are disabled, then there is // If video playback is disabled and OTG are disabled, then there is
// no way to control the device. // no way to control the device.
opts->control = false; opts->control = false;
@ -1938,14 +1943,14 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
opts->require_audio = true; opts->require_audio = true;
} }
#ifdef HAVE_V4L2 if (!opts->playback && !opts->record_filename && !v4l2) {
if (!opts->playback && !opts->record_filename && !opts->v4l2_device) {
LOGE("-N/--no-playback requires either screen recording (-r/--record)" LOGE("-N/--no-playback requires either screen recording (-r/--record)"
" or sink to v4l2loopback device (--v4l2-sink)"); " or sink to v4l2loopback device (--v4l2-sink)");
return false; return false;
} }
if (opts->v4l2_device) { #ifdef HAVE_V4L2
if (v4l2) {
if (opts->lock_video_orientation == if (opts->lock_video_orientation ==
SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) { SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
LOGI("Video orientation is locked for v4l2 sink. " LOGI("Video orientation is locked for v4l2 sink. "
@ -1963,11 +1968,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
LOGE("V4L2 buffer value without V4L2 sink\n"); LOGE("V4L2 buffer value without V4L2 sink\n");
return false; return false;
} }
#else
if (!opts->playback && !opts->record_filename) {
LOGE("-N/--no-playback requires screen recording (-r/--record)");
return false;
}
#endif #endif
if (opts->audio && !opts->playback && !opts->record_filename) { if (opts->audio && !opts->playback && !opts->record_filename) {
@ -2054,10 +2054,8 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
} }
} }
#ifdef HAVE_USB
# ifdef _WIN32 # ifdef _WIN32
if (!opts->otg && (opts->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID if (!otg && (opts->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID
|| opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID)) { || opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID)) {
LOGE("On Windows, it is not possible to open a USB device already open " LOGE("On Windows, it is not possible to open a USB device already open "
"by another process (like adb)."); "by another process (like adb).");
@ -2067,7 +2065,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
} }
# endif # endif
if (opts->otg) { if (otg) {
// OTG mode is compatible with only very few options. // OTG mode is compatible with only very few options.
// Only report obvious errors. // Only report obvious errors.
if (opts->record_filename) { if (opts->record_filename) {
@ -2094,14 +2092,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
LOGE("OTG mode: could not select display"); LOGE("OTG mode: could not select display");
return false; return false;
} }
# ifdef HAVE_V4L2 if (v4l2) {
if (opts->v4l2_device) {
LOGE("OTG mode: could not sink to V4L2 device"); LOGE("OTG mode: could not sink to V4L2 device");
return false; return false;
} }
# endif
} }
#endif
return true; return true;
} }