Display and control your Android device
Parse codec options early
Romain Vimont2c3099e2de13
diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.javaindex 74467c7c..20a579ed 100644--- a/server/src/main/java/com/genymobile/scrcpy/Options.java+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java@@ -2,6 +2,8 @@ package com.genymobile.scrcpy;import android.graphics.Rect;+import java.util.List;+public class Options {private Ln.Level logLevel;private int maxSize;@@ -15,7 +17,7 @@ public class Options {private int displayId;private boolean showTouches;private boolean stayAwake;- private String codecOptions;+ private List<CodecOption> codecOptions;private String encoderName;private boolean powerOffScreenOnClose;private boolean clipboardAutosync;@@ -116,11 +118,11 @@ public class Options {this.stayAwake = stayAwake;}- public String getCodecOptions() {+ public List<CodecOption> getCodecOptions() {return codecOptions;}- public void setCodecOptions(String codecOptions) {+ public void setCodecOptions(List<CodecOption> codecOptions) {this.codecOptions = codecOptions;}diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex 188974ff..bcdaf6bb 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -61,7 +61,7 @@ public final class Server {private static void scrcpy(Options options) throws IOException {Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");final Device device = new Device(options);- List<CodecOption> codecOptions = CodecOption.parse(options.getCodecOptions());+ List<CodecOption> codecOptions = options.getCodecOptions();Thread initThread = startInitThread(options);@@ -204,7 +204,7 @@ public final class Server {boolean stayAwake = Boolean.parseBoolean(args[12]);options.setStayAwake(stayAwake);- String codecOptions = args[13];+ List<CodecOption> codecOptions = CodecOption.parse(args[13]);options.setCodecOptions(codecOptions);String encoderName = "-".equals(args[14]) ? null : args[14];