Skip to content

Commit

Permalink
Rename rotationChanged to resetCapture
Browse files Browse the repository at this point in the history
The flag is used to reset the capture (restart the encoding) on rotation
change. It will also be used for other events (on folding change), so
rename it.

PR #3979 <#3979>
  • Loading branch information
rom1v committed Jun 1, 2023
1 parent 9a2abba commit 8e2c0d6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ScreenEncoder implements Device.RotationListener, AsyncProcessor {
private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};
private static final int MAX_CONSECUTIVE_ERRORS = 3;

private final AtomicBoolean rotationChanged = new AtomicBoolean();
private final AtomicBoolean resetCapture = new AtomicBoolean();

private final Device device;
private final Streamer streamer;
Expand Down Expand Up @@ -55,11 +55,11 @@ public ScreenEncoder(Device device, Streamer streamer, int videoBitRate, int max

@Override
public void onRotationChanged(int rotation) {
rotationChanged.set(true);
resetCapture.set(true);
}

private boolean consumeRotationChange() {
return rotationChanged.getAndSet(false);
private boolean consumeResetCapture() {
return resetCapture.getAndSet(false);
}

private void streamScreen() throws IOException, ConfigurationException {
Expand Down Expand Up @@ -169,14 +169,14 @@ private boolean encode(MediaCodec codec, Streamer streamer) throws IOException {
boolean alive = true;
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();

while (!consumeRotationChange() && !eof) {
while (!consumeResetCapture() && !eof) {
if (stopped.get()) {
alive = false;
break;
}
int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
try {
if (consumeRotationChange()) {
if (consumeResetCapture()) {
// must restart encoding with new size
break;
}
Expand Down

0 comments on commit 8e2c0d6

Please sign in to comment.