diff --git a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/BitmapOverlayProcessor.java b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/BitmapOverlayProcessor.java index c88d850680..50ca5f720e 100644 --- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/BitmapOverlayProcessor.java +++ b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/BitmapOverlayProcessor.java @@ -29,8 +29,8 @@ import android.graphics.drawable.BitmapDrawable; import android.opengl.GLES20; import android.opengl.GLUtils; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.transformer.FrameProcessingException; import com.google.android.exoplayer2.transformer.SingleFrameGlTextureProcessor; import com.google.android.exoplayer2.util.GlProgram; import com.google.android.exoplayer2.util.GlUtil; diff --git a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteProcessor.java b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteProcessor.java index f3badb1076..38a97f8e2d 100644 --- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteProcessor.java +++ b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteProcessor.java @@ -20,7 +20,7 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument; import android.content.Context; import android.opengl.GLES20; import android.util.Pair; -import com.google.android.exoplayer2.transformer.FrameProcessingException; +import androidx.media3.common.FrameProcessingException; import com.google.android.exoplayer2.transformer.SingleFrameGlTextureProcessor; import com.google.android.exoplayer2.util.GlProgram; import com.google.android.exoplayer2.util.GlUtil; diff --git a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java index 7c139680c1..0627dd2bdf 100644 --- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java +++ b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java @@ -35,13 +35,13 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatActivity; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.transformer.Contrast; -import com.google.android.exoplayer2.transformer.DebugViewProvider; import com.google.android.exoplayer2.transformer.DefaultEncoderFactory; -import com.google.android.exoplayer2.transformer.Effect; import com.google.android.exoplayer2.transformer.GlEffect; import com.google.android.exoplayer2.transformer.GlTextureProcessor; import com.google.android.exoplayer2.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 cc5eb411cc..4fd415dfed 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 @@ -24,8 +24,8 @@ import android.opengl.EGL14; import android.os.Build; import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.Nullable; +import androidx.media3.common.FrameProcessingException; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.transformer.FrameProcessingException; import com.google.android.exoplayer2.transformer.GlTextureProcessor; import com.google.android.exoplayer2.transformer.TextureInfo; import com.google.android.exoplayer2.util.LibraryLoader; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DebugViewProvider.java b/library/common/src/main/java/androidx/media3/common/DebugViewProvider.java similarity index 96% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DebugViewProvider.java rename to library/common/src/main/java/androidx/media3/common/DebugViewProvider.java index f50fca05ff..b5a6c75f00 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DebugViewProvider.java +++ b/library/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 com.google.android.exoplayer2.transformer; +package androidx.media3.common; import android.view.SurfaceView; import androidx.annotation.Nullable; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Effect.java b/library/common/src/main/java/androidx/media3/common/Effect.java similarity index 93% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Effect.java rename to library/common/src/main/java/androidx/media3/common/Effect.java index af38cd1cdc..1884e2d3ed 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Effect.java +++ b/library/common/src/main/java/androidx/media3/common/Effect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.exoplayer2.transformer; +package androidx.media3.common; /** Marker interface for a video frame effect. */ public interface Effect {} diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameInfo.java b/library/common/src/main/java/androidx/media3/common/FrameInfo.java similarity index 97% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameInfo.java rename to library/common/src/main/java/androidx/media3/common/FrameInfo.java index b09c35b529..ec31ddbd26 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameInfo.java +++ b/library/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 com.google.android.exoplayer2.transformer; +package androidx.media3.common; import static com.google.android.exoplayer2.util.Assertions.checkArgument; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingException.java b/library/common/src/main/java/androidx/media3/common/FrameProcessingException.java similarity index 97% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingException.java rename to library/common/src/main/java/androidx/media3/common/FrameProcessingException.java index 31239faa94..e573eff3bb 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingException.java +++ b/library/common/src/main/java/androidx/media3/common/FrameProcessingException.java @@ -13,9 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.transformer; - -import com.google.android.exoplayer2.C; +package androidx.media3.common; /** Thrown when an exception occurs while applying effects to video frames. */ public final class FrameProcessingException extends Exception { diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessor.java b/library/common/src/main/java/androidx/media3/common/FrameProcessor.java similarity index 99% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessor.java rename to library/common/src/main/java/androidx/media3/common/FrameProcessor.java index fd4c4822ca..73e9e80575 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessor.java +++ b/library/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 com.google.android.exoplayer2.transformer; +package androidx.media3.common; import android.content.Context; import android.view.Surface; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SurfaceInfo.java b/library/common/src/main/java/androidx/media3/common/SurfaceInfo.java similarity index 98% rename from library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SurfaceInfo.java rename to library/common/src/main/java/androidx/media3/common/SurfaceInfo.java index 9ca82d4ae4..0c6b5170f2 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SurfaceInfo.java +++ b/library/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 com.google.android.exoplayer2.transformer; +package androidx.media3.common; import static com.google.android.exoplayer2.util.Assertions.checkArgument; diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/ContrastPixelTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/ContrastPixelTest.java index 03053a1822..31d7512b20 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/ContrastPixelTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/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.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.util.GlUtil; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/CropPixelTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/CropPixelTest.java index 348b88e617..66ffb3dd5d 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/CropPixelTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/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.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.util.GlUtil; import java.io.IOException; diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessorPixelTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessorPixelTest.java index ac473380bd..9c55b8b44a 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessorPixelTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessorPixelTest.java @@ -34,6 +34,12 @@ 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.SurfaceInfo; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.util.MimeTypes; import com.google.common.collect.ImmutableList; diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessorPixelTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessorPixelTest.java index eac025a435..7c9cdb5378 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessorPixelTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/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.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.util.GlUtil; import java.io.IOException; diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/PresentationPixelTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/PresentationPixelTest.java index 74baa2e64d..a49a3162cc 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/PresentationPixelTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/PresentationPixelTest.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.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.GlUtil; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListener.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListener.java index 3b38a9e098..b1865792f1 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListener.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListener.java @@ -17,6 +17,8 @@ package com.google.android.exoplayer2.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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Contrast.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Contrast.java index eb62cc13b1..4a09a813ad 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Contrast.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Contrast.java @@ -19,6 +19,7 @@ package com.google.android.exoplayer2.transformer; import static com.google.android.exoplayer2.util.Assertions.checkArgument; import android.content.Context; +import androidx.media3.common.FrameProcessingException; /** A {@link GlEffect} to control the contrast of video frames. */ public class Contrast implements GlEffect { diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ContrastProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ContrastProcessor.java index 5fc0536bee..6d4b26563b 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ContrastProcessor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/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 com.google.android.exoplayer2.util.GlProgram; import com.google.android.exoplayer2.util.GlUtil; import java.io.IOException; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FinalMatrixTransformationProcessorWrapper.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FinalMatrixTransformationProcessorWrapper.java index 54caf1aba2..b31decb8b0 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FinalMatrixTransformationProcessorWrapper.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FinalMatrixTransformationProcessorWrapper.java @@ -32,6 +32,10 @@ import android.view.SurfaceView; import androidx.annotation.GuardedBy; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; +import androidx.media3.common.SurfaceInfo; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.GlUtil; import com.google.android.exoplayer2.util.Log; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTask.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTask.java index 6f491d2ae6..4a4044abd8 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTask.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTask.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.transformer; +import androidx.media3.common.FrameProcessingException; import com.google.android.exoplayer2.util.GlUtil; /** diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTaskExecutor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTaskExecutor.java index a3c2aac251..0d9c2b2eb7 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTaskExecutor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTaskExecutor.java @@ -17,6 +17,8 @@ package com.google.android.exoplayer2.transformer; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import androidx.media3.common.FrameProcessingException; +import androidx.media3.common.FrameProcessor; import com.google.android.exoplayer2.util.GlUtil; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutionException; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffect.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffect.java index 5f82530246..00f2014313 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffect.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffect.java @@ -16,6 +16,8 @@ package com.google.android.exoplayer2.transformer; import android.content.Context; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameProcessingException; /** * Interface for a video frame effect with a {@link GlTextureProcessor} implementation. diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java index 92e1a123f6..ad16ffeffb 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java @@ -28,6 +28,12 @@ import android.opengl.EGLDisplay; import android.view.Surface; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; +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 com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.GlUtil; import com.google.android.exoplayer2.util.Util; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlMatrixTransformation.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlMatrixTransformation.java index 72d13c07ea..ac4b159d62 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlMatrixTransformation.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlMatrixTransformation.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2.transformer; import android.content.Context; import android.opengl.Matrix; import android.util.Pair; +import androidx.media3.common.FrameProcessingException; /** * Specifies a 4x4 transformation {@link Matrix} to apply in the vertex shader for each frame. diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlTextureProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlTextureProcessor.java index c24dda2670..53010e62db 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlTextureProcessor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlTextureProcessor.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.transformer; +import androidx.media3.common.FrameProcessingException; + /** * Processes frames from one OpenGL 2D texture to another. * diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessor.java index 196ae0ab36..d1970ec5c8 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/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 com.google.android.exoplayer2.util.GlProgram; import com.google.android.exoplayer2.util.GlUtil; import com.google.common.collect.ImmutableList; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SingleFrameGlTextureProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SingleFrameGlTextureProcessor.java index f46d90d366..feec492792 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SingleFrameGlTextureProcessor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SingleFrameGlTextureProcessor.java @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.transformer; import android.util.Pair; import androidx.annotation.CallSuper; +import androidx.media3.common.FrameProcessingException; import com.google.android.exoplayer2.util.GlUtil; import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java index 21246c5012..1e211195dd 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java @@ -22,6 +22,7 @@ import android.media.MediaFormat; import android.os.SystemClock; import androidx.annotation.IntDef; import androidx.annotation.Nullable; +import androidx.media3.common.FrameProcessingException; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.audio.AudioProcessor; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java index ca71fc3d4b..67bc804fc0 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java @@ -33,6 +33,9 @@ import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.annotation.VisibleForTesting; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.ExoPlayer; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java index daa79b8665..82e6a60486 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java @@ -21,6 +21,9 @@ import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Util.SDK_INT; import android.content.Context; +import androidx.media3.common.DebugViewProvider; +import androidx.media3.common.Effect; +import androidx.media3.common.FrameProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java index 3ce9508b1e..4961bdc801 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java @@ -23,6 +23,12 @@ import android.media.MediaCodec; import android.view.Surface; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +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 com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListenerTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListenerTest.java index 3f33c6b423..e3808823b5 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListenerTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/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.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.util.Util; import org.junit.After; diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/VideoEncoderWrapperTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/VideoEncoderWrapperTest.java index 4d4bd5a78f..aa9f5e8f0d 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/VideoEncoderWrapperTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/VideoEncoderWrapperTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.when; import android.net.Uri; import android.os.Looper; +import androidx.media3.common.SurfaceInfo; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format;