Display and control your Android device
Downsize on error
Romain Vimont26b4104844fb
diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.javaindex 591460b6..763a7fad 100644--- a/server/src/main/java/com/genymobile/scrcpy/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java@@ -44,7 +44,7 @@ public final class Device {private final Size deviceSize;private final Rect crop;- private final int maxSize;+ private int maxSize;private final int lockVideoOrientation;private ScreenInfo screenInfo;@@ -133,6 +133,11 @@ public final class Device {}}+ public synchronized void setMaxSize(int newMaxSize) {+ maxSize = newMaxSize;+ screenInfo = ScreenInfo.computeScreenInfo(screenInfo.getReverseVideoRotation(), deviceSize, crop, newMaxSize, lockVideoOrientation);+ }+public synchronized ScreenInfo getScreenInfo() {return screenInfo;}diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.javaindex ce6b556a..ba601a22 100644--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java@@ -25,6 +25,9 @@ public class ScreenEncoder implements Device.RotationListener {private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100msprivate static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";+ // Keep the values in descending order+ private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};+private static final int NO_PTS = -1;private final AtomicBoolean rotationChanged = new AtomicBoolean();@@ -91,6 +94,18 @@ public class ScreenEncoder implements Device.RotationListener {alive = encode(codec, fd);// do not call stop() on exception, it would trigger an IllegalStateExceptioncodec.stop();+ } catch (Exception e) {+ Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());+ int newMaxSize = chooseMaxSizeFallback(screenInfo.getVideoSize());+ if (newMaxSize == 0) {+ // Definitively fail+ throw e;+ }++ // Retry with a smaller device size+ Ln.i("Retrying with -m" + newMaxSize + "...");+ device.setMaxSize(newMaxSize);+ alive = true;} finally {destroyDisplay(display);codec.release();@@ -102,6 +117,18 @@ public class ScreenEncoder implements Device.RotationListener {}}+ private static int chooseMaxSizeFallback(Size failedSize) {+ int currentMaxSize = Math.max(failedSize.getWidth(), failedSize.getHeight());+ for (int value : MAX_SIZE_FALLBACK) {+ if (value < currentMaxSize) {+ // We found a smaller value to reduce the video size+ return value;+ }+ }+ // No fallback, fail definitively+ return 0;+ }+private boolean encode(MediaCodec codec, FileDescriptor fd) throws IOException {boolean eof = false;MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();