sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename INPUT_TYPE_TEXID, and cleanup.

Browse source 
PiperOrigin-RevId: 525761936
This commit is contained in:
claincly 2023-04-20 17:02:02 +01:00 committed by Rohit Singh
parent d7983f9485
commit acbd340e84
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/common/src/main/java/androidx/media3/common/VideoFrameProcessor.java
View file

@ -48,22 +48,22 @@ public interface VideoFrameProcessor {
// TODO(b/243036513): Allow effects to be replaced. // TODO(b/243036513): Allow effects to be replaced.
/** /**
* Specifies how the input frames are made available to the {@link VideoFrameProcessor}. One of * Specifies how the input frames are made available to the {@link VideoFrameProcessor}. One of
* {@link #INPUT_TYPE_SURFACE}, {@link #INPUT_TYPE_BITMAP} or {@link #INPUT_TYPE_TEXID}. * {@link #INPUT_TYPE_SURFACE}, {@link #INPUT_TYPE_BITMAP} or {@link #INPUT_TYPE_TEXTURE_ID}.
*/ */
@Documented @Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@Target(TYPE_USE) @Target(TYPE_USE)
@IntDef({INPUT_TYPE_SURFACE, INPUT_TYPE_BITMAP, INPUT_TYPE_TEXID}) @IntDef({INPUT_TYPE_SURFACE, INPUT_TYPE_BITMAP, INPUT_TYPE_TEXTURE_ID})
public @interface InputType {} @interface InputType {}
/** Input frames come from a {@link #getInputSurface surface}. */ /** Input frames come from a {@link #getInputSurface surface}. */
public static final int INPUT_TYPE_SURFACE = 1; int INPUT_TYPE_SURFACE = 1;
/** Input frames come from a {@link Bitmap}. */ /** Input frames come from a {@link Bitmap}. */
public static final int INPUT_TYPE_BITMAP = 2; int INPUT_TYPE_BITMAP = 2;
/** /**
* Input frames come from a {@linkplain android.opengl.GLES10#GL_TEXTURE_2D traditional GLES * Input frames come from a {@linkplain android.opengl.GLES10#GL_TEXTURE_2D traditional GLES
* texture}. * texture}.
*/ */
public static final int INPUT_TYPE_TEXID = 3; int INPUT_TYPE_TEXTURE_ID = 3;
/** A factory for {@link VideoFrameProcessor} instances. */ /** A factory for {@link VideoFrameProcessor} instances. */
interface Factory { interface Factory {

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

@ -288,7 +288,7 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
new BitmapTextureManager(inputShaderProgram, videoFrameProcessingTaskExecutor); new BitmapTextureManager(inputShaderProgram, videoFrameProcessingTaskExecutor);
inputShaderProgram.setInputListener(inputBitmapTextureManager); inputShaderProgram.setInputListener(inputBitmapTextureManager);
break; break;
case VideoFrameProcessor.INPUT_TYPE_TEXID: // fall through case VideoFrameProcessor.INPUT_TYPE_TEXTURE_ID: // fall through
default: default:
throw new VideoFrameProcessingException("Input type not supported yet"); throw new VideoFrameProcessingException("Input type not supported yet");
} }