From 480c129c54777780f298d7e5dbd9fa23a371f660 Mon Sep 17 00:00:00 2001 From: hschlueter Date: Fri, 29 Jul 2022 12:54:30 +0000 Subject: [PATCH] Move FrameProcessor and related interfaces to common. This will allow effects preview in ExoPlayer to use the Effect and FrameProcessor interface (and the interfaces they depend on) without depending on transformer or the future effects module. PiperOrigin-RevId: 464060047 --- .../media3/demo/transformer/BitmapOverlayProcessor.java | 2 +- .../media3/demo/transformer/PeriodicVignetteProcessor.java | 2 +- .../media3/demo/transformer/TransformerActivity.java | 4 ++-- .../media3/demo/transformer/MediaPipeProcessor.java | 2 +- .../java/androidx/media3/common}/DebugViewProvider.java | 2 +- .../src/main/java/androidx/media3/common}/Effect.java | 2 +- .../src/main/java/androidx/media3/common}/FrameInfo.java | 2 +- .../androidx/media3/common}/FrameProcessingException.java | 3 +-- .../main/java/androidx/media3/common}/FrameProcessor.java | 2 +- .../src/main/java/androidx/media3/common}/SurfaceInfo.java | 2 +- .../java/androidx/media3/transformer/ContrastPixelTest.java | 1 + .../java/androidx/media3/transformer/CropPixelTest.java | 1 + .../transformer/GlEffectsFrameProcessorPixelTest.java | 6 ++++++ .../transformer/MatrixTransformationProcessorPixelTest.java | 1 + .../androidx/media3/transformer/PresentationPixelTest.java | 1 + .../transformer/ChainingGlTextureProcessorListener.java | 2 ++ .../src/main/java/androidx/media3/transformer/Contrast.java | 1 + .../java/androidx/media3/transformer/ContrastProcessor.java | 1 + .../FinalMatrixTransformationProcessorWrapper.java | 4 ++++ .../androidx/media3/transformer/FrameProcessingTask.java | 1 + .../media3/transformer/FrameProcessingTaskExecutor.java | 2 ++ .../src/main/java/androidx/media3/transformer/GlEffect.java | 2 ++ .../media3/transformer/GlEffectsFrameProcessor.java | 6 ++++++ .../androidx/media3/transformer/GlMatrixTransformation.java | 1 + .../androidx/media3/transformer/GlTextureProcessor.java | 1 + .../media3/transformer/MatrixTransformationProcessor.java | 1 + .../media3/transformer/SingleFrameGlTextureProcessor.java | 1 + .../media3/transformer/TransformationException.java | 1 + .../main/java/androidx/media3/transformer/Transformer.java | 3 +++ .../media3/transformer/TransformerVideoRenderer.java | 3 +++ .../media3/transformer/VideoTranscodingSamplePipeline.java | 6 ++++++ .../transformer/ChainingGlTextureProcessorListenerTest.java | 2 ++ .../media3/transformer/VideoEncoderWrapperTest.java | 1 + 33 files changed, 60 insertions(+), 12 deletions(-) rename libraries/{transformer/src/main/java/androidx/media3/transformer => common/src/main/java/androidx/media3/common}/DebugViewProvider.java (97%) rename libraries/{transformer/src/main/java/androidx/media3/transformer => common/src/main/java/androidx/media3/common}/Effect.java (95%) rename libraries/{transformer/src/main/java/androidx/media3/transformer => common/src/main/java/androidx/media3/common}/FrameInfo.java (98%) rename libraries/{transformer/src/main/java/androidx/media3/transformer => common/src/main/java/androidx/media3/common}/FrameProcessingException.java (98%) rename libraries/{transformer/src/main/java/androidx/media3/transformer => common/src/main/java/androidx/media3/common}/FrameProcessor.java (99%) rename libraries/{transformer/src/main/java/androidx/media3/transformer => common/src/main/java/androidx/media3/common}/SurfaceInfo.java (98%) diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java index e26561d08d..90e2676e15 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java +++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java @@ -30,9 +30,9 @@ import android.opengl.GLES20; import android.opengl.GLUtils; import android.util.Pair; import androidx.media3.common.C; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlProgram; import androidx.media3.common.util.GlUtil; -import androidx.media3.transformer.FrameProcessingException; import androidx.media3.transformer.SingleFrameGlTextureProcessor; import java.io.IOException; import java.util.Locale; diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java index 3fc62ef18b..be24e57383 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java +++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java @@ -20,9 +20,9 @@ import static androidx.media3.common.util.Assertions.checkArgument; import android.content.Context; import android.opengl.GLES20; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlProgram; import androidx.media3.common.util.GlUtil; -import androidx.media3.transformer.FrameProcessingException; import androidx.media3.transformer.SingleFrameGlTextureProcessor; import java.io.IOException; diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java index d9ae5d5a3a..b580b1b625 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java +++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java @@ -36,15 +36,15 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatActivity; import androidx.media3.common.C; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; import androidx.media3.common.MediaItem; import androidx.media3.common.util.Log; import androidx.media3.common.util.Util; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.util.DebugTextViewHelper; import androidx.media3.transformer.Contrast; -import androidx.media3.transformer.DebugViewProvider; import androidx.media3.transformer.DefaultEncoderFactory; -import androidx.media3.transformer.Effect; import androidx.media3.transformer.GlEffect; import androidx.media3.transformer.GlTextureProcessor; import androidx.media3.transformer.ProgressHolder; diff --git a/demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeProcessor.java b/demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeProcessor.java index 48e2764daf..c93caf2665 100644 --- a/demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeProcessor.java +++ b/demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeProcessor.java @@ -25,9 +25,9 @@ import android.os.Build; import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.Nullable; import androidx.media3.common.C; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.LibraryLoader; import androidx.media3.common.util.Util; -import androidx.media3.transformer.FrameProcessingException; import androidx.media3.transformer.GlTextureProcessor; import androidx.media3.transformer.TextureInfo; import com.google.mediapipe.components.FrameProcessor; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DebugViewProvider.java b/libraries/common/src/main/java/androidx/media3/common/DebugViewProvider.java similarity index 97% rename from libraries/transformer/src/main/java/androidx/media3/transformer/DebugViewProvider.java rename to libraries/common/src/main/java/androidx/media3/common/DebugViewProvider.java index 9ef2ecb4fb..83f39fa81f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DebugViewProvider.java +++ b/libraries/common/src/main/java/androidx/media3/common/DebugViewProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.common; import android.view.SurfaceView; import androidx.annotation.Nullable; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Effect.java b/libraries/common/src/main/java/androidx/media3/common/Effect.java similarity index 95% rename from libraries/transformer/src/main/java/androidx/media3/transformer/Effect.java rename to libraries/common/src/main/java/androidx/media3/common/Effect.java index 6d85e2f38d..5504b5d9ef 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Effect.java +++ b/libraries/common/src/main/java/androidx/media3/common/Effect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.common; import androidx.media3.common.util.UnstableApi; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameInfo.java b/libraries/common/src/main/java/androidx/media3/common/FrameInfo.java similarity index 98% rename from libraries/transformer/src/main/java/androidx/media3/transformer/FrameInfo.java rename to libraries/common/src/main/java/androidx/media3/common/FrameInfo.java index d70e6b7f5c..6a7301f797 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameInfo.java +++ b/libraries/common/src/main/java/androidx/media3/common/FrameInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.common; import static androidx.media3.common.util.Assertions.checkArgument; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingException.java b/libraries/common/src/main/java/androidx/media3/common/FrameProcessingException.java similarity index 98% rename from libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingException.java rename to libraries/common/src/main/java/androidx/media3/common/FrameProcessingException.java index 1d1d5d47ed..1ec4f476df 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingException.java +++ b/libraries/common/src/main/java/androidx/media3/common/FrameProcessingException.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.common; -import androidx.media3.common.C; import androidx.media3.common.util.UnstableApi; /** Thrown when an exception occurs while applying effects to video frames. */ diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessor.java b/libraries/common/src/main/java/androidx/media3/common/FrameProcessor.java similarity index 99% rename from libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessor.java rename to libraries/common/src/main/java/androidx/media3/common/FrameProcessor.java index 26a370b18f..0e5ef30867 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessor.java +++ b/libraries/common/src/main/java/androidx/media3/common/FrameProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.common; import android.content.Context; import android.view.Surface; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SurfaceInfo.java b/libraries/common/src/main/java/androidx/media3/common/SurfaceInfo.java similarity index 98% rename from libraries/transformer/src/main/java/androidx/media3/transformer/SurfaceInfo.java rename to libraries/common/src/main/java/androidx/media3/common/SurfaceInfo.java index ab2d5ad69f..42477cc132 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SurfaceInfo.java +++ b/libraries/common/src/main/java/androidx/media3/common/SurfaceInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.transformer; +package androidx.media3.common; import static androidx.media3.common.util.Assertions.checkArgument; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java index 2e9f030ea9..3e9ffb31c1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/ContrastPixelTest.java @@ -28,6 +28,7 @@ import android.opengl.EGLContext; import android.opengl.EGLDisplay; import android.opengl.EGLSurface; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlUtil; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java index 877d51048d..a5558aa1b1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CropPixelTest.java @@ -26,6 +26,7 @@ import android.opengl.EGLContext; import android.opengl.EGLDisplay; import android.opengl.EGLSurface; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlUtil; import androidx.test.ext.junit.runners.AndroidJUnit4; import java.io.IOException; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/GlEffectsFrameProcessorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/GlEffectsFrameProcessorPixelTest.java index 404feb0e49..48dc50822a 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/GlEffectsFrameProcessorPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/GlEffectsFrameProcessorPixelTest.java @@ -34,7 +34,13 @@ import android.media.MediaExtractor; import android.media.MediaFormat; import android.util.Pair; import androidx.annotation.Nullable; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameInfo; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; import androidx.media3.common.MimeTypes; +import androidx.media3.common.SurfaceInfo; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; import java.nio.ByteBuffer; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java index ee8c8422b5..4fab3251c9 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/MatrixTransformationProcessorPixelTest.java @@ -25,6 +25,7 @@ import android.graphics.Matrix; import android.opengl.EGLContext; import android.opengl.EGLDisplay; import android.opengl.EGLSurface; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlUtil; import androidx.test.ext.junit.runners.AndroidJUnit4; import java.io.IOException; diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java index 4bf09061e1..9469fa0382 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java @@ -27,6 +27,7 @@ import android.opengl.EGLDisplay; import android.opengl.EGLSurface; import android.util.Pair; import androidx.media3.common.C; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlUtil; import androidx.test.ext.junit.runners.AndroidJUnit4; import java.io.IOException; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ChainingGlTextureProcessorListener.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ChainingGlTextureProcessorListener.java index da2ace4cae..7f7fd8ca04 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ChainingGlTextureProcessorListener.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ChainingGlTextureProcessorListener.java @@ -17,6 +17,8 @@ package androidx.media3.transformer; import android.util.Pair; import androidx.annotation.Nullable; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; import java.util.ArrayDeque; import java.util.Queue; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Contrast.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Contrast.java index 06db7a3a3a..b4399d8ed0 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Contrast.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Contrast.java @@ -19,6 +19,7 @@ package androidx.media3.transformer; import static androidx.media3.common.util.Assertions.checkArgument; import android.content.Context; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.UnstableApi; /** A {@link GlEffect} to control the contrast of video frames. */ diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ContrastProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ContrastProcessor.java index 9f58371dc9..101928895a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ContrastProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ContrastProcessor.java @@ -20,6 +20,7 @@ import android.content.Context; import android.opengl.GLES20; import android.opengl.Matrix; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlProgram; import androidx.media3.common.util.GlUtil; import java.io.IOException; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FinalMatrixTransformationProcessorWrapper.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FinalMatrixTransformationProcessorWrapper.java index 55f6c43458..b22ae5c0ba 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FinalMatrixTransformationProcessorWrapper.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FinalMatrixTransformationProcessorWrapper.java @@ -33,6 +33,10 @@ import androidx.annotation.GuardedBy; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import androidx.media3.common.C; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; +import androidx.media3.common.SurfaceInfo; import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.Log; import androidx.media3.common.util.Util; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTask.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTask.java index e5e12dc14c..e12bcae923 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTask.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTask.java @@ -15,6 +15,7 @@ */ package androidx.media3.transformer; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlUtil; /** diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTaskExecutor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTaskExecutor.java index 86e03bd132..8272e543e4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTaskExecutor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessingTaskExecutor.java @@ -17,6 +17,8 @@ package androidx.media3.transformer; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; import androidx.media3.common.util.GlUtil; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutionException; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffect.java b/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffect.java index aa69767be8..6b57d4d607 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffect.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffect.java @@ -16,6 +16,8 @@ package androidx.media3.transformer; import android.content.Context; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.UnstableApi; /** diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java index fb02c98c8f..c1e31fbed4 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/GlEffectsFrameProcessor.java @@ -29,6 +29,12 @@ import android.view.Surface; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import androidx.media3.common.C; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameInfo; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; +import androidx.media3.common.SurfaceInfo; import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/GlMatrixTransformation.java b/libraries/transformer/src/main/java/androidx/media3/transformer/GlMatrixTransformation.java index 9bf6dcc201..94db69e9ae 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/GlMatrixTransformation.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/GlMatrixTransformation.java @@ -18,6 +18,7 @@ package androidx.media3.transformer; import android.content.Context; import android.opengl.Matrix; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.UnstableApi; /** diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/GlTextureProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/GlTextureProcessor.java index 55cba646bd..a935b8f187 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/GlTextureProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/GlTextureProcessor.java @@ -15,6 +15,7 @@ */ package androidx.media3.transformer; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.UnstableApi; /** diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationProcessor.java index de182e25cc..1107888575 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationProcessor.java @@ -21,6 +21,7 @@ import android.content.Context; import android.opengl.GLES20; import android.opengl.Matrix; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlProgram; import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.UnstableApi; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SingleFrameGlTextureProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SingleFrameGlTextureProcessor.java index b07f7be3c6..cb015b5029 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SingleFrameGlTextureProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SingleFrameGlTextureProcessor.java @@ -17,6 +17,7 @@ package androidx.media3.transformer; import android.util.Pair; import androidx.annotation.CallSuper; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.util.GlUtil; import androidx.media3.common.util.UnstableApi; import org.checkerframework.checker.nullness.qual.EnsuresNonNull; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java index f03ebb9d62..98e8f31f0a 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationException.java @@ -23,6 +23,7 @@ import android.os.SystemClock; import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.media3.common.Format; +import androidx.media3.common.FrameProcessingException; import androidx.media3.common.PlaybackException; import androidx.media3.common.util.Clock; import androidx.media3.common.util.UnstableApi; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java index cd8642b18c..c70eda8bed 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java @@ -34,6 +34,9 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.annotation.VisibleForTesting; import androidx.media3.common.C; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameProcessor; import androidx.media3.common.MediaItem; import androidx.media3.common.MediaLibraryInfo; import androidx.media3.common.MimeTypes; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java index 91f4766c6c..00e5ed117f 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerVideoRenderer.java @@ -23,7 +23,10 @@ import static androidx.media3.exoplayer.source.SampleStream.FLAG_REQUIRE_FORMAT; import android.content.Context; import androidx.media3.common.C; import androidx.media3.common.ColorInfo; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; import androidx.media3.common.Format; +import androidx.media3.common.FrameProcessor; import androidx.media3.decoder.DecoderInputBuffer; import androidx.media3.exoplayer.FormatHolder; import androidx.media3.exoplayer.source.SampleStream.ReadDataResult; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java index 30d7a93284..cf50c5a82b 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java @@ -25,7 +25,13 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.media3.common.C; import androidx.media3.common.ColorInfo; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; import androidx.media3.common.Format; +import androidx.media3.common.FrameInfo; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; +import androidx.media3.common.SurfaceInfo; import androidx.media3.common.util.Util; import androidx.media3.decoder.DecoderInputBuffer; import com.google.common.collect.ImmutableList; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/ChainingGlTextureProcessorListenerTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/ChainingGlTextureProcessorListenerTest.java index 5f141cd0ae..37b00cd902 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/ChainingGlTextureProcessorListenerTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/ChainingGlTextureProcessorListenerTest.java @@ -20,6 +20,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; import androidx.media3.common.util.Util; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.After; diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/VideoEncoderWrapperTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/VideoEncoderWrapperTest.java index 4f546b88af..e92ed9db6a 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/VideoEncoderWrapperTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/VideoEncoderWrapperTest.java @@ -25,6 +25,7 @@ import androidx.media3.common.C; import androidx.media3.common.Format; import androidx.media3.common.MediaItem; import androidx.media3.common.MimeTypes; +import androidx.media3.common.SurfaceInfo; import androidx.media3.common.util.Clock; import androidx.media3.common.util.ListenerSet; import androidx.test.ext.junit.runners.AndroidJUnit4;