aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-12-17 05:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename maximum_size to max_size

Browse Source 
The long option is --max-size, so for consistency, adapt the code
accordingly.
This commit is contained in:
Romain Vimont
2018-02-01 12:18:06 +01:00
parent 213b721ff9
commit ee93f3f23a
8 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/java/com/genymobile/scrcpy/Device.java
View File

@@ -20,7 +20,7 @@ public final class Device {
private RotationListener rotationListener;
public Device(Options options) {
screenInfo = computeScreenInfo(options.getMaximumSize());
screenInfo = computeScreenInfo(options.getMaxSize());
registerRotationWatcher(new IRotationWatcher.Stub() {
@Override
public void onRotationChanged(int rotation) throws RemoteException {
@@ -40,10 +40,10 @@ public final class Device {
return screenInfo;
}
private ScreenInfo computeScreenInfo(int maximumSize) {
private ScreenInfo computeScreenInfo(int maxSize) {
// Compute the video size and the padding of the content inside this video.
// Principle:
// - scale down the great side of the screen to maximumSize (if necessary);
// - scale down the great side of the screen to maxSize (if necessary);
// - scale down the other side so that the aspect ratio is preserved;
// - round this value to the nearest multiple of 8 (H.264 only accepts multiples of 8)
DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
@@ -51,16 +51,16 @@ public final class Device {
Size deviceSize = displayInfo.getSize();
int w = deviceSize.getWidth();
int h = deviceSize.getHeight();
if (maximumSize > 0) {
assert maximumSize % 8 == 0;
if (maxSize > 0) {
assert maxSize % 8 == 0;
boolean portrait = h > w;
int major = portrait ? h : w;
int minor = portrait ? w : h;
if (major > maximumSize) {
int minorExact = minor * maximumSize / major;
if (major > maxSize) {
int minorExact = minor * maxSize / major;
// +4 to round the value to the nearest multiple of 8
minor = (minorExact + 4) & ~7;
major = maximumSize;
major = maxSize;
}
w = portrait ? minor : major;
h = portrait ? major : minor;

10
server/src/main/java/com/genymobile/scrcpy/Options.java
View File

@@ -1,13 +1,13 @@
package com.genymobile.scrcpy;
public class Options {
private int maximumSize;
private int maxSize;
public int getMaximumSize() {
return maximumSize;
public int getMaxSize() {
return maxSize;
}
public void setMaximumSize(int maximumSize) {
this.maximumSize = maximumSize;
public void setMaxSize(int maxSize) {
this.maxSize = maxSize;
}
}

4
server/src/main/java/com/genymobile/scrcpy/ScrCpyServer.java
View File

@@ -37,8 +37,8 @@ public class ScrCpyServer {
private static Options createOptions(String... args) {
Options options = new Options();
if (args.length > 0) {
int maximumSize = Integer.parseInt(args[0]) & ~7; // multiple of 8
options.setMaximumSize(maximumSize);
int maxSize = Integer.parseInt(args[0]) & ~7; // multiple of 8
options.setMaxSize(maxSize);
}
return options;
}