Map lib-effect from androidx to exoplayer2

PiperOrigin-RevId: 482179761
(cherry picked from commit 28c4be2f6bd56205e3b8128bf710c34b3b3d65e9)

core_settings.gradle

@@ -82,8 +82,8 @@ project(modulePrefix + 'library-extractor').projectDir = new File(rootDir, 'libr
 include modulePrefix + 'extension-cast'
 project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
 
-include modulePrefix + 'lib-effect'
-project(modulePrefix + 'lib-effect').projectDir = new File(rootDir, 'libraries/effect')
+include modulePrefix + 'library-effect'
+project(modulePrefix + 'library-effect').projectDir = new File(rootDir, 'library/effect')
 
 include modulePrefix + 'library-transformer'
 project(modulePrefix + 'library-transformer').projectDir = new File(rootDir, 'library/transformer')

demos/transformer/build.gradle

@@ -77,7 +77,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:' + androidxConstraintLayoutVersion
     implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
-    implementation project(modulePrefix + 'lib-effect')
+    implementation project(modulePrefix + 'library-effect')
     implementation project(modulePrefix + 'library-core')
     implementation project(modulePrefix + 'library-dash')
     implementation project(modulePrefix + 'library-transformer')

demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/BitmapOverlayProcessor.java

@@ -29,9 +29,9 @@ import android.graphics.drawable.BitmapDrawable;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
 import android.util.Pair;
-import androidx.media3.common.FrameProcessingException;
-import androidx.media3.effect.SingleFrameGlTextureProcessor;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.effect.SingleFrameGlTextureProcessor;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;

demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/MatrixTransformationFactory.java

@@ -16,9 +16,9 @@
 package com.google.android.exoplayer2.transformerdemo;
 
 import android.graphics.Matrix;
-import androidx.media3.effect.GlMatrixTransformation;
-import androidx.media3.effect.MatrixTransformation;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.effect.GlMatrixTransformation;
+import com.google.android.exoplayer2.effect.MatrixTransformation;
 import com.google.android.exoplayer2.util.Util;
 
 /**

demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteProcessor.java

@@ -20,8 +20,8 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import android.content.Context;
 import android.opengl.GLES20;
 import android.util.Pair;
-import androidx.media3.common.FrameProcessingException;
-import androidx.media3.effect.SingleFrameGlTextureProcessor;
+import com.google.android.exoplayer2.effect.SingleFrameGlTextureProcessor;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;

demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java

@@ -37,19 +37,17 @@ 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 androidx.media3.effect.Contrast;
-import androidx.media3.effect.GlEffect;
-import androidx.media3.effect.GlTextureProcessor;
-import androidx.media3.effect.HslAdjustment;
-import androidx.media3.effect.RgbAdjustment;
-import androidx.media3.effect.RgbFilter;
-import androidx.media3.effect.RgbMatrix;
-import androidx.media3.effect.SingleColorLut;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
+import com.google.android.exoplayer2.effect.Contrast;
+import com.google.android.exoplayer2.effect.GlEffect;
+import com.google.android.exoplayer2.effect.GlTextureProcessor;
+import com.google.android.exoplayer2.effect.HslAdjustment;
+import com.google.android.exoplayer2.effect.RgbAdjustment;
+import com.google.android.exoplayer2.effect.RgbFilter;
+import com.google.android.exoplayer2.effect.RgbMatrix;
+import com.google.android.exoplayer2.effect.SingleColorLut;
 import com.google.android.exoplayer2.transformer.DefaultEncoderFactory;
 import com.google.android.exoplayer2.transformer.ProgressHolder;
 import com.google.android.exoplayer2.transformer.TransformationException;
@@ -59,6 +57,8 @@ import com.google.android.exoplayer2.transformer.Transformer;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.util.DebugTextViewHelper;
+import com.google.android.exoplayer2.util.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.material.card.MaterialCardView;

demos/transformer/src/withMediaPipe/java/androidx/media3/demo/transformer/MediaPipeProcessor.java

@@ -23,10 +23,10 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import android.content.Context;
 import android.opengl.EGL14;
 import androidx.annotation.Nullable;
-import androidx.media3.common.FrameProcessingException;
-import androidx.media3.effect.GlTextureProcessor;
-import androidx.media3.effect.TextureInfo;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.effect.GlTextureProcessor;
+import com.google.android.exoplayer2.effect.TextureInfo;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.LibraryLoader;
 import com.google.android.exoplayer2.util.Util;
 import com.google.mediapipe.components.FrameProcessor;

library/common/src/main/java/com/google/android/exoplayer2/util/DebugViewProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common;
+package com.google.android.exoplayer2.util;
 
 import android.view.SurfaceView;
 import androidx.annotation.Nullable;

library/common/src/main/java/com/google/android/exoplayer2/util/Effect.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.media3.common;
+package com.google.android.exoplayer2.util;
 
 /** Marker interface for a video frame effect. */
 public interface Effect {}

library/common/src/main/java/com/google/android/exoplayer2/util/FrameInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common;
+package com.google.android.exoplayer2.util;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 

library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessingException.java

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common;
+package com.google.android.exoplayer2.util;
+
+import com.google.android.exoplayer2.C;
 
 /** Thrown when an exception occurs while applying effects to video frames. */
 public final class FrameProcessingException extends Exception {

library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessor.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common;
+package com.google.android.exoplayer2.util;
 
 import android.content.Context;
 import android.opengl.EGLExt;
 import android.view.Surface;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.video.ColorInfo;
 import java.util.List;
 
 /**

library/common/src/main/java/com/google/android/exoplayer2/util/SurfaceInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common;
+package com.google.android.exoplayer2.util;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 

library/effect/README.md

@@ -7,13 +7,13 @@ Provides functionality for applying effects to video frames.
 The easiest way to get the module is to add it as a gradle dependency:
 
 ```gradle
-implementation 'androidx.media3:media3-effect:1.X.X'
+implementation 'com.google.android.exoplayer:exoplayer-effect:2.X.X'
 ```
 
-where `1.X.X` is the version, which must match the version of the other media
+where `2.X.X` is the version, which must match the version of the other media
 modules being used.
 
 Alternatively, you can clone this GitHub project and depend on the module
 locally. Instructions for doing this can be found in the [top level README][].
 
-[top level README]: ../../README.md
+[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md

library/effect/src/androidTest/AndroidManifest.xml

@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.media3.effect">
+    package="com.google.android.exoplayer2.effect">
 
   <uses-sdk/>
 
@@ -26,7 +26,7 @@
       android:usesCleartextTraffic="true"/>
 
   <instrumentation
-      android:targetPackage="androidx.media3.effect"
+      android:targetPackage="com.google.android.exoplayer2.effect"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>
 
 </manifest>

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/BitmapTestUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.common.truth.Truth.assertThat;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapWithSolidColor;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapWithSolidColor;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -34,8 +34,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/CropPixelTest.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,8 +31,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorFrameReleaseTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
@@ -22,13 +22,13 @@ import static com.google.common.truth.Truth.assertThat;
 import android.graphics.PixelFormat;
 import android.media.Image;
 import android.media.ImageReader;
-import androidx.media3.common.DebugViewProvider;
-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.DebugViewProvider;
+import com.google.android.exoplayer2.util.FrameInfo;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorPixelTest.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromRgba8888Image;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromRgba8888Image;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
 import static com.google.common.truth.Truth.assertThat;
@@ -34,14 +34,14 @@ import android.media.Image;
 import android.media.ImageReader;
 import android.media.MediaFormat;
 import android.util.Pair;
-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.testutil.DecodeOneFrameUtil;
+import com.google.android.exoplayer2.util.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
+import com.google.android.exoplayer2.util.FrameInfo;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
+import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;
 import java.util.List;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapWithSolidColor;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapWithSolidColor;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
@@ -33,8 +33,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/MatrixTextureProcessorPixelTest.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
@@ -30,8 +30,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/PresentationPixelTest.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -31,9 +31,9 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbAdjustmentPixelTest.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapWithSolidColor;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapWithSolidColor;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -34,8 +34,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbFilterPixelTest.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -32,8 +32,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/SingleColorLutPixelTest.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
-import static androidx.media3.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
-import static androidx.media3.effect.BitmapTestUtil.createGlTextureFromBitmap;
-import static androidx.media3.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
-import static androidx.media3.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
-import static androidx.media3.effect.BitmapTestUtil.readBitmap;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createArgb8888BitmapFromCurrentGlFramebuffer;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.createGlTextureFromBitmap;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.getBitmapAveragePixelAbsoluteDifferenceArgb8888;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.maybeSaveTestBitmapToCacheDirectory;
+import static com.google.android.exoplayer2.effect.BitmapTestUtil.readBitmap;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 
@@ -33,8 +33,8 @@ 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.junit.After;

library/effect/src/main/AndroidManifest.xml

@@ -13,6 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest package="androidx.media3.effect">
+<manifest package="com.google.android.exoplayer2.effect">
   <uses-sdk />
 </manifest>

library/effect/src/main/assets/shaders/fragment_shader_lut_es2.glsl

@@ -23,7 +23,7 @@ uniform sampler2D uTexSampler;
 // LUT is vertically stacked on top of each other. The red channel of the input
 // color (z-axis in LUT[R][G][B] = LUT[z][y][x]) points to the plane to sample
 // from. For more information check the
-// androidx/media3/effect/SingleColorLut.java class, especially the function
+// com/google/android/exoplayer2/effect/SingleColorLut.java class, especially the function
 // #transformCubeIntoBitmap with a provided example.
 uniform sampler2D uColorLut;
 uniform float uColorLutLength;

library/effect/src/main/java/com/google/android/exoplayer2/effect/ChainingGlTextureProcessorListener.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import android.util.Pair;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
-import androidx.media3.effect.GlTextureProcessor.InputListener;
-import androidx.media3.effect.GlTextureProcessor.OutputListener;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.effect.GlTextureProcessor.InputListener;
+import com.google.android.exoplayer2.effect.GlTextureProcessor.OutputListener;
 import java.util.ArrayDeque;
 import java.util.Queue;
 

library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import android.content.Context;
 import androidx.annotation.WorkerThread;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 
 /**

library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLutProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 
@@ -22,7 +22,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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;

library/effect/src/main/java/com/google/android/exoplayer2/effect/Contrast.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 
 import android.content.Context;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 
 /** A {@link GlEffect} to control the contrast of video frames. */
 public class Contrast implements GlEffect {

library/effect/src/main/java/com/google/android/exoplayer2/effect/ContrastProcessor.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;

library/effect/src/main/java/com/google/android/exoplayer2/effect/Crop.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;

library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureManager.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
 import android.graphics.SurfaceTexture;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
-import androidx.media3.common.FrameInfo;
-import androidx.media3.common.FrameProcessingException;
-import androidx.media3.common.FrameProcessor;
-import androidx.media3.effect.GlTextureProcessor.InputListener;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.effect.GlTextureProcessor.InputListener;
+import com.google.android.exoplayer2.util.FrameInfo;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;

library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 /**
  * Interface for a {@link GlTextureProcessor} that samples from an external texture.

library/effect/src/main/java/com/google/android/exoplayer2/effect/FinalMatrixTextureProcessorWrapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.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;
@@ -33,13 +33,13 @@ 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.DebugViewProvider;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;

library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTask.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 
 /**

library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTaskExecutor.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-import androidx.media3.common.FrameProcessingException;
-import androidx.media3.common.FrameProcessor;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutionException;

library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffect.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import android.content.Context;
-import androidx.media3.common.Effect;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.Effect;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 
 /**
  * Interface for a video frame effect with a {@link GlTextureProcessor} implementation.

library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
@@ -27,14 +27,14 @@ 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.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
+import com.google.android.exoplayer2.util.FrameInfo;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.GlUtil;
+import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;

library/effect/src/main/java/com/google/android/exoplayer2/effect/GlMatrixTransformation.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import android.content.Context;
 import android.opengl.Matrix;
 import android.util.Pair;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.common.collect.ImmutableList;
 
 /**

library/effect/src/main/java/com/google/android/exoplayer2/effect/GlTextureProcessor.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 
 /**
  * Processes frames from one OpenGL 2D texture to another.

library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 
 import android.content.Context;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 
 /** Adjusts the HSL (Hue, Saturation, and Lightness) of a frame. */

library/effect/src/main/java/com/google/android/exoplayer2/effect/HslProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 
@@ -22,7 +22,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.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;

library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixTextureProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
@@ -22,9 +22,9 @@ 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.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlProgram;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.video.ColorInfo;

library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixTransformation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import android.graphics.Matrix;
 

library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 

library/effect/src/main/java/com/google/android/exoplayer2/effect/Presentation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;

library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbAdjustment.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 

library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 
 import android.content.Context;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /** Provides common color filters. */

library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import android.content.Context;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.common.collect.ImmutableList;
 
 /**

library/effect/src/main/java/com/google/android/exoplayer2/effect/ScaleToFitTransformation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;

library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkArgument;
 import static com.google.android.exoplayer2.util.Assertions.checkState;
@@ -23,8 +23,8 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
-import androidx.media3.common.FrameProcessingException;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.Util;
 

library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleFrameGlTextureProcessor.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 
 import android.util.Pair;
 import androidx.annotation.CallSuper;
-import androidx.media3.common.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessingException;
 import com.google.android.exoplayer2.util.GlUtil;
 import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/effect/src/main/java/com/google/android/exoplayer2/effect/TextureInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import com.google.android.exoplayer2.C;
 

library/effect/src/main/java/com/google/android/exoplayer2/effect/package-info.java

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 @NonNullApi
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import com.google.android.exoplayer2.util.NonNullApi;

library/effect/src/test/AndroidManifest.xml

@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<manifest package="androidx.media3.effect.test">
+<manifest package="com.google.android.exoplayer2.effect.test">
   <uses-sdk/>
 </manifest>

library/effect/src/test/java/com/google/android/exoplayer2/effect/ChainingGlTextureProcessorListenerTest.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import androidx.media3.common.FrameProcessor;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.Util;
 import org.junit.After;
 import org.junit.Test;

library/effect/src/test/java/com/google/android/exoplayer2/effect/CropTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 

library/effect/src/test/java/com/google/android/exoplayer2/effect/MatrixUtilsTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;

library/effect/src/test/java/com/google/android/exoplayer2/effect/PresentationTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 

library/effect/src/test/java/com/google/android/exoplayer2/effect/ScaleToFitTransformationTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.effect;
+package com.google.android.exoplayer2.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 

library/transformer/build.gradle

@@ -38,7 +38,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'library-core')
-    implementation project(modulePrefix + 'lib-effect')
+    implementation project(modulePrefix + 'library-effect')
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java

@@ -22,13 +22,13 @@ import android.media.MediaFormat;
 import android.os.SystemClock;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-import androidx.media3.common.FrameProcessingException;
-import androidx.media3.common.FrameProcessor;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat;
 import com.google.android.exoplayer2.util.Clock;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableBiMap;
 import java.lang.annotation.Documented;

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java

@@ -33,12 +33,6 @@ 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 androidx.media3.effect.GlEffect;
-import androidx.media3.effect.GlEffectsFrameProcessor;
-import androidx.media3.effect.GlMatrixTransformation;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.ExoPlayer;
@@ -51,6 +45,9 @@ import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
+import com.google.android.exoplayer2.effect.GlEffect;
+import com.google.android.exoplayer2.effect.GlEffectsFrameProcessor;
+import com.google.android.exoplayer2.effect.GlMatrixTransformation;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
 import com.google.android.exoplayer2.metadata.MetadataOutput;
@@ -59,6 +56,9 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.util.Clock;
+import com.google.android.exoplayer2.util.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.ListenerSet;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerVideoRenderer.java

@@ -20,14 +20,14 @@ import static com.google.android.exoplayer2.source.SampleStream.FLAG_REQUIRE_FOR
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 
 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;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.source.SampleStream.ReadDataResult;
+import com.google.android.exoplayer2.util.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.common.collect.ImmutableList;
 import java.nio.ByteBuffer;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java

@@ -26,18 +26,18 @@ import android.os.Build;
 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 androidx.media3.effect.Presentation;
-import androidx.media3.effect.ScaleToFitTransformation;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
+import com.google.android.exoplayer2.effect.Presentation;
+import com.google.android.exoplayer2.effect.ScaleToFitTransformation;
+import com.google.android.exoplayer2.util.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
+import com.google.android.exoplayer2.util.FrameInfo;
+import com.google.android.exoplayer2.util.FrameProcessingException;
+import com.google.android.exoplayer2.util.FrameProcessor;
 import com.google.android.exoplayer2.util.Log;
+import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.common.collect.ImmutableList;

library/transformer/src/test/java/com/google/android/exoplayer2/transformer/VideoEncoderWrapperTest.java

@@ -21,7 +21,6 @@ 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;
@@ -29,6 +28,7 @@ import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.ListenerSet;
 import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.SurfaceInfo;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import org.junit.Before;

testdata/src/test/assets/media/bitmap/README.md

@@ -23,7 +23,7 @@ To generate new "expected" assets:
 
     ```shell
     adb pull \
-    /sdcard/Android/data/androidx.media3.effect.test/cache/drawFrame_rotate90_actual.png \
+    /sdcard/Android/data/com.google.android.exoplayer2.effect.test/cache/drawFrame_rotate90_actual.png \
     third_party/java_src/android_libs/media/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate90.png
     ```