loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy releasing FrameProcessorChain

Browse Source 
PiperOrigin-RevId: 449238525
This commit is contained in:
andrewlewis 2022-05-17 17:21:39 +01:00 committed by Ian Baker
parent a9bdd6e2e9
commit dcb58c767c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessorChain.java
View File

@ -50,7 +50,6 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/** /**
* {@code FrameProcessorChain} applies changes to individual video frames. * {@code FrameProcessorChain} applies changes to individual video frames.
@ -439,12 +438,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
} }
futures.add( futures.add(
singleThreadExecutorService.submit(this::releaseFrameProcessorsAndDestroyGlContext)); singleThreadExecutorService.submit(this::releaseFrameProcessorsAndDestroyGlContext));
if (inputSurfaceTexture != null) {
inputSurfaceTexture.release();
}
if (inputSurface != null) {
inputSurface.release();
}
singleThreadExecutorService.shutdown(); singleThreadExecutorService.shutdown();
try { try {
if (!singleThreadExecutorService.awaitTermination(RELEASE_WAIT_TIME_MS, MILLISECONDS)) { if (!singleThreadExecutorService.awaitTermination(RELEASE_WAIT_TIME_MS, MILLISECONDS)) {
@ -452,7 +445,10 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
Log.d(TAG, "FrameProcessorChain release was interrupted", e); Log.d(TAG, "FrameProcessorChain release was interrupted", e);
Thread.currentThread().interrupt();
} }
inputSurfaceTexture.release();
inputSurface.release();
} }
/** /**
@ -491,7 +487,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
* <p>This method must be called on the {@linkplain #THREAD_NAME background thread}. * <p>This method must be called on the {@linkplain #THREAD_NAME background thread}.
*/ */
@WorkerThread @WorkerThread
@RequiresNonNull("inputSurfaceTexture")
private void processFrame() { private void processFrame() {
if (stopProcessing.get()) { if (stopProcessing.get()) {
return; return;