mirror of
https://github.com/Genymobile/scrcpy.git
synced 2025-12-17 05:24:19 +01:00
Simplify capture invalidation
Remove the unnecessary requestInvalidate() indirection. Use a single invalidate() method instead.
This commit is contained in:
@@ -751,7 +751,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
|
|||||||
private void resetVideo() {
|
private void resetVideo() {
|
||||||
if (surfaceCapture != null) {
|
if (surfaceCapture != null) {
|
||||||
Ln.i("Video capture reset");
|
Ln.i("Video capture reset");
|
||||||
surfaceCapture.requestInvalidate();
|
surfaceCapture.invalidate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -418,9 +418,4 @@ public class CameraCapture extends SurfaceCapture {
|
|||||||
public boolean isClosed() {
|
public boolean isClosed() {
|
||||||
return disconnected.get();
|
return disconnected.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void requestInvalidate() {
|
|
||||||
// do nothing (the user could not request a reset anyway for now, since there is no controller for camera mirroring)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -261,9 +261,4 @@ public class NewDisplayCapture extends SurfaceCapture {
|
|||||||
int num = size.getMax();
|
int num = size.getMax();
|
||||||
return initialDpi * num / den;
|
return initialDpi * num / den;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void requestInvalidate() {
|
|
||||||
invalidate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -211,9 +211,4 @@ public class ScreenCapture extends SurfaceCapture {
|
|||||||
SurfaceControl.closeTransaction();
|
SurfaceControl.closeTransaction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void requestInvalidate() {
|
|
||||||
invalidate();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ public abstract class SurfaceCapture {
|
|||||||
private CaptureListener listener;
|
private CaptureListener listener;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notify the listener that the capture has been invalidated (for example, because its size changed).
|
* Notify the listener that the capture has been invalidated (for example, because its size changed, or due to a manual user request).
|
||||||
*/
|
*/
|
||||||
protected void invalidate() {
|
public void invalidate() {
|
||||||
listener.onInvalidated();
|
listener.onInvalidated();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,11 +86,4 @@ public abstract class SurfaceCapture {
|
|||||||
public boolean isClosed() {
|
public boolean isClosed() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Manually request to invalidate (typically a user request).
|
|
||||||
* <p>
|
|
||||||
* The capture implementation is free to ignore the request and do nothing.
|
|
||||||
*/
|
|
||||||
public abstract void requestInvalidate();
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user