Skip to content

SDK / exoplayer

Go to a project
Commit e6c8136a by claincly Committed by Marc Baechinger
Options

Add an input switcher to switch between input types. 

Also make FinalShaderProgramWrapper always receive internal texture.

This means it does not sample from a input texture, and its input color is
always linear, hence the input type does not matter.

PiperOrigin-RevId: 527869045
parent ca4928cf
Expand all
Inline Side-by-side
Showing with 7 additions and 54 deletions
library/effect/src/main/java/com/google/android/exoplayer2/effect/BitmapTextureManager.java
...@@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* *
* <p>Public methods in this class can be called from any thread. * <p>Public methods in this class can be called from any thread.
*/ */
/* package */ final class BitmapTextureManager implements InputHandler { /* package */ final class BitmapTextureManager implements TextureManager {
private final GlShaderProgram shaderProgram; private final GlShaderProgram shaderProgram;
private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor; private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor;
// The queue holds all bitmaps with one or more frames pending to be sent downstream. // The queue holds all bitmaps with one or more frames pending to be sent downstream.
......
library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureManager.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.effect; package com.google.android.exoplayer2.effect;
import static com.google.android.exoplayer2.util.Assertions.checkState;
import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull; import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
import android.graphics.Bitmap; import android.graphics.Bitmap;
...@@ -35,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -35,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* Forwards externally produced frames that become available via a {@link SurfaceTexture} to an * Forwards externally produced frames that become available via a {@link SurfaceTexture} to an
* {@link ExternalShaderProgram} for consumption. * {@link ExternalShaderProgram} for consumption.
*/ */
/* package */ final class ExternalTextureManager implements InputHandler { /* package */ final class ExternalTextureManager implements TextureManager {
private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor; private final VideoFrameProcessingTaskExecutor videoFrameProcessingTaskExecutor;
private final ExternalShaderProgram externalShaderProgram; private final ExternalShaderProgram externalShaderProgram;
...@@ -167,6 +168,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -167,6 +168,7 @@ import java.util.concurrent.atomic.AtomicInteger;
*/ */
@Override @Override
public void registerInputFrame(FrameInfo frame) { public void registerInputFrame(FrameInfo frame) {
checkState(!inputStreamEnded);
pendingFrames.add(frame); pendingFrames.add(frame);
} }
......
library/effect/src/main/java/com/google/android/exoplayer2/effect/FinalShaderProgramWrapper.java
...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.effect; ...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.effect;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
import static com.google.android.exoplayer2.util.VideoFrameProcessor.INPUT_TYPE_SURFACE;
import android.content.Context; import android.content.Context;
import android.opengl.EGL14; import android.opengl.EGL14;
...@@ -63,7 +62,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -63,7 +62,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* <p>This wrapper is used for the final {@link DefaultShaderProgram} instance in the chain of * <p>This wrapper is used for the final {@link DefaultShaderProgram} instance in the chain of
* {@link DefaultShaderProgram} instances used by {@link VideoFrameProcessor}. * {@link DefaultShaderProgram} instances used by {@link VideoFrameProcessor}.
*/ */
/* package */ final class FinalShaderProgramWrapper implements ExternalShaderProgram { /* package */ final class FinalShaderProgramWrapper implements GlShaderProgram {
/** Listener interface for the current input stream ending. */ /** Listener interface for the current input stream ending. */
interface OnInputStreamProcessedListener { interface OnInputStreamProcessedListener {
...@@ -82,15 +81,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -82,15 +81,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private final EGLDisplay eglDisplay; private final EGLDisplay eglDisplay;
private final EGLContext eglContext; private final EGLContext eglContext;
private final DebugViewProvider debugViewProvider; private final DebugViewProvider debugViewProvider;
private final boolean sampleFromInputTexture;
private final @VideoFrameProcessor.InputType int inputType;
private final ColorInfo inputColorInfo;
private final ColorInfo outputColorInfo; private final ColorInfo outputColorInfo;
private final boolean enableColorTransfers; private final boolean enableColorTransfers;
private final boolean renderFramesAutomatically; private final boolean renderFramesAutomatically;
private final Executor videoFrameProcessorListenerExecutor; private final Executor videoFrameProcessorListenerExecutor;
private final VideoFrameProcessor.Listener videoFrameProcessorListener; private final VideoFrameProcessor.Listener videoFrameProcessorListener;
private final float[] textureTransformMatrix;
private final Queue<Pair<GlTextureInfo, Long>> availableFrames; private final Queue<Pair<GlTextureInfo, Long>> availableFrames;
@Nullable private final DefaultVideoFrameProcessor.TextureOutputListener textureOutputListener; @Nullable private final DefaultVideoFrameProcessor.TextureOutputListener textureOutputListener;
...@@ -127,8 +122,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -127,8 +122,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
ColorInfo inputColorInfo, ColorInfo inputColorInfo,
ColorInfo outputColorInfo, ColorInfo outputColorInfo,
boolean enableColorTransfers, boolean enableColorTransfers,
boolean sampleFromInputTexture,
@VideoFrameProcessor.InputType int inputType,
boolean renderFramesAutomatically, boolean renderFramesAutomatically,
Executor videoFrameProcessorListenerExecutor, Executor videoFrameProcessorListenerExecutor,
VideoFrameProcessor.Listener videoFrameProcessorListener, VideoFrameProcessor.Listener videoFrameProcessorListener,
...@@ -140,9 +133,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -140,9 +133,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
this.eglDisplay = eglDisplay; this.eglDisplay = eglDisplay;
this.eglContext = eglContext; this.eglContext = eglContext;
this.debugViewProvider = debugViewProvider; this.debugViewProvider = debugViewProvider;
this.sampleFromInputTexture = sampleFromInputTexture;
this.inputType = inputType;
this.inputColorInfo = inputColorInfo;
this.outputColorInfo = outputColorInfo; this.outputColorInfo = outputColorInfo;
this.enableColorTransfers = enableColorTransfers; this.enableColorTransfers = enableColorTransfers;
this.renderFramesAutomatically = renderFramesAutomatically; this.renderFramesAutomatically = renderFramesAutomatically;
...@@ -151,7 +141,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -151,7 +141,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
this.glObjectsProvider = glObjectsProvider; this.glObjectsProvider = glObjectsProvider;
this.textureOutputListener = textureOutputListener; this.textureOutputListener = textureOutputListener;
textureTransformMatrix = GlUtil.create4x4IdentityMatrix();
inputListener = new InputListener() {}; inputListener = new InputListener() {};
availableFrames = new ConcurrentLinkedQueue<>(); availableFrames = new ConcurrentLinkedQueue<>();
} }
...@@ -241,20 +230,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -241,20 +230,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} }
@Override @Override
public void setTextureTransformMatrix(float[] textureTransformMatrix) {
System.arraycopy(
/* src= */ textureTransformMatrix,
/* srcPos= */ 0,
/* dest= */ this.textureTransformMatrix,
/* destPost= */ 0,
/* length= */ textureTransformMatrix.length);
if (defaultShaderProgram != null) {
defaultShaderProgram.setTextureTransformMatrix(textureTransformMatrix);
}
}
@Override
public synchronized void release() throws VideoFrameProcessingException { public synchronized void release() throws VideoFrameProcessingException {
if (defaultShaderProgram != null) { if (defaultShaderProgram != null) {
defaultShaderProgram.release(); defaultShaderProgram.release();
...@@ -479,28 +454,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -479,28 +454,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
DefaultShaderProgram defaultShaderProgram; DefaultShaderProgram defaultShaderProgram;
ImmutableList<GlMatrixTransformation> expandedMatrixTransformations = ImmutableList<GlMatrixTransformation> expandedMatrixTransformations =
matrixTransformationListBuilder.build(); matrixTransformationListBuilder.build();
if (sampleFromInputTexture) {
if (inputType == INPUT_TYPE_SURFACE) {
defaultShaderProgram =
DefaultShaderProgram.createWithExternalSampler(
context,
expandedMatrixTransformations,
rgbMatrices,
inputColorInfo,
outputColorInfo,
enableColorTransfers);
} else {
defaultShaderProgram =
DefaultShaderProgram.createWithInternalSampler(
context,
expandedMatrixTransformations,
rgbMatrices,
inputColorInfo,
outputColorInfo,
enableColorTransfers,
inputType);
}
} else {
defaultShaderProgram = defaultShaderProgram =
DefaultShaderProgram.createApplyingOetf( DefaultShaderProgram.createApplyingOetf(
context, context,
...@@ -508,9 +461,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -508,9 +461,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
rgbMatrices, rgbMatrices,
outputColorInfo, outputColorInfo,
enableColorTransfers); enableColorTransfers);
}
defaultShaderProgram.setTextureTransformMatrix(textureTransformMatrix);
Size outputSize = defaultShaderProgram.configure(inputWidth, inputHeight); Size outputSize = defaultShaderProgram.configure(inputWidth, inputHeight);
if (outputSurfaceInfo != null) { if (outputSurfaceInfo != null) {
SurfaceInfo outputSurfaceInfo = checkNotNull(this.outputSurfaceInfo); SurfaceInfo outputSurfaceInfo = checkNotNull(this.outputSurfaceInfo);
......
library/effect/src/main/java/com/google/android/exoplayer2/effect/InputHandler.java → library/effect/src/main/java/com/google/android/exoplayer2/effect/TextureManager.java
...@@ -25,7 +25,7 @@ import com.google.android.exoplayer2.util.FrameInfo; ...@@ -25,7 +25,7 @@ import com.google.android.exoplayer2.util.FrameInfo;
import com.google.android.exoplayer2.util.VideoFrameProcessor; import com.google.android.exoplayer2.util.VideoFrameProcessor;
/** A component that handles {@code DefaultVideoFrameProcessor}'s input. */ /** A component that handles {@code DefaultVideoFrameProcessor}'s input. */
/* package */ interface InputHandler extends GlShaderProgram.InputListener { /* package */ interface TextureManager extends GlShaderProgram.InputListener {
/** /**
* See {@link DefaultVideoFrameProcessor#setInputDefaultBufferSize}. * See {@link DefaultVideoFrameProcessor#setInputDefaultBufferSize}.
...@@ -61,7 +61,7 @@ import com.google.android.exoplayer2.util.VideoFrameProcessor; ...@@ -61,7 +61,7 @@ import com.google.android.exoplayer2.util.VideoFrameProcessor;
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
/** Informs the {@code InputHandler} that a frame will be queued. */ /** Informs the {@code TextureManager} that a frame will be queued. */
default void registerInputFrame(FrameInfo frameInfo) { default void registerInputFrame(FrameInfo frameInfo) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment