Skip to content

Display and control your Android device

Never increase dimensions when applying alignment

Romain Vimont0d73d84f8478
diff --git a/server/src/main/java/com/genymobile/scrcpy/model/Size.java b/server/src/main/java/com/genymobile/scrcpy/model/Size.java
index c530f86c..7581dc8d 100644
--- a/server/src/main/java/com/genymobile/scrcpy/model/Size.java
+++ b/server/src/main/java/com/genymobile/scrcpy/model/Size.java
@@ -59,14 +59,14 @@ public final class Size {
if (width > maxWidth || height > maxHeight) {
if (width * maxHeight > height * maxWidth) {
w = maxWidth;
- h = round(height * maxWidth / width, alignment);
+ h = align(height * maxWidth / width, alignment);
} else {
- w = round(width * maxHeight / height, alignment);
+ w = align(width * maxHeight / height, alignment);
h = maxHeight;
}
} else {
- w = round(width, alignment);
- h = round(height, alignment);
+ w = align(width, alignment);
+ h = align(height, alignment);
}
assert w <= maxWidth : "The width cannot exceed maxWidth";
@@ -93,10 +93,6 @@ public final class Size {
return new Size(w, h);
}
- private static int round(int value, int alignment) {
- return (value + (alignment / 2)) / alignment * alignment;
- }
-
private static int align(int value, int alignment) {
return value / alignment * alignment;
}
diff --git a/server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java b/server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
index db8588f6..d86048fa 100644
--- a/server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/model/SizeTest.java
@@ -25,15 +25,15 @@ public class SizeTest {
Size size = new Size(207, 209);
Assert.assertEquals(size, size.constrain(createVideoConstraints(0, 1)));
- Assert.assertEquals(new Size(208, 210), size.constrain(createVideoConstraints(0, 2)));
- Assert.assertEquals(new Size(208, 208), size.constrain(createVideoConstraints(0, 4)));
+ Assert.assertEquals(new Size(206, 208), size.constrain(createVideoConstraints(0, 2)));
+ Assert.assertEquals(new Size(204, 208), size.constrain(createVideoConstraints(0, 4)));
Size s = size.constrain(createVideoConstraints(208, 2));
Assert.assertEquals(208, s.getHeight());
Assert.assertTrue(s.getWidth() >= 206 && s.getWidth() <= 208 && s.getWidth() % 2 == 0);
Assert.assertEquals(new Size(207 * 208 / 209, 208), size.constrain(createVideoConstraints(208, 2)));
- Assert.assertEquals(new Size(208, 208), size.constrain(createVideoConstraints(208, 4)));
+ Assert.assertEquals(new Size(204, 208), size.constrain(createVideoConstraints(208, 4)));
}
@Test