Move effects functionality out of transformer to effects module.

PiperOrigin-RevId: 465038852
(cherry picked from commit 707b0618)

demos/transformer/build.gradle

@@ -76,6 +76,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-core')
     implementation project(modulePrefix + 'library-dash')
     implementation project(modulePrefix + 'library-transformer')

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

@@ -30,8 +30,8 @@ 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.transformer.SingleFrameGlTextureProcessor;
 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.transformer.GlMatrixTransformation;
-import com.google.android.exoplayer2.transformer.MatrixTransformation;
 import com.google.android.exoplayer2.util.Util;
 
 /**

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

@@ -21,7 +21,7 @@ import android.content.Context;
 import android.opengl.GLES20;
 import android.util.Pair;
 import androidx.media3.common.FrameProcessingException;
-import com.google.android.exoplayer2.transformer.SingleFrameGlTextureProcessor;
+import androidx.media3.effect.SingleFrameGlTextureProcessor;
 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,13 +37,13 @@ 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 com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.transformer.Contrast;
 import com.google.android.exoplayer2.transformer.DefaultEncoderFactory;
-import com.google.android.exoplayer2.transformer.GlEffect;
-import com.google.android.exoplayer2.transformer.GlTextureProcessor;
 import com.google.android.exoplayer2.transformer.ProgressHolder;
 import com.google.android.exoplayer2.transformer.TransformationException;
 import com.google.android.exoplayer2.transformer.TransformationRequest;
@@ -280,7 +280,7 @@ public final class TransformerActivity extends AppCompatActivity {
                 Class.forName("com.google.android.exoplayer2.transformerdemo.MediaPipeProcessor");
             Constructor<?> constructor =
                 clazz.getConstructor(
-                    Context.class, Boolean.class, String.class, String.class, String.class);
+                    Context.class, boolean.class, String.class, String.class, String.class);
             effects.add(
                 (GlEffect)
                     (Context context, boolean useHdr) -> {

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

@@ -25,9 +25,9 @@ import android.os.Build;
 import androidx.annotation.ChecksSdkIntAtLeast;
 import androidx.annotation.Nullable;
 import androidx.media3.common.FrameProcessingException;
+import androidx.media3.effect.GlTextureProcessor;
+import androidx.media3.effect.TextureInfo;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.transformer.GlTextureProcessor;
-import com.google.android.exoplayer2.transformer.TextureInfo;
 import com.google.android.exoplayer2.util.LibraryLoader;
 import com.google.android.exoplayer2.util.Util;
 import com.google.mediapipe.components.FrameProcessor;

google3/third_party/java_src/android_libs/media/libraries/effect/build.gradle

@@ -36,6 +36,24 @@ android {
     }
 }
 
+dependencies {
+    implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    implementation project(modulePrefix + 'library-common')
+    compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
+    compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    testImplementation project(modulePrefix + 'robolectricutils')
+    testImplementation project(modulePrefix + 'testutils')
+    testImplementation project(modulePrefix + 'testdata')
+    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    testImplementation 'com.google.truth:truth:' + truthVersion
+    androidTestImplementation 'junit:junit:' + junitVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    androidTestImplementation 'com.google.truth:truth:' + truthVersion
+    androidTestImplementation project(modulePrefix + 'testutils')
+}
+
 ext {
     javadocTitle = 'Effect module'
 }

google3/third_party/java_src/android_libs/media/libraries/effect/src/androidTest/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="androidx.media3.effect">
+
+  <uses-sdk/>
+
+  <application
+      android:allowBackup="false"
+      tools:ignore="MissingApplicationIcon,HardcodedDebugMode"
+      android:usesCleartextTraffic="true"/>
+
+  <instrumentation
+      android:targetPackage="androidx.media3.effect"
+      android:name="androidx.test.runner.AndroidJUnitRunner"/>
+
+</manifest>

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

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

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
+import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-import static com.google.android.exoplayer2.transformer.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 

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

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

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

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
+import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-import static com.google.android.exoplayer2.transformer.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 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;

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

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

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

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

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

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
+import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-import static com.google.android.exoplayer2.transformer.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.common.truth.Truth.assertThat;
 

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListener.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ChainingGlTextureProcessorListener.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Contrast.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Contrast.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ContrastProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
 import android.content.Context;
 import android.opengl.GLES20;

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Crop.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Crop.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExternalTextureProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureProcessor.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FinalMatrixTransformationProcessorWrapper.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FinalMatrixTransformationProcessorWrapper.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTask.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTask.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameProcessingTaskExecutor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/FrameProcessingTaskExecutor.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffect.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffect.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlEffectsFrameProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlEffectsFrameProcessor.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlMatrixTransformation.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlMatrixTransformation.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/GlTextureProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/GlTextureProcessor.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MatrixTransformation.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformation.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MatrixTransformationProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MatrixUtils.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixUtils.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Presentation.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/Presentation.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/RgbaMatrix.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbaMatrix.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/RgbaMatrixProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbaMatrixProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
 import android.content.Context;
 import android.opengl.GLES20;

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ScaleToFitTransformation.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ScaleToFitTransformation.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SingleFrameGlTextureProcessor.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/SingleFrameGlTextureProcessor.java

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

library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TextureInfo.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/TextureInfo.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
 /** Contains information describing an OpenGL texture. */
 public final class TextureInfo {

library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ChainingGlTextureProcessorListenerTest.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ChainingGlTextureProcessorListenerTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.transformer;
+package androidx.media3.effect;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;

library/transformer/src/test/java/com/google/android/exoplayer2/transformer/CropTest.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/CropTest.java

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

library/transformer/src/test/java/com/google/android/exoplayer2/transformer/MatrixUtilsTest.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/MatrixUtilsTest.java

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

library/transformer/src/test/java/com/google/android/exoplayer2/transformer/PresentationTest.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/PresentationTest.java

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

library/transformer/src/test/java/com/google/android/exoplayer2/transformer/ScaleToFitTransformationTest.java → google3/third_party/java_src/android_libs/media/libraries/effect/src/test/java/androidx/media3/effect/ScaleToFitTransformationTest.java

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

library/transformer/build.gradle

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

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

@@ -36,6 +36,9 @@ 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;
@@ -196,9 +199,9 @@ public final class Transformer {
      * {@linkplain Effect effects} to the video frames.
      *
      * <p>This factory will be used to create the {@link FrameProcessor} used for applying the
-     * {@link Effect} instances passed to {@link #setVideoEffects(List<Effect>)} and any additional
-     * {@link GlMatrixTransformation} instances derived from the {@link TransformationRequest} set
-     * using {@link #setTransformationRequest(TransformationRequest)}.
+     * {@link Effect} instances passed to {@link #setVideoEffects(List)} and any additional {@link
+     * GlMatrixTransformation} instances derived from the {@link TransformationRequest} set using
+     * {@link #setTransformationRequest(TransformationRequest)}.
      *
      * <p>The default is {@link GlEffectsFrameProcessor.Factory}.
      *

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

@@ -29,6 +29,8 @@ 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;