diff --git a/core_settings.gradle b/core_settings.gradle
index a29116941f..65300d3a67 100644
--- a/core_settings.gradle
+++ b/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')
diff --git a/demos/transformer/build.gradle b/demos/transformer/build.gradle
index c03aebe60b..234f0bbfaf 100644
--- a/demos/transformer/build.gradle
+++ b/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')
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 5d4403b933..0f3beb8b8f 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,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;
diff --git a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/MatrixTransformationFactory.java b/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/MatrixTransformationFactory.java
index b4a58dc5c8..042dd88c75 100644
--- a/demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/MatrixTransformationFactory.java
+++ b/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;
 
 /**
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 49bae5cd64..57209af87c 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,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;
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 381b206678..e85cf431b3 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
@@ -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;
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 e55e6d52c9..9e919a68e2 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
@@ -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;
diff --git a/library/common/src/main/java/androidx/media3/common/DebugViewProvider.java b/library/common/src/main/java/com/google/android/exoplayer2/util/DebugViewProvider.java
similarity index 96%
rename from library/common/src/main/java/androidx/media3/common/DebugViewProvider.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/DebugViewProvider.java
index b5a6c75f00..fad33aa6a6 100644
--- a/library/common/src/main/java/androidx/media3/common/DebugViewProvider.java
+++ b/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;
diff --git a/library/common/src/main/java/androidx/media3/common/Effect.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Effect.java
similarity index 94%
rename from library/common/src/main/java/androidx/media3/common/Effect.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/Effect.java
index 1884e2d3ed..eeda686dce 100644
--- a/library/common/src/main/java/androidx/media3/common/Effect.java
+++ b/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 {}
diff --git a/library/common/src/main/java/androidx/media3/common/FrameInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/util/FrameInfo.java
similarity index 98%
rename from library/common/src/main/java/androidx/media3/common/FrameInfo.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/FrameInfo.java
index ec31ddbd26..865bfec67e 100644
--- a/library/common/src/main/java/androidx/media3/common/FrameInfo.java
+++ b/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;
 
diff --git a/library/common/src/main/java/androidx/media3/common/FrameProcessingException.java b/library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessingException.java
similarity index 97%
rename from library/common/src/main/java/androidx/media3/common/FrameProcessingException.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessingException.java
index e573eff3bb..524b6dfd9d 100644
--- a/library/common/src/main/java/androidx/media3/common/FrameProcessingException.java
+++ b/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 {
diff --git a/library/common/src/main/java/androidx/media3/common/FrameProcessor.java b/library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessor.java
similarity index 98%
rename from library/common/src/main/java/androidx/media3/common/FrameProcessor.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/FrameProcessor.java
index 1197352195..23ba3e7ab4 100644
--- a/library/common/src/main/java/androidx/media3/common/FrameProcessor.java
+++ b/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;
 
 /**
diff --git a/library/common/src/main/java/androidx/media3/common/SurfaceInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/util/SurfaceInfo.java
similarity index 98%
rename from library/common/src/main/java/androidx/media3/common/SurfaceInfo.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/SurfaceInfo.java
index 0c6b5170f2..3ee936554d 100644
--- a/library/common/src/main/java/androidx/media3/common/SurfaceInfo.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/README.md b/library/effect/README.md
similarity index 63%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/README.md
rename to library/effect/README.md
index 50fc67fe3b..82094a97b3 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/README.md
+++ b/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
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/build.gradle b/library/effect/build.gradle
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/build.gradle
rename to library/effect/build.gradle
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/AndroidManifest.xml b/library/effect/src/androidTest/AndroidManifest.xml
similarity index 89%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/AndroidManifest.xml
rename to library/effect/src/androidTest/AndroidManifest.xml
index 76bf2cda9b..23f6efda82 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/AndroidManifest.xml
+++ b/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>
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/BitmapTestUtil.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/BitmapTestUtil.java
similarity index 99%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/BitmapTestUtil.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/BitmapTestUtil.java
index 0c162bc98b..d8fed8623e 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/BitmapTestUtil.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java
similarity index 91%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java
index 50b2071bf6..d74e34a622 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/CropPixelTest.java
similarity index 91%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/CropPixelTest.java
index 7439b796b0..29767d849b 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorFrameReleaseTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorFrameReleaseTest.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorFrameReleaseTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorFrameReleaseTest.java
index 166522c7cc..4b2290931b 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorFrameReleaseTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorPixelTest.java
similarity index 96%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorPixelTest.java
index 41f26e9959..d8e92887d7 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java
similarity index 95%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java
index f08f05339e..f2c310921d 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/MatrixTextureProcessorPixelTest.java
similarity index 92%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/MatrixTextureProcessorPixelTest.java
index c5eefb53d5..acf9545c0d 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTextureProcessorPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/PresentationPixelTest.java
similarity index 95%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/PresentationPixelTest.java
index eb048f9c20..18287fde9f 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/PresentationPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbAdjustmentPixelTest.java
similarity index 94%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbAdjustmentPixelTest.java
index cb2bc78182..c8c0f7d598 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbAdjustmentPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbFilterPixelTest.java
similarity index 88%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/RgbFilterPixelTest.java
index d8cc9dfa53..97cf00c0d2 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/RgbFilterPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java b/library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/SingleColorLutPixelTest.java
similarity index 95%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java
rename to library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/SingleColorLutPixelTest.java
index 1d85e3b010..7932173e57 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/SingleColorLutPixelTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/AndroidManifest.xml b/library/effect/src/main/AndroidManifest.xml
similarity index 92%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/AndroidManifest.xml
rename to library/effect/src/main/AndroidManifest.xml
index cfa68782d8..08d75af43a 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/AndroidManifest.xml
+++ b/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>
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_contrast_es2.glsl b/library/effect/src/main/assets/shaders/fragment_shader_contrast_es2.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_contrast_es2.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_contrast_es2.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_hsl_es2.glsl b/library/effect/src/main/assets/shaders/fragment_shader_hsl_es2.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_hsl_es2.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_hsl_es2.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_lut_es2.glsl b/library/effect/src/main/assets/shaders/fragment_shader_lut_es2.glsl
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_lut_es2.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_lut_es2.glsl
index 7200e43e7b..72f2579e10 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_lut_es2.glsl
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_oetf_es3.glsl b/library/effect/src/main/assets/shaders/fragment_shader_oetf_es3.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_oetf_es3.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_oetf_es3.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_es2.glsl b/library/effect/src/main/assets/shaders/fragment_shader_transformation_es2.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_es2.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_transformation_es2.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_external_yuv_es3.glsl b/library/effect/src/main/assets/shaders/fragment_shader_transformation_external_yuv_es3.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_external_yuv_es3.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_transformation_external_yuv_es3.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_external_es2.glsl b/library/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_external_es2.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_external_es2.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_external_es2.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_oetf_es2.glsl b/library/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_oetf_es2.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_oetf_es2.glsl
rename to library/effect/src/main/assets/shaders/fragment_shader_transformation_sdr_oetf_es2.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/vertex_shader_transformation_es2.glsl b/library/effect/src/main/assets/shaders/vertex_shader_transformation_es2.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/vertex_shader_transformation_es2.glsl
rename to library/effect/src/main/assets/shaders/vertex_shader_transformation_es2.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/vertex_shader_transformation_es3.glsl b/library/effect/src/main/assets/shaders/vertex_shader_transformation_es3.glsl
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/assets/shaders/vertex_shader_transformation_es3.glsl
rename to library/effect/src/main/assets/shaders/vertex_shader_transformation_es3.glsl
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ChainingGlTextureProcessorListener.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ChainingGlTextureProcessorListener.java
similarity index 95%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ChainingGlTextureProcessorListener.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ChainingGlTextureProcessorListener.java
index 5a6a4c7d6d..3b130d4482 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ChainingGlTextureProcessorListener.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ColorLut.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
similarity index 93%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ColorLut.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
index de2f9022d0..d3a1930f1d 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ColorLut.java
+++ b/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;
 
 /**
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ColorLutProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLutProcessor.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ColorLutProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLutProcessor.java
index 266a39917b..29b5c257ba 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ColorLutProcessor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Contrast.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/Contrast.java
similarity index 93%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Contrast.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/Contrast.java
index 8b56653960..e98f59a791 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Contrast.java
+++ b/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 {
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ContrastProcessor.java
similarity index 96%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ContrastProcessor.java
index f978df260a..947b7956ec 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Crop.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/Crop.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Crop.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/Crop.java
index 6dcc0ad6ac..ad253cc67b 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Crop.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureManager.java
similarity index 95%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureManager.java
index 1bb77ebacc..bfa7e16ee6 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureProcessor.java
similarity index 96%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ExternalTextureProcessor.java
index 16194da5f3..9a85cfdea6 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureProcessor.java
+++ b/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.
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FinalMatrixTextureProcessorWrapper.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FinalMatrixTextureProcessorWrapper.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FinalMatrixTextureProcessorWrapper.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/FinalMatrixTextureProcessorWrapper.java
index 649dd13f91..58011a5b64 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FinalMatrixTextureProcessorWrapper.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTask.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTask.java
similarity index 88%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTask.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTask.java
index 2a4a683f72..4ea13a9457 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTask.java
+++ b/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;
 
 /**
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTaskExecutor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTaskExecutor.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTaskExecutor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/FrameProcessingTaskExecutor.java
index cb5bb2c8df..b07875b544 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTaskExecutor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffect.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffect.java
similarity index 89%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffect.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffect.java
index 99c21562f1..0e48457521 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffect.java
+++ b/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.
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessor.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessor.java
index 1b5131d256..1f1caae18f 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlMatrixTransformation.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlMatrixTransformation.java
similarity index 95%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlMatrixTransformation.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/GlMatrixTransformation.java
index 31a40803fc..4aebabb431 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlMatrixTransformation.java
+++ b/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;
 
 /**
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlTextureProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/GlTextureProcessor.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlTextureProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/GlTextureProcessor.java
index 7ea31c1960..5302be764d 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlTextureProcessor.java
+++ b/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.
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/HslAdjustment.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/HslAdjustment.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
index 8f5a3a0400..f6a10a1891 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/HslAdjustment.java
+++ b/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. */
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/HslProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslProcessor.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/HslProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/HslProcessor.java
index 8338eb89ec..2e9170d5d9 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/HslProcessor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTextureProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixTextureProcessor.java
similarity index 99%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTextureProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixTextureProcessor.java
index 9fe18e8cd3..cd8c433460 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTextureProcessor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformation.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixTransformation.java
similarity index 96%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformation.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixTransformation.java
index 9a07f0a37e..de55160a5c 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformation.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixUtils.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixUtils.java
similarity index 99%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixUtils.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/MatrixUtils.java
index 39181dddfa..1ac0f896e5 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixUtils.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Presentation.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/Presentation.java
similarity index 99%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Presentation.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/Presentation.java
index 82a8114f4f..b15ba5748c 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Presentation.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbAdjustment.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbAdjustment.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbAdjustment.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbAdjustment.java
index 414797c4b5..b820737448 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbAdjustment.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbFilter.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
similarity index 96%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbFilter.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
index 0bd47b3b0a..5ba63be35a 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbFilter.java
+++ b/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. */
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrix.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
similarity index 94%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrix.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
index 9479fbafda..1db2ea9b11 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrix.java
+++ b/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;
 
 /**
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ScaleToFitTransformation.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ScaleToFitTransformation.java
similarity index 99%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ScaleToFitTransformation.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/ScaleToFitTransformation.java
index 89b7ea42b0..d9a626eebe 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ScaleToFitTransformation.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
index 7db7ca243b..bd5332cb73 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleColorLut.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlTextureProcessor.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleFrameGlTextureProcessor.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlTextureProcessor.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleFrameGlTextureProcessor.java
index 5687deeb7c..eda1dffa08 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlTextureProcessor.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/TextureInfo.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/TextureInfo.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/TextureInfo.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/TextureInfo.java
index 186fb2da0c..e0d2eeb6b4 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/TextureInfo.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/package-info.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/package-info.java
similarity index 93%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/package-info.java
rename to library/effect/src/main/java/com/google/android/exoplayer2/effect/package-info.java
index adfe0a3bc7..3297e6c25d 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/package-info.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/AndroidManifest.xml b/library/effect/src/test/AndroidManifest.xml
similarity index 91%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/test/AndroidManifest.xml
rename to library/effect/src/test/AndroidManifest.xml
index 86e4880700..d92cf5416b 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/AndroidManifest.xml
+++ b/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>
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ChainingGlTextureProcessorListenerTest.java b/library/effect/src/test/java/com/google/android/exoplayer2/effect/ChainingGlTextureProcessorListenerTest.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ChainingGlTextureProcessorListenerTest.java
rename to library/effect/src/test/java/com/google/android/exoplayer2/effect/ChainingGlTextureProcessorListenerTest.java
index 201d12ee40..6f70ee58b0 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ChainingGlTextureProcessorListenerTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/CropTest.java b/library/effect/src/test/java/com/google/android/exoplayer2/effect/CropTest.java
similarity index 97%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/CropTest.java
rename to library/effect/src/test/java/com/google/android/exoplayer2/effect/CropTest.java
index 2626ddfcff..f06f0b2897 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/CropTest.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/MatrixUtilsTest.java b/library/effect/src/test/java/com/google/android/exoplayer2/effect/MatrixUtilsTest.java
similarity index 99%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/MatrixUtilsTest.java
rename to library/effect/src/test/java/com/google/android/exoplayer2/effect/MatrixUtilsTest.java
index e548002f0a..eceab81b2d 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/MatrixUtilsTest.java
+++ b/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;
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/PresentationTest.java b/library/effect/src/test/java/com/google/android/exoplayer2/effect/PresentationTest.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/PresentationTest.java
rename to library/effect/src/test/java/com/google/android/exoplayer2/effect/PresentationTest.java
index 82bd287bed..b19cd06c81 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/PresentationTest.java
+++ b/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;
 
diff --git a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ScaleToFitTransformationTest.java b/library/effect/src/test/java/com/google/android/exoplayer2/effect/ScaleToFitTransformationTest.java
similarity index 98%
rename from google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ScaleToFitTransformationTest.java
rename to library/effect/src/test/java/com/google/android/exoplayer2/effect/ScaleToFitTransformationTest.java
index 134dc663e3..7dc6b802d9 100644
--- a/google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ScaleToFitTransformationTest.java
+++ b/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;
 
diff --git a/library/transformer/build.gradle b/library/transformer/build.gradle
index 8f3a846540..560fda5fee 100644
--- a/library/transformer/build.gradle
+++ b/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
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 5b36a5f170..43e84c9967 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,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;
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 f12e266a0c..32f95a418e 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,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;
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 f1f4a4c1d4..3170d52858 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
@@ -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;
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 e18a4986d1..cd90b33e4c 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
@@ -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;
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 aa9f5e8f0d..fe17980468 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,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;
diff --git a/testdata/src/test/assets/media/bitmap/README.md b/testdata/src/test/assets/media/bitmap/README.md
index eab224e46d..013baae460 100644
--- a/testdata/src/test/assets/media/bitmap/README.md
+++ b/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
     ```