From 709a0c327a114857423c3f28eb46d3a1700af6a8 Mon Sep 17 00:00:00 2001
From: Tzah Mazuz <tzah.mazuz@testproject.io>
Date: Thu, 12 Mar 2020 16:52:46 +0200
Subject: [PATCH] Adding codecProfile to server options

(cherry picked from commit d4fb6a0c19af23d0d3c57721f6ccc91e4fad67f3)
(cherry picked from commit e7f205ca19033c9b227171915bf9f748b5eefe85)
(cherry picked from commit ef5d72cbb785d48d412b437fee95bc8f61829680)
---
 .../main/java/com/genymobile/scrcpy/Options.java  |  9 +++++++++
 .../main/java/com/genymobile/scrcpy/Server.java   | 15 +++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.java
index d9a29452b0..2b87b952bb 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -11,6 +11,7 @@ public class Options {
     private Rect crop;
     private boolean sendFrameMeta; // send PTS so that the client may record properly
     private boolean control;
+    private int codecProfile;
 
     public int getMaxSize() {
         return maxSize;
@@ -75,4 +76,12 @@ public boolean getControl() {
     public void setControl(boolean control) {
         this.control = control;
     }
+
+    public int getCodecProfile() {
+        return codecProfile;
+    }
+
+    public void setCodecProfile(int codecProfile) {
+        this.codecProfile = codecProfile;
+    }
 }
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index 2b0d32a239..c2e501612c 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -80,8 +80,8 @@ private static Options createOptions(String... args) {
                     "The server version (" + clientVersion + ") does not match the client " + "(" + BuildConfig.VERSION_NAME + ")");
         }
 
-        if (args.length != 9) {
-            throw new IllegalArgumentException("Expecting 9 parameters");
+        if (args.length != 10) {
+            throw new IllegalArgumentException("Expecting 10 parameters");
         }
 
         Options options = new Options();
@@ -98,17 +98,20 @@ private static Options createOptions(String... args) {
         int lockedVideoOrientation = Integer.parseInt(args[4]);
         options.setLockedVideoOrientation(lockedVideoOrientation);
 
+        int codecProfile = Integer.parseInt(args[5]);
+        options.setCodecProfile(codecProfile);
+
         // use "adb forward" instead of "adb tunnel"? (so the server must listen)
-        boolean tunnelForward = Boolean.parseBoolean(args[5]);
+        boolean tunnelForward = Boolean.parseBoolean(args[6]);
         options.setTunnelForward(tunnelForward);
 
-        Rect crop = parseCrop(args[6]);
+        Rect crop = parseCrop(args[7]);
         options.setCrop(crop);
 
-        boolean sendFrameMeta = Boolean.parseBoolean(args[7]);
+        boolean sendFrameMeta = Boolean.parseBoolean(args[8]);
         options.setSendFrameMeta(sendFrameMeta);
 
-        boolean control = Boolean.parseBoolean(args[8]);
+        boolean control = Boolean.parseBoolean(args[9]);
         options.setControl(control);
 
         return options;