Added help and parsing of the codec-profile option

(cherry picked from commit e158243) (cherry picked from commit a4ef318) (cherry picked from commit a5b83c1)
Genymobile · Mar 19, 2020 · 1e3321c · 1e3321c
1 parent a5d5ea1
commit 1e3321c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/app/scrcpy.1 b/app/scrcpy.1
@@ -151,6 +151,10 @@ Set the initial window height.
 
 Default is 0 (automatic).\n
 
+.TP
+.BI "\-P, \-\-\codec\-profile " value
+Request specific encoding codec profile, see AVC profiles at: https://developer.android.com/reference/android/media/MediaCodecInfo.CodecProfileLevel for valid codec profile values. Default is 0 (automatic).
+
 .SH SHORTCUTS
 
 .TP

diff --git a/app/src/cli.c b/app/src/cli.c
@@ -130,6 +130,12 @@ scrcpy_print_usage(const char *arg0) {
         "        Set the initial window width.\n"
         "        Default is 0 (automatic).\n"
         "\n"
+        "    -P, --codec-profile value\n"
+        "        Request specific encoding codec profile, see AVC profiles at:\n"
+        "        https://developer.android.com/reference/android/media/MediaCodecInfo.CodecProfileLevel\n"
+        "        for valid codec profile values.\n"
+        "        Default is 0 (automatic).\n"
+        "\n"
         "Shortcuts:\n"
         "\n"
         "    " CTRL_OR_CMD "+f\n"
@@ -368,6 +374,35 @@ parse_record_format(const char *optarg, enum recorder_format *format) {
     return false;
 }
 
+static bool
+parse_codec_profile(const char *optarg, uint32_t *codec_profile) {
+    long value;
+    // long may be 32 bits (it is the case on mingw), so do not use more than
+    // 31 bits (long is signed)
+    bool ok = parse_integer_arg(optarg, &value, true, 0, 0x7FFFFFFF, "codec-profile");
+    if (!ok) {
+        return false;
+    }
+
+    switch (value) {
+        case 0:         // Automatic
+        case 0x01:      // AVCProfileBaseline
+        case 0x02:      // AVCProfileMain
+        case 0x04:      // AVCProfileExtended
+        case 0x08:      // AVCProfileHigh
+        case 0x10:      // AVCProfileHigh10
+        case 0x20:      // AVCProfileHigh422
+        case 0x40:      // AVCProfileHigh444
+        case 0x10000:   // AVCProfileConstrainedBaseline
+        case 0x80000:   // AVCProfileConstrainedHigh
+            *codec_profile = (uint32_t) value;
+            return true;
+        default:
+            LOGE("Invalid codec-profile, Use -h for help");
+            return false;
+    }
+}
+
 static enum recorder_format
 guess_record_format(const char *filename) {
     size_t len = strlen(filename);
@@ -440,7 +475,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
     optind = 0; // reset to start from the first argument in tests
 
     int c;
-    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv", long_options,
+    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv:P:", long_options,
                             NULL)) != -1) {
         switch (c) {
             case 'b':
@@ -550,6 +585,11 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
             case OPT_PREFER_TEXT:
                 opts->prefer_text = true;
                 break;
+            case 'P':
+                if (!parse_codec_profile(optarg, &opts->codec_profile)) {
+                    return false;
+                }
+                break;
             default:
                 // getopt prints the error message on stderr
                 return false;