Move effects functionality out of transformer to effects module.

PiperOrigin-RevId: 465038852

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 + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-exoplayer-dash')
     implementation project(modulePrefix + 'lib-transformer')

demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java

@@ -33,7 +33,7 @@ import androidx.media3.common.C;
 import androidx.media3.common.FrameProcessingException;
 import androidx.media3.common.util.GlProgram;
 import androidx.media3.common.util.GlUtil;
-import androidx.media3.transformer.SingleFrameGlTextureProcessor;
+import androidx.media3.effect.SingleFrameGlTextureProcessor;
 import java.io.IOException;
 import java.util.Locale;
 

demos/transformer/src/main/java/androidx/media3/demo/transformer/MatrixTransformationFactory.java

@@ -18,8 +18,8 @@ package androidx.media3.demo.transformer;
 import android.graphics.Matrix;
 import androidx.media3.common.C;
 import androidx.media3.common.util.Util;
-import androidx.media3.transformer.GlMatrixTransformation;
-import androidx.media3.transformer.MatrixTransformation;
+import androidx.media3.effect.GlMatrixTransformation;
+import androidx.media3.effect.MatrixTransformation;
 
 /**
  * Factory for {@link GlMatrixTransformation GlMatrixTransformations} and {@link

demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java

@@ -23,7 +23,7 @@ import android.util.Pair;
 import androidx.media3.common.FrameProcessingException;
 import androidx.media3.common.util.GlProgram;
 import androidx.media3.common.util.GlUtil;
-import androidx.media3.transformer.SingleFrameGlTextureProcessor;
+import androidx.media3.effect.SingleFrameGlTextureProcessor;
 import java.io.IOException;
 
 /**

demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java

@@ -41,12 +41,12 @@ import androidx.media3.common.Effect;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.Util;
+import androidx.media3.effect.Contrast;
+import androidx.media3.effect.GlEffect;
+import androidx.media3.effect.GlTextureProcessor;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.exoplayer.util.DebugTextViewHelper;
-import androidx.media3.transformer.Contrast;
 import androidx.media3.transformer.DefaultEncoderFactory;
-import androidx.media3.transformer.GlEffect;
-import androidx.media3.transformer.GlTextureProcessor;
 import androidx.media3.transformer.ProgressHolder;
 import androidx.media3.transformer.TransformationException;
 import androidx.media3.transformer.TransformationRequest;
@@ -279,7 +279,7 @@ public final class TransformerActivity extends AppCompatActivity {
             Class<?> clazz = Class.forName("androidx.media3.demo.transformer.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

@@ -28,8 +28,8 @@ import androidx.media3.common.C;
 import androidx.media3.common.FrameProcessingException;
 import androidx.media3.common.util.LibraryLoader;
 import androidx.media3.common.util.Util;
-import androidx.media3.transformer.GlTextureProcessor;
-import androidx.media3.transformer.TextureInfo;
+import androidx.media3.effect.GlTextureProcessor;
+import androidx.media3.effect.TextureInfo;
 import com.google.mediapipe.components.FrameProcessor;
 import com.google.mediapipe.framework.AppTextureFrame;
 import com.google.mediapipe.framework.TextureFrame;

libraries/effect/build.gradle

@@ -35,6 +35,24 @@ android {
     }
 }
 
+dependencies {
+    implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    implementation project(modulePrefix + 'lib-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 + 'test-utils-robolectric')
+    testImplementation project(modulePrefix + 'test-utils')
+    testImplementation project(modulePrefix + 'test-data')
+    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 + 'test-utils')
+}
+
 ext {
     javadocTitle = 'Effect module'
 }

libraries/effect/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,32 @@
+<?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>

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.common.truth.Truth.assertThat;

libraries/effect/src/androidTest/java/androidx/media3/effect/ContrastPixelTest.java

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

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkNotNull;
-import static androidx.media3.transformer.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.common.truth.Truth.assertThat;
 

libraries/effect/src/androidTest/java/androidx/media3/effect/GlEffectsFrameProcessorPixelTest.java

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

libraries/effect/src/androidTest/java/androidx/media3/effect/MatrixTransformationProcessorPixelTest.java

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

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkNotNull;
-import static androidx.media3.transformer.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
+import static androidx.media3.effect.BitmapTestUtil.MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.common.truth.Truth.assertThat;
 

libraries/effect/src/androidTest/java/androidx/media3/effect/RgbaMatrixPixelTest.java

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

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import android.util.Pair;
 import androidx.annotation.Nullable;

libraries/effect/src/main/java/androidx/media3/effect/Contrast.java

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

libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java

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

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkStateNotNull;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 /**
  * Interface for a {@link GlTextureProcessor} that samples from an external texture.

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkState;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import androidx.media3.common.FrameProcessingException;
 import androidx.media3.common.util.GlUtil;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import android.content.Context;
 import androidx.media3.common.Effect;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkState;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import android.content.Context;
 import android.opengl.Matrix;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import androidx.media3.common.FrameProcessingException;
 import androidx.media3.common.util.UnstableApi;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import android.graphics.Matrix;
 import androidx.media3.common.util.UnstableApi;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkState;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkStateNotNull;

libraries/effect/src/main/java/androidx/media3/effect/RgbaMatrix.java

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

libraries/effect/src/main/java/androidx/media3/effect/RgbaMatrixProcessor.java

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

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkStateNotNull;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import android.util.Pair;
 import androidx.annotation.CallSuper;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import androidx.media3.common.util.UnstableApi;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 

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 androidx.media3.transformer;
+package androidx.media3.effect;
 
 import static com.google.common.truth.Truth.assertThat;
 

libraries/transformer/build.gradle

@@ -38,6 +38,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'lib-exoplayer')
+    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

libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java

@@ -48,6 +48,9 @@ import androidx.media3.common.util.Clock;
 import androidx.media3.common.util.ListenerSet;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.effect.GlEffect;
+import androidx.media3.effect.GlEffectsFrameProcessor;
+import androidx.media3.effect.GlMatrixTransformation;
 import androidx.media3.exoplayer.DefaultLoadControl;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.exoplayer.Renderer;
@@ -198,9 +201,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}.
      *

libraries/transformer/src/main/java/androidx/media3/transformer/VideoTranscodingSamplePipeline.java

@@ -34,6 +34,8 @@ import androidx.media3.common.FrameProcessor;
 import androidx.media3.common.SurfaceInfo;
 import androidx.media3.common.util.Util;
 import androidx.media3.decoder.DecoderInputBuffer;
+import androidx.media3.effect.Presentation;
+import androidx.media3.effect.ScaleToFitTransformation;
 import com.google.common.collect.ImmutableList;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;