Display and control your Android device
Rename sendCodecId to sendCodecMeta
Romain Vimontaa1efbc35c46
diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.javaindex bcf235ed..2a3de757 100644--- a/server/src/main/java/com/genymobile/scrcpy/Options.java+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java@@ -40,7 +40,7 @@ public class Options {private boolean sendDeviceMeta = true; // send device name and sizeprivate boolean sendFrameMeta = true; // send PTS so that the client may record properlyprivate boolean sendDummyByte = true; // write a byte on start to detect connection issues- private boolean sendCodecId = true; // write the codec ID (4 bytes) before the stream+ private boolean sendCodecMeta = true; // write the codec metadata before the streampublic Ln.Level getLogLevel() {return logLevel;@@ -282,11 +282,11 @@ public class Options {this.sendDummyByte = sendDummyByte;}- public boolean getSendCodecId() {- return sendCodecId;+ public boolean getSendCodecMeta() {+ return sendCodecMeta;}- public void setSendCodecId(boolean sendCodecId) {- this.sendCodecId = sendCodecId;+ public void setSendCodecMeta(boolean sendCodecMeta) {+ this.sendCodecMeta = sendCodecMeta;}}diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex 86555e3b..2ece7415 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -108,7 +108,7 @@ public final class Server {if (audio) {AudioCodec audioCodec = options.getAudioCodec();- Streamer audioStreamer = new Streamer(connection.getAudioFd(), audioCodec, options.getSendCodecId(),+ Streamer audioStreamer = new Streamer(connection.getAudioFd(), audioCodec, options.getSendCodecMeta(),options.getSendFrameMeta());AsyncProcessor audioRecorder;if (audioCodec == AudioCodec.RAW) {@@ -120,7 +120,7 @@ public final class Server {asyncProcessors.add(audioRecorder);}- Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecId(),+ Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),options.getSendFrameMeta());ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());@@ -315,9 +315,9 @@ public final class Server {boolean sendDummyByte = Boolean.parseBoolean(value);options.setSendDummyByte(sendDummyByte);break;- case "send_codec_id":- boolean sendCodecId = Boolean.parseBoolean(value);- options.setSendCodecId(sendCodecId);+ case "send_codec_meta":+ boolean sendCodecMeta = Boolean.parseBoolean(value);+ options.setSendCodecMeta(sendCodecMeta);break;case "raw_video_stream":boolean rawVideoStream = Boolean.parseBoolean(value);@@ -325,7 +325,7 @@ public final class Server {options.setSendDeviceMeta(false);options.setSendFrameMeta(false);options.setSendDummyByte(false);- options.setSendCodecId(false);+ options.setSendCodecMeta(false);}break;default:diff --git a/server/src/main/java/com/genymobile/scrcpy/Streamer.java b/server/src/main/java/com/genymobile/scrcpy/Streamer.javaindex 9bfe7e91..f099cf4f 100644--- a/server/src/main/java/com/genymobile/scrcpy/Streamer.java+++ b/server/src/main/java/com/genymobile/scrcpy/Streamer.java@@ -15,15 +15,15 @@ public final class Streamer {private final FileDescriptor fd;private final Codec codec;- private final boolean sendCodecId;+ private final boolean sendCodecMeta;private final boolean sendFrameMeta;private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);- public Streamer(FileDescriptor fd, Codec codec, boolean sendCodecId, boolean sendFrameMeta) {+ public Streamer(FileDescriptor fd, Codec codec, boolean sendCodecMeta, boolean sendFrameMeta) {this.fd = fd;this.codec = codec;- this.sendCodecId = sendCodecId;+ this.sendCodecMeta = sendCodecMeta;this.sendFrameMeta = sendFrameMeta;}@@ -32,7 +32,7 @@ public final class Streamer {}public void writeHeader() throws IOException {- if (sendCodecId) {+ if (sendCodecMeta) {ByteBuffer buffer = ByteBuffer.allocate(4);buffer.putInt(codec.getId());buffer.flip();