Display and control your Android device
Apply encoder size constraints only after failure
Romain Vimontf457fd4cf5ff
diff --git a/server/src/main/java/com/genymobile/scrcpy/model/Size.java b/server/src/main/java/com/genymobile/scrcpy/model/Size.javaindex cbfec9e8..51211969 100644--- a/server/src/main/java/com/genymobile/scrcpy/model/Size.java+++ b/server/src/main/java/com/genymobile/scrcpy/model/Size.java@@ -48,6 +48,33 @@ public final class Size {assert alignment > 0 : "Alignment must be positive";assert (alignment & (alignment - 1)) == 0 : "Alignment must be a power-of-two";+ if (caps == null) {+ int w, h;+ if (maxSize > 0 && (width > maxSize || height > maxSize)) {+ if (preserveAspectRatio) {+ if (width > height) {+ w = maxSize;+ h = height * maxSize / width;+ } else {+ w = width * maxSize / height;+ h = maxSize;+ }+ } else {+ w = Math.min(width, maxSize);+ h = Math.min(height, maxSize);+ }+ } else {+ // No constraints+ w = width;+ h = height;+ }++ w = Math.max(align(w, alignment), alignment);+ h = Math.max(align(h, alignment), alignment);++ return new Size(w, h);+ }+boolean landscape = width >= height;int major = landscape ? width : height;int minor = landscape ? height : width;diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.javaindex 8925f5a7..7d1f46ea 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java@@ -54,6 +54,8 @@ public class SurfaceEncoder implements AsyncProcessor {private final CaptureControl captureControl = new CaptureControl();+ private VideoConstraints videoConstraints;+public SurfaceEncoder(SurfaceCapture capture, Streamer streamer, Options options) {this.capture = capture;this.streamer = streamer;@@ -80,9 +82,10 @@ public class SurfaceEncoder implements AsyncProcessor {Ln.d("Actual video size alignment: " + alignment + "px");}- VideoConstraints constraints = new VideoConstraints(maxSize, alignment, caps);+ // Do not constrain by the declared video encoder capabilities before encoding actually fails+ videoConstraints = new VideoConstraints(maxSize, alignment, null);- capture.init(captureControl, constraints);+ capture.init(captureControl, videoConstraints);try {boolean alive;@@ -146,7 +149,7 @@ public class SurfaceEncoder implements AsyncProcessor {throw e;}Ln.e("Capture/encoding error: " + e.getClass().getName() + ": " + e.getMessage());- if (!prepareRetry(constraints, size)) {+ if (!prepareRetry(caps, size)) {throw e;}// Keep the current resetReasons flags for the retry@@ -176,17 +179,14 @@ public class SurfaceEncoder implements AsyncProcessor {}}- private boolean prepareRetry(VideoConstraints videoConstraints, Size currentSize) {+ private boolean prepareRetry(MediaCodecInfo.VideoCapabilities caps, Size currentSize) {if (firstFrameSent) {++consecutiveErrors;- if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {- // Definitively fail- return false;+ if (consecutiveErrors < MAX_CONSECUTIVE_ERRORS) {+ // Wait a bit to increase the probability that retrying will fix the problem+ SystemClock.sleep(50);+ return true;}-- // Wait a bit to increase the probability that retrying will fix the problem- SystemClock.sleep(50);- return true;}if (!downsizeOnError) {@@ -194,7 +194,22 @@ public class SurfaceEncoder implements AsyncProcessor {return false;}- // Downsizing on error is only enabled if an encoding failure occurs before the first frame (downsizing later could be surprising)+ if (videoConstraints.getEncoderCapabilities() == null) {+ Ln.i("Applying video encoder constraints");+ videoConstraints = videoConstraints.withCapabilities(caps);+ boolean accepted = capture.applyNewVideoConstraints(videoConstraints);+ if (accepted) {+ return true;+ }+ }++ if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {+ // Definitively fail+ return false;+ }++ // Downsizing on error is only enabled if an encoding failure occurs before the first frame, or if the video constraints were not applied+ // (downsizing later could be surprising)int newMaxSize = chooseMaxSizeFallback(currentSize);if (newMaxSize == 0) {diff --git a/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java b/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.javaindex 38843025..fe086315 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/VideoConstraints.java@@ -15,7 +15,6 @@ public class VideoConstraints {assert (alignment & (alignment - 1)) == 0 : "Alignment must be a power-of-two";this.alignment = alignment;- assert caps != null;this.caps = caps;}@@ -57,4 +56,14 @@ public class VideoConstraints {public VideoConstraints withMaxSize(int maxSize) {return new VideoConstraints(maxSize, alignment, caps);}++ /**+ * Return the video constraints with the provided video capabilities.+ *+ * @param caps the video encoder capabilities+ * @return the new video constraints+ */+ public VideoConstraints withCapabilities(MediaCodecInfo.VideoCapabilities caps) {+ return new VideoConstraints(maxSize, alignment, caps);+ }}