Skip to content

Fix cropping flicker on Quest by using display projection #3

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 8 commits into
base: master
Choose a base branch
from
Open

Fix cropping flicker on Quest by using display projection #3

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c59522b
server: crop using display projection
normusF7 Jun 5, 2025
9c491c1
fix quest cropping with proper projection rotation
normusF7 Jun 5, 2025
0ba9e54
Reimplement cropping using OpenGL
normusF7 Jun 5, 2025
62527b1
Fix crop pipeline and projection orientation
normusF7 Jun 5, 2025
60e048a
Refactor cropping pipeline
normusF7 Jun 5, 2025
a9b8b9b
Skip DisplayManager when cropping
normusF7 Jun 5, 2025
19652c9
Use rotation for SurfaceControl crop
normusF7 Jun 5, 2025
86a480b
Fix cropping path without altering orientation
normusF7 Jun 5, 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
74 changes: 48 additions & 26 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 @@ -31,6 +31,7 @@ public class ScreenCapture extends SurfaceCapture {
private final int displayId;
private int maxSize;
private final Rect crop;
private Rect orientedCrop;
private Orientation.Lock captureOrientationLock;
private Orientation captureOrientation;
private final float angle;
Expand All @@ -43,7 +44,8 @@ public class ScreenCapture extends SurfaceCapture {
private IBinder display;
private VirtualDisplay virtualDisplay;

private AffineMatrix transform;
private AffineMatrix eventTransform;
private AffineMatrix glTransform;
private OpenGLRunner glRunner;

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

VideoFilter filter = new VideoFilter(displaySize);
VideoFilter eventFilter = new VideoFilter(displaySize);

if (crop != null) {
boolean transposed = (displayInfo.getRotation() % 2) != 0;
filter.addCrop(crop, transposed);
eventFilter.addCrop(crop, transposed);
orientedCrop = transposed ? new Rect(crop.top, crop.left, crop.bottom, crop.right) : new Rect(crop);
} else {
orientedCrop = null;
}

boolean locked = captureOrientationLock != Orientation.Lock.Unlocked;
filter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
filter.addAngle(angle);
eventFilter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
eventFilter.addAngle(angle);

eventTransform = eventFilter.getInverseTransform();

transform = filter.getInverseTransform();
videoSize = filter.getOutputSize().limit(maxSize).round8();
Size glInputSize = orientedCrop != null ? new Size(orientedCrop.width(), orientedCrop.height()) : displaySize;
VideoFilter glFilter = new VideoFilter(glInputSize);
glFilter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
glFilter.addAngle(angle);

glTransform = glFilter.getInverseTransform();
videoSize = glFilter.getOutputSize().limit(maxSize).round8();
}

@Override
Expand All @@ -112,33 +124,45 @@ public void start(Surface surface) throws IOException {
}

Size inputSize;
if (transform != null) {
// If there is a filter, it must receive the full display content
inputSize = displayInfo.getSize();
if (glTransform != null) {
inputSize = orientedCrop != null ? new Size(orientedCrop.width(), orientedCrop.height()) : displayInfo.getSize();
assert glRunner == null;
OpenGLFilter glFilter = new AffineOpenGLFilter(transform);
OpenGLFilter glFilter = new AffineOpenGLFilter(glTransform);
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;
}

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

Size deviceSize = displayInfo.getSize();
int layerStack = displayInfo.getLayerStack();
setDisplaySurface(display, surface, deviceSize.toRect(), inputSize.toRect(), layerStack);
Ln.d("Display: using SurfaceControl API");
} catch (Exception surfaceControlException) {
Ln.e("Could not create display using DisplayManager", displayManagerException);
Ln.e("Could not create display using SurfaceControl", surfaceControlException);
throw new AssertionError("Could not create display");
}
}
} else {
try {
display = createDisplay();

Size deviceSize = displayInfo.getSize();
int layerStack = displayInfo.getLayerStack();
setDisplaySurface(display, surface, deviceSize.toRect(), inputSize.toRect(), layerStack);
Rect displayRect = new Rect(0, 0, inputSize.getWidth(), inputSize.getHeight());
setDisplaySurface(display, surface, orientedCrop, displayRect, layerStack);
Ln.d("Display: using SurfaceControl API");
} catch (Exception surfaceControlException) {
Ln.e("Could not create display using DisplayManager", displayManagerException);
Ln.e("Could not create display using SurfaceControl", surfaceControlException);
} catch (Exception e) {
Ln.e("Could not create display", e);
throw new AssertionError("Could not create display");
}
}
Expand All @@ -147,13 +171,11 @@ public void start(Surface surface) throws IOException {
int virtualDisplayId;
PositionMapper positionMapper;
if (virtualDisplay == null || displayId == 0) {
// Surface control or main display: send all events to the original display, relative to the device size
Size deviceSize = displayInfo.getSize();
positionMapper = PositionMapper.create(videoSize, transform, deviceSize);
positionMapper = PositionMapper.create(videoSize, eventTransform, deviceSize);
virtualDisplayId = displayId;
} else {
// The positions are relative to the virtual display, not the original display (so use inputSize, not deviceSize!)
positionMapper = PositionMapper.create(videoSize, transform, inputSize);
positionMapper = PositionMapper.create(videoSize, eventTransform, inputSize);
virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
}
vdListener.onNewVirtualDisplay(virtualDisplayId, positionMapper);
Expand Down