loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename listener in FinalShaderProgramWrapper

Browse Source 
This is to support adding more listener methods later for dynamic effect change

PiperOrigin-RevId: 731297518
This commit is contained in:
claincly 2025-02-26 06:43:57 -08:00 committed by Copybara-Service
parent 37aaef0b32
commit e3e9d88b04
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
View File

@ -526,7 +526,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
this.intermediateGlShaderPrograms = new ArrayList<>();
this.inputStreamRegisteredCondition = new ConditionVariable();
inputStreamRegisteredCondition.open();
this.finalShaderProgramWrapper.setOnInputStreamProcessedListener(
this.finalShaderProgramWrapper.setListener(
() -> {
if (inputStreamEnded) {
listenerExecutor.execute(listener::onEnded);

19
libraries/effect/src/main/java/androidx/media3/effect/FinalShaderProgramWrapper.java
View File

@ -66,7 +66,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
*/
/* package */ final class FinalShaderProgramWrapper implements GlShaderProgram, GlTextureProducer {
interface OnInputStreamProcessedListener {
public interface Listener {
/**
* Called when one input stream is fully processed following {@link
* #signalEndOfCurrentInputStream()}.
*/
void onInputStreamProcessed();
}
@ -103,7 +107,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private boolean isInputStreamEndedWithPendingAvailableFrames;
private InputListener inputListener;
private @MonotonicNonNull Size outputSizeBeforeSurfaceTransformation;
@Nullable private OnInputStreamProcessedListener onInputStreamProcessedListener;
private @MonotonicNonNull Listener listener;
private boolean matrixTransformationsChanged;
private boolean outputSurfaceInfoChanged;
@Nullable private SurfaceInfo outputSurfaceInfo;
@ -120,7 +124,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor,
Executor videoFrameProcessorListenerExecutor,
VideoFrameProcessor.Listener videoFrameProcessorListener,
@Nullable Listener textureOutputListener,
@Nullable GlTextureProducer.Listener textureOutputListener,
int textureOutputCapacity,
@WorkingColorSpace int sdrWorkingColorSpace,
boolean renderFramesAutomatically) {
@ -188,17 +192,16 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
throw new UnsupportedOperationException();
}
public void setOnInputStreamProcessedListener(
@Nullable OnInputStreamProcessedListener onInputStreamProcessedListener) {
public void setListener(Listener listener) {
videoFrameProcessingTaskExecutor.verifyVideoFrameProcessingThread();
this.onInputStreamProcessedListener = onInputStreamProcessedListener;
this.listener = listener;
}
@Override
public void signalEndOfCurrentInputStream() {
videoFrameProcessingTaskExecutor.verifyVideoFrameProcessingThread();
if (availableFrames.isEmpty()) {
checkNotNull(onInputStreamProcessedListener).onInputStreamProcessed();
checkNotNull(listener).onInputStreamProcessed();
isInputStreamEndedWithPendingAvailableFrames = false;
} else {
checkState(!renderFramesAutomatically);
@ -313,7 +316,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
oldestAvailableFrame.presentationTimeUs,
renderTimeNs);
if (availableFrames.isEmpty() && isInputStreamEndedWithPendingAvailableFrames) {
checkNotNull(onInputStreamProcessedListener).onInputStreamProcessed();
checkNotNull(listener).onInputStreamProcessed();
isInputStreamEndedWithPendingAvailableFrames = false;
}
}