Skip to content

Avoid resets on minor display size change #2

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

Avoid resets on minor display size change #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion server/src/main/java/com/genymobile/scrcpy/video/DisplaySizeMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ public interface Listener {

private Listener listener;

// Some devices report slightly different sizes depending on UI state. Ignore
// such minor fluctuations to avoid spurious capture resets.
private static final int SIZE_EPSILON = 4;

private static boolean approximatelyEquals(Size s1, Size s2) {
if (s1 == null || s2 == null) {
return false;
}
return Math.abs(s1.getWidth() - s2.getWidth()) <= SIZE_EPSILON
&& Math.abs(s1.getHeight() - s2.getHeight()) <= SIZE_EPSILON;
}

public void start(int displayId, Listener listener) {
// Once started, the listener and the displayId must never change
assert listener != null;
Expand Down Expand Up @@ -124,7 +136,7 @@ private void checkDisplaySizeChanged() {
Size sessionDisplaySize = getSessionDisplaySize(); // synchronized

// .equals() also works if sessionDisplaySize == null
if (!size.equals(sessionDisplaySize)) {
if (!approximatelyEquals(size, sessionDisplaySize)) {
// Reset only if the size is different
if (Ln.isEnabled(Ln.Level.VERBOSE)) {
Ln.v("DisplaySizeMonitor: requestReset(): " + sessionDisplaySize + " -> " + size);
Expand Down
Loading