Map lib-effect from androidx to exoplayer2

PiperOrigin-RevId: 482179761

core_settings.gradle

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

demos/transformer/build.gradle

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

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

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

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

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

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

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

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

@@ -37,19 +37,17 @@
 import 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.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.util.DebugTextViewHelper;
+import com.google.android.exoplayer2.util.DebugViewProvider;
+import com.google.android.exoplayer2.util.Effect;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.material.card.MaterialCardView;

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

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

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

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

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

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

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

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

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

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

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

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

library/common/src/main/java/androidx/media3/common/SurfaceInfo.java → 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;
 

google3/third_party/java_src/android_libs/media/libraries/effect/README.md → 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

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/AndroidManifest.xml → 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>

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/BitmapTestUtil.java → 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;

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java → library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/ContrastPixelTest.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package androidx.media3.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;
+package com.google.android.exoplayer2.effect;
+
 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.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;

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/CropPixelTest.java → 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;
-
-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;
+package com.google.android.exoplayer2.effect;
+
 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.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;

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorFrameReleaseTest.java → 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 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;

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java → 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.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;

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/java/androidx/media3/effect/HslAdjustmentPixelTest.java → library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/HslAdjustmentPixelTest.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package androidx.media3.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;
+package com.google.android.exoplayer2.effect;
+
 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.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;