Skip to content

Workaround for Oculus crop flicker #5

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

Workaround for Oculus crop flicker #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b1d402
screen: crop without opengl on simple case
normusF7 Jun 5, 2025
10e1442
Fix crop to use SurfaceControl
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
75 changes: 61 additions & 14 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 @@ -45,6 +45,8 @@ public class ScreenCapture extends SurfaceCapture {

private AffineMatrix transform;
private OpenGLRunner glRunner;
private boolean useGl;
private Rect layerStackRect;

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

layerStackRect = null;

boolean simpleCrop = crop != null
&& angle == 0f
&& captureOrientationLock == Orientation.Lock.Unlocked
&& captureOrientation == Orientation.Orient0;

VideoFilter filter = new VideoFilter(displaySize);

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

boolean locked = captureOrientationLock != Orientation.Lock.Unlocked;
filter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
filter.addAngle(angle);
if (simpleCrop) {
useGl = false;
transform = filter.getInverseTransform();
videoSize = filter.getOutputSize().limit(maxSize).round8();
} else {
useGl = true;
boolean locked = captureOrientationLock != Orientation.Lock.Unlocked;
filter.addOrientation(displayInfo.getRotation(), locked, captureOrientation);
filter.addAngle(angle);

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

@Override
Expand All @@ -112,7 +135,7 @@ public void start(Surface surface) throws IOException {
}

Size inputSize;
if (transform != null) {
if (useGl) {
// If there is a filter, it must receive the full display content
inputSize = displayInfo.getSize();
assert glRunner == null;
Expand All @@ -124,22 +147,46 @@ public void start(Surface surface) throws IOException {
inputSize = videoSize;
}

try {
virtualDisplay = ServiceManager.getDisplayManager()
.createVirtualDisplay("scrcpy", inputSize.getWidth(), inputSize.getHeight(), displayId, surface);
Ln.d("Display: using DisplayManager API");
} catch (Exception displayManagerException) {
boolean wantSurfaceControl = layerStackRect != null;
if (!wantSurfaceControl) {
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();
Rect deviceRect = layerStackRect != null ? layerStackRect : deviceSize.toRect();
setDisplaySurface(display, surface, deviceRect, 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 deviceRect = layerStackRect != null ? layerStackRect : deviceSize.toRect();
setDisplaySurface(display, surface, deviceRect, 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");
try {
virtualDisplay = ServiceManager.getDisplayManager()
.createVirtualDisplay("scrcpy", inputSize.getWidth(), inputSize.getHeight(), displayId, surface);
Ln.d("Display: fallback to DisplayManager API");
} catch (Exception displayManagerException) {
Ln.e("Could not create display using DisplayManager", displayManagerException);
throw new AssertionError("Could not create display");
}
}
}

Expand Down
Loading