Display and control your Android device
Refactor CaptureReset into CaptureControl
Romain Vimont1136def6a9b0
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java b/server/src/main/java/com/genymobile/scrcpy/control/Controller.javaindex 330eb0ff..3242c8c4 100644--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java@@ -862,7 +862,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {private void resetVideo() {if (surfaceCapture != null) {Ln.i("Video capture reset");- surfaceCapture.invalidate();+ surfaceCapture.getCaptureControl().reset();}}}diff --git a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.javaindex 37edf0e1..0d3b3abe 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/CameraCapture.java@@ -327,7 +327,7 @@ public class CameraCapture extends SurfaceCapture {} catch (CameraAccessException e) {Ln.e("Camera error", e);disconnected.set(true);- invalidate();+ getCaptureControl().reset();}}@@ -335,7 +335,7 @@ public class CameraCapture extends SurfaceCapture {public void onConfigureFailed(CameraCaptureSession session) {Ln.e("Camera configuration error");disconnected.set(true);- invalidate();+ getCaptureControl().reset();}});@@ -392,7 +392,7 @@ public class CameraCapture extends SurfaceCapture {public void onDisconnected(CameraDevice camera) {Ln.w("Camera disconnected");disconnected.set(true);- invalidate();+ getCaptureControl().reset();}@Overridediff --git a/server/src/main/java/com/genymobile/scrcpy/video/CaptureReset.java b/server/src/main/java/com/genymobile/scrcpy/video/CaptureControl.javasimilarity index 84%rename from server/src/main/java/com/genymobile/scrcpy/video/CaptureReset.javarename to server/src/main/java/com/genymobile/scrcpy/video/CaptureControl.javaindex 79d32d7c..001f297d 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/CaptureReset.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/CaptureControl.java@@ -4,7 +4,7 @@ import android.media.MediaCodec;import java.util.concurrent.atomic.AtomicBoolean;-public class CaptureReset implements SurfaceCapture.CaptureListener {+public class CaptureControl {private final AtomicBoolean reset = new AtomicBoolean();@@ -29,9 +29,4 @@ public class CaptureReset implements SurfaceCapture.CaptureListener {public synchronized void setRunningMediaCodec(MediaCodec runningMediaCodec) {this.runningMediaCodec = runningMediaCodec;}-- @Override- public void onInvalidated() {- reset();- }}diff --git a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.javaindex 33f14784..10406cd7 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java@@ -121,7 +121,7 @@ public class NewDisplayCapture extends SurfaceCapture {}displayRotation = 0;- // Set the current display properties to avoid an unnecessary call to invalidate()+ // Set the current display properties to avoid an unnecessary capture resetdisplayMonitor.setSessionDisplayProperties(new DisplayProperties(displaySize, displayRotation));} else {DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(virtualDisplay.getDisplay().getDisplayId());@@ -205,7 +205,7 @@ public class NewDisplayCapture extends SurfaceCapture {ServiceManager.getWindowManager().setDisplayImePolicy(virtualDisplayId, displayImePolicy);}- displayMonitor.start(virtualDisplayId, this::invalidate);+ displayMonitor.start(virtualDisplayId, () -> getCaptureControl().reset());} catch (Exception e) {Ln.e("Could not create display", e);throw new AssertionError("Could not create display");diff --git a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.javaindex ca6da768..912b46c6 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java@@ -64,7 +64,7 @@ public class ScreenCapture extends SurfaceCapture {@Overridepublic void init(VideoConstraints videoConstraints) {this.videoConstraints = videoConstraints;- displayMonitor.start(displayId, this::invalidate);+ displayMonitor.start(displayId, () -> getCaptureControl().reset());}@Overridediff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.javaindex 7c39f649..c62857e8 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java@@ -12,27 +12,20 @@ import java.io.IOException;*/public abstract class SurfaceCapture {- public interface CaptureListener {- void onInvalidated();- }-- private CaptureListener listener;-- /**- * Notify the listener that the capture has been invalidated (for example, because its size changed, or due to a manual user request).- */- public void invalidate() {- listener.onInvalidated();- }+ private CaptureControl captureControl;/*** Called once before the first capture starts.*/- public final void init(CaptureListener listener, VideoConstraints videoConstraints) throws ConfigurationException, IOException {- this.listener = listener;+ public final void init(CaptureControl captureControl, VideoConstraints videoConstraints) throws ConfigurationException, IOException {+ this.captureControl = captureControl;init(videoConstraints);}+ public CaptureControl getCaptureControl() {+ return captureControl;+ }+/*** Called once before the first capture starts.*diff --git a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.javaindex 0333203e..5c56ed3a 100644--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java@@ -43,7 +43,7 @@ public class SurfaceEncoder implements AsyncProcessor {private Thread thread;private final AtomicBoolean stopped = new AtomicBoolean();- private final CaptureReset reset = new CaptureReset();+ private final CaptureControl captureControl = new CaptureControl();public SurfaceEncoder(SurfaceCapture capture, Streamer streamer, Options options) {this.capture = capture;@@ -89,7 +89,7 @@ public class SurfaceEncoder implements AsyncProcessor {assert caps != null; // caps cannot be null for a video codecVideoConstraints constraints = createVideoConstraints(maxSize, minSizeAlignment, caps);- capture.init(reset, constraints);+ capture.init(captureControl, constraints);try {boolean alive;@@ -97,7 +97,7 @@ public class SurfaceEncoder implements AsyncProcessor {streamer.writeVideoHeader();do {- reset.consumeReset(); // If a capture reset was requested, it is implicitly fulfilled+ captureControl.consumeReset(); // If a capture reset was requested, it is implicitly fulfilledcapture.prepare();Size size = capture.getSize();@@ -118,12 +118,12 @@ public class SurfaceEncoder implements AsyncProcessor {mediaCodecStarted = true;// Set the MediaCodec instance to "interrupt" (by signaling an EOS) on reset- reset.setRunningMediaCodec(mediaCodec);+ captureControl.setRunningMediaCodec(mediaCodec);if (stopped.get()) {alive = false;} else {- boolean resetRequested = reset.consumeReset();+ boolean resetRequested = captureControl.consumeReset();if (!resetRequested) {// If a reset is requested during encode(), it will interrupt the encoding by an EOSstreamer.writeSessionMeta(size.getWidth(), size.getHeight());@@ -133,7 +133,7 @@ public class SurfaceEncoder implements AsyncProcessor {alive = !stopped.get() && !capture.isClosed();}} finally {- reset.setRunningMediaCodec(null);+ captureControl.setRunningMediaCodec(null);if (captureStarted) {capture.stop();}@@ -275,7 +275,7 @@ public class SurfaceEncoder implements AsyncProcessor {public void stop() {if (thread != null) {stopped.set(true);- reset.reset();+ captureControl.reset();}}