Skip to content

Commit 7853c4c

Browse files
committed
Move screen encoder initialization
This prepares further refactors.
1 parent bbb025b commit 7853c4c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

server/src/main/java/com/genymobile/scrcpy/Server.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ private static void scrcpy(Options options) throws IOException, ConfigurationExc
9191
Size videoSize = device.getScreenInfo().getVideoSize();
9292
connection.sendDeviceMeta(Device.getDeviceName(), videoSize.getWidth(), videoSize.getHeight());
9393
}
94-
ScreenEncoder screenEncoder = new ScreenEncoder(codec.getMimeType(), options.getBitRate(), options.getMaxFps(), codecOptions,
95-
options.getEncoderName(), options.getDownsizeOnError());
9694

9795
if (control) {
9896
controller = new Controller(device, connection, options.getClipboardAutosync(), options.getPowerOn());
@@ -102,9 +100,11 @@ private static void scrcpy(Options options) throws IOException, ConfigurationExc
102100
device.setClipboardListener(text -> controllerRef.getSender().pushClipboardText(text));
103101
}
104102

103+
VideoStreamer videoStreamer = new VideoStreamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
104+
ScreenEncoder screenEncoder = new ScreenEncoder(codec.getMimeType(), options.getBitRate(), options.getMaxFps(), codecOptions,
105+
options.getEncoderName(), options.getDownsizeOnError());
105106
try {
106107
// synchronous
107-
VideoStreamer videoStreamer = new VideoStreamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
108108
screenEncoder.streamScreen(device, videoStreamer);
109109
} catch (IOException e) {
110110
// Broken pipe is expected on close, because the socket is closed by the client

0 commit comments

Comments
 (0)