Add --ignore-video-encoder-constraints

Add an option to ignore video encoder constraints.

Refs #6829 <#6829>
Refs #6849 <#6849>
Fixes #6848 <#6848>
PR TODO

Author: rom1v

app/data/bash-completion/scrcpy

@@ -34,6 +34,7 @@ _scrcpy() {
         -G
         --gamepad=
         -h --help
+        --ignore-video-encoder-constraints
         -K
         --keep-active
         --keyboard=

app/data/zsh-completion/_scrcpy

@@ -41,6 +41,7 @@ arguments=(
     '-G[Use UHID/AOA gamepad \(same as --gamepad=uhid or --gamepad=aoa, depending on OTG mode\)]'
     '--gamepad=[Set the gamepad input mode]:mode:(disabled uhid aoa)'
     {-h,--help}'[Print the help]'
+    '--ignore-video-encoder-constraints[Do not consider video encoder capabilities]'
     '-K[Use UHID/AOA keyboard \(same as --keyboard=uhid or --keyboard=aoa, depending on OTG mode\)]'
     '--keep-active[Keep the screen on by simulating user activity]'
     '--keyboard=[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'

app/scrcpy.1

@@ -235,6 +235,14 @@ Also see \fB\-\-keyboard\fR and R\fB\-\-mouse\fR.
 .B \-h, \-\-help
 Print this help.
 
+.TP
+.B \-\-ignore\-video\-encoder\-constraints
+Do not consider video encoder capabilities.
+
+This is useful if the reported capabilities are incorrect.
+
+It may help to force a value for \fB\-\-min\-size\-alignment\fR.
+
 .TP
 .B \-K
 Same as \fB\-\-keyboard=uhid\fR, or \fB\-\-keyboard=aoa\fR if \fB\-\-otg\fR is set.

app/src/cli.c

@@ -109,6 +109,7 @@ enum {
     OPT_KEEP_ACTIVE,
     OPT_BACKGROUND_COLOR,
     OPT_RENDER_FIT,
+    OPT_IGNORE_VIDEO_ENCODER_CONSTRAINTS,
 };
 
 struct sc_option {
@@ -428,6 +429,13 @@ static const struct sc_option options[] = {
         .longopt = "help",
         .text = "Print this help.",
     },
+    {
+        .longopt_id = OPT_IGNORE_VIDEO_ENCODER_CONSTRAINTS,
+        .longopt = "ignore-video-encoder-constraints",
+        .text = "Do not consider video encoder capabilities.\n"
+                "This is useful if the reported capabilities are incorrect.\n"
+                "It may help to force a value for --min-size-alignment.",
+    },
     {
         .shortopt = 'K',
         .text = "Same as --keyboard=uhid, or --keyboard=aoa if --otg is set.",
@@ -2917,6 +2925,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             case 'x':
                 opts->flex_display = true;
                 break;
+            case OPT_IGNORE_VIDEO_ENCODER_CONSTRAINTS:
+                opts->ignore_video_encoder_constraints = true;
+                break;
             default:
                 // getopt prints the error message on stderr
                 return false;

app/src/options.c

@@ -121,6 +121,7 @@ const struct scrcpy_options scrcpy_options_default = {
     .camera_torch = false,
     .keep_active = false,
     .flex_display = false,
+    .ignore_video_encoder_constraints = false,
 };
 
 enum sc_orientation

app/src/options.h

@@ -342,6 +342,7 @@ struct scrcpy_options {
     bool camera_torch;
     bool keep_active;
     bool flex_display;
+    bool ignore_video_encoder_constraints;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/scrcpy.c

@@ -406,6 +406,8 @@ scrcpy(struct scrcpy_options *options) {
         .vd_system_decorations = options->vd_system_decorations,
         .keep_active = options->keep_active,
         .flex_display = options->flex_display,
+        .ignore_video_encoder_constraints =
+            options->ignore_video_encoder_constraints,
         .list = options->list,
     };
 

app/src/server.c

@@ -420,6 +420,9 @@ execute_server(struct sc_server *server,
     if (params->flex_display) {
         ADD_PARAM("flex_display=true");
     }
+    if (params->ignore_video_encoder_constraints) {
+        ADD_PARAM("ignore_video_encoder_constraints=true");
+    }
     if (params->display_ime_policy != SC_DISPLAY_IME_POLICY_UNDEFINED) {
         ADD_PARAM("display_ime_policy=%s",
             sc_server_get_display_ime_policy_name(params->display_ime_policy));

app/src/server.h

@@ -75,6 +75,7 @@ struct sc_server_params {
     bool vd_system_decorations;
     bool keep_active;
     bool flex_display;
+    bool ignore_video_encoder_constraints;
     uint8_t list;
 };
 

doc/video.md

@@ -31,9 +31,9 @@ If encoding fails, scrcpy automatically tries again with a lower definition
 For camera mirroring, the `--max-size` value is used to select the camera source
 size instead (among the available resolutions).
 
-The size is rounded to a multiple of the _alignment_ required by the encoder, a
-power-of-2 value (1, 2, 4, 8 or 16) that the video width and height must be
-multiples of.
+The size is constrainted by the encoder capabilities, and rounded to a multiple
+of the _alignment_ required by the encoder, a power-of-2 value (1, 2, 4, 8 or
+16) that the video width and height must be multiples of.
 
 The alignment can be forced to a minimum value. For instance, to force the width
 and height to be multiples of 8:
@@ -42,6 +42,13 @@ and height to be multiples of 8:
 scrcpy --min-size-alignment=8
 ```
 
+The encoder constraints can be ignored entirely using
+`--ignore-video-encoder-constraints`:
+
+```bash
+scrcpy --ignore-video-encoder-constraints --min-size-alignment=8
+```
+
 
 ## Bit rate