Skip to content

Implement non-GL cropping #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
normusF7 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement non-GL cropping #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed807e
Implement non-GL cropping
normusF7 Jun 6, 2025
8998b21
Fix non-GL crop
normusF7 Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 50 additions & 17 deletions server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ public class ScreenCapture extends SurfaceCapture {
private IBinder display;
private VirtualDisplay virtualDisplay;

private Rect orientedCrop;

private AffineMatrix transform;
private AffineMatrix filterTransform;
private OpenGLRunner glRunner;

public ScreenCapture(VirtualDisplayListener vdListener, Options options) {
Expand Down Expand Up @@ -85,19 +88,40 @@ public void prepare() throws ConfigurationException {
captureOrientation = Orientation.fromRotation(displayInfo.getRotation());
}

VideoFilter filter = new VideoFilter(displaySize);
orientedCrop = null;
filterTransform = null;
transform = null;

if (crop != null) {
boolean transposed = (displayInfo.getRotation() % 2) != 0;
filter.addCrop(crop, transposed);
}
boolean onlyCrop = crop != null
&& angle == 0f
&& captureOrientationLock == Orientation.Lock.Unlocked
&& captureOrientation == Orientation.Orient0;

if (onlyCrop) {
orientedCrop = new Rect(crop);
if ((displayInfo.getRotation() % 2) != 0) {
orientedCrop = new Rect(crop.top, crop.left, crop.bottom, crop.right);
}

boolean locked = captureOrientationLock != Orientation.Lock.Unlocked;
filter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
filter.addAngle(angle);
videoSize = new Size(orientedCrop.width(), orientedCrop.height()).limit(maxSize).round8();
transform = AffineMatrix.translate(orientedCrop.left, orientedCrop.top);
filterTransform = null;
} else {
VideoFilter filter = new VideoFilter(displaySize);

if (crop != null) {
boolean transposed = (displayInfo.getRotation() % 2) != 0;
filter.addCrop(crop, transposed);
}

transform = filter.getInverseTransform();
videoSize = filter.getOutputSize().limit(maxSize).round8();
boolean locked = captureOrientationLock != Orientation.Lock.Unlocked;
filter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
filter.addAngle(angle);

filterTransform = filter.getInverseTransform();
transform = filterTransform;
videoSize = filter.getOutputSize().limit(maxSize).round8();
}
}

@Override
Expand All @@ -112,29 +136,38 @@ public void start(Surface surface) throws IOException {
}

Size inputSize;
if (transform != null) {
if (filterTransform != null) {
// If there is a filter, it must receive the full display content
inputSize = displayInfo.getSize();
assert glRunner == null;
OpenGLFilter glFilter = new AffineOpenGLFilter(transform);
OpenGLFilter glFilter = new AffineOpenGLFilter(filterTransform);
glRunner = new OpenGLRunner(glFilter);
surface = glRunner.start(inputSize, videoSize, surface);
} else {
// If there is no filter, the display must be rendered at target video size directly
inputSize = videoSize;
if (orientedCrop != null) {
inputSize = new Size(orientedCrop.width(), orientedCrop.height());
} else {
inputSize = videoSize;
}
}

try {
virtualDisplay = ServiceManager.getDisplayManager()
.createVirtualDisplay("scrcpy", inputSize.getWidth(), inputSize.getHeight(), displayId, surface);
Ln.d("Display: using DisplayManager API");
if (orientedCrop == null) {
virtualDisplay = ServiceManager.getDisplayManager()
.createVirtualDisplay("scrcpy", inputSize.getWidth(), inputSize.getHeight(), displayId, surface);
Ln.d("Display: using DisplayManager API");
} else {
throw new Exception("Use SurfaceControl for crop");
}
} catch (Exception displayManagerException) {
try {
display = createDisplay();

Size deviceSize = displayInfo.getSize();
int layerStack = displayInfo.getLayerStack();
setDisplaySurface(display, surface, deviceSize.toRect(), inputSize.toRect(), layerStack);
Rect layerRect = orientedCrop != null ? orientedCrop : deviceSize.toRect();
setDisplaySurface(display, surface, layerRect, inputSize.toRect(), layerStack);
Ln.d("Display: using SurfaceControl API");
} catch (Exception surfaceControlException) {
Ln.e("Could not create display using DisplayManager", displayManagerException);
Expand Down
Loading