pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move screen encoder initialization

Browse Source 
This prepares further refactors.
This commit is contained in:
Romain Vimont
2023-02-06 14:09:20 +01:00
parent dd2959b0cb
commit e153f4657c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/genymobile/scrcpy/Server.java
View File

@@ -90,8 +90,6 @@ public final class Server {
Size videoSize = device.getScreenInfo().getVideoSize(); Size videoSize = device.getScreenInfo().getVideoSize();
connection.sendDeviceMeta(Device.getDeviceName(), videoSize.getWidth(), videoSize.getHeight()); connection.sendDeviceMeta(Device.getDeviceName(), videoSize.getWidth(), videoSize.getHeight());
} }
ScreenEncoder screenEncoder = new ScreenEncoder(codec.getMimeType(), options.getBitRate(), options.getMaxFps(), codecOptions,
options.getEncoderName(), options.getDownsizeOnError());
Controller controller = null; Controller controller = null;
if (control) { if (control) {
@@ -102,9 +100,11 @@ public final class Server {
device.setClipboardListener(text -> controllerRef.getSender().pushClipboardText(text)); device.setClipboardListener(text -> controllerRef.getSender().pushClipboardText(text));
} }
VideoStreamer videoStreamer = new VideoStreamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
ScreenEncoder screenEncoder = new ScreenEncoder(codec.getMimeType(), options.getBitRate(), options.getMaxFps(), codecOptions,
options.getEncoderName(), options.getDownsizeOnError());
try { try {
// synchronous // synchronous
VideoStreamer videoStreamer = new VideoStreamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
screenEncoder.streamScreen(device, videoStreamer); screenEncoder.streamScreen(device, videoStreamer);
} catch (IOException e) { } catch (IOException e) {
// Broken pipe is expected on close, because the socket is closed by the client // Broken pipe is expected on close, because the socket is closed by the client