Use MatrixTransformation instead of wrapping its GlFrameProcssor.

ScaleToFitFrameProcessor, PresentationFrameProcessor,
and EncoderCompatibilityFrameProcessor now each implement
MatrixTransformation instead of wrapping
MatrixTransformationFrameProcessor.

PiperOrigin-RevId: 446480286

Author: hmsch

Diff for: libraries/transformer/src/androidTest/java/androidx/media3/transformer/FrameProcessorChainPixelTest.java

@@ -154,7 +154,7 @@ public void processData_withMatrixAndScaleToFitTransformation_producesExpectedOu
     setUpAndPrepareFirstFrame(
         DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO,
         (MatrixTransformation) (long presentationTimeUs) -> translateRightMatrix,
-        () -> new ScaleToFitFrameProcessor.Builder().setRotationDegrees(45).build());
+        new ScaleToFitTransformation.Builder().setRotationDegrees(45).build());
     Bitmap expectedBitmap = BitmapTestUtil.readBitmap(TRANSLATE_THEN_ROTATE_PNG_ASSET_PATH);
 
     Bitmap actualBitmap = processFirstFrameAndEnd();
@@ -176,7 +176,7 @@ public void processData_withScaleToFitAndMatrixTransformation_producesExpectedOu
     translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0);
     setUpAndPrepareFirstFrame(
         DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO,
-        () -> new ScaleToFitFrameProcessor.Builder().setRotationDegrees(45).build(),
+        new ScaleToFitTransformation.Builder().setRotationDegrees(45).build(),
         (MatrixTransformation) (long presentationTimeUs) -> translateRightMatrix);
     Bitmap expectedBitmap = BitmapTestUtil.readBitmap(ROTATE_THEN_TRANSLATE_PNG_ASSET_PATH);
 
@@ -195,8 +195,7 @@ public void processData_withScaleToFitAndMatrixTransformation_producesExpectedOu
   public void processData_withPresentation_setResolution_producesExpectedOutput() throws Exception {
     String testId = "processData_withPresentation_setResolution";
     setUpAndPrepareFirstFrame(
-        DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO,
-        () -> new PresentationFrameProcessor.Builder().setResolution(480).build());
+        DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO, new Presentation.Builder().setResolution(480).build());
     Bitmap expectedBitmap = BitmapTestUtil.readBitmap(REQUEST_OUTPUT_HEIGHT_PNG_ASSET_PATH);
 
     Bitmap actualBitmap = processFirstFrameAndEnd();
@@ -216,7 +215,7 @@ public void processData_withScaleToFitTransformation_rotate45_producesExpectedOu
     String testId = "processData_withScaleToFitTransformation_rotate45";
     setUpAndPrepareFirstFrame(
         DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO,
-        () -> new ScaleToFitFrameProcessor.Builder().setRotationDegrees(45).build());
+        new ScaleToFitTransformation.Builder().setRotationDegrees(45).build());
     Bitmap expectedBitmap = BitmapTestUtil.readBitmap(ROTATE45_SCALE_TO_FIT_PNG_ASSET_PATH);
 
     Bitmap actualBitmap = processFirstFrameAndEnd();

Diff for: libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationFrameProcessorPixelTest.java renamed to libraries/transformer/src/androidTest/java/androidx/media3/transformer/PresentationPixelTest.java

@@ -35,15 +35,15 @@
 import org.junit.runner.RunWith;
 
 /**
- * Pixel test for frame processing via {@link PresentationFrameProcessor}.
+ * Pixel test for frame processing via {@link Presentation}.
  *
  * <p>Expected images are taken from an emulator, so tests on different emulators or physical
  * devices may fail. To test on other devices, please increase the {@link
  * BitmapTestUtil#MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE} and/or inspect the saved output bitmaps
  * as recommended in {@link FrameProcessorChainPixelTest}.
  */
 @RunWith(AndroidJUnit4.class)
-public final class PresentationFrameProcessorPixelTest {
+public final class PresentationPixelTest {
   public static final String ORIGINAL_PNG_ASSET_PATH =
       "media/bitmap/sample_mp4_first_frame/original.png";
   public static final String CROP_SMALLER_PNG_ASSET_PATH =
@@ -97,7 +97,7 @@ public void release() {
   @Test
   public void drawFrame_noEdits_producesExpectedOutput() throws Exception {
     String testId = "drawFrame_noEdits";
-    presentationFrameProcessor = new PresentationFrameProcessor.Builder().build();
+    presentationFrameProcessor = new Presentation.Builder().build().toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -122,9 +122,10 @@ public void drawFrame_noEdits_producesExpectedOutput() throws Exception {
   public void drawFrame_cropSmaller_producesExpectedOutput() throws Exception {
     String testId = "drawFrame_cropSmaller";
     GlFrameProcessor presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
+        new Presentation.Builder()
             .setCrop(/* left= */ -.9f, /* right= */ .1f, /* bottom= */ -1f, /* top= */ .5f)
-            .build();
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -149,9 +150,10 @@ public void drawFrame_cropSmaller_producesExpectedOutput() throws Exception {
   public void drawFrame_cropLarger_producesExpectedOutput() throws Exception {
     String testId = "drawFrame_cropSmaller";
     GlFrameProcessor presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
+        new Presentation.Builder()
             .setCrop(/* left= */ -2f, /* right= */ 2f, /* bottom= */ -1f, /* top= */ 2f)
-            .build();
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -177,9 +179,10 @@ public void drawFrame_changeAspectRatio_scaleToFit_narrow_producesExpectedOutput
       throws Exception {
     String testId = "drawFrame_changeAspectRatio_scaleToFit_narrow";
     presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
-            .setAspectRatio(1f, PresentationFrameProcessor.LAYOUT_SCALE_TO_FIT)
-            .build();
+        new Presentation.Builder()
+            .setAspectRatio(1f, Presentation.LAYOUT_SCALE_TO_FIT)
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -206,9 +209,10 @@ public void drawFrame_changeAspectRatio_scaleToFit_wide_producesExpectedOutput()
       throws Exception {
     String testId = "drawFrame_changeAspectRatio_scaleToFit_wide";
     presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
-            .setAspectRatio(2f, PresentationFrameProcessor.LAYOUT_SCALE_TO_FIT)
-            .build();
+        new Presentation.Builder()
+            .setAspectRatio(2f, Presentation.LAYOUT_SCALE_TO_FIT)
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -235,9 +239,10 @@ public void drawFrame_changeAspectRatio_scaleToFitWithCrop_narrow_producesExpect
       throws Exception {
     String testId = "drawFrame_changeAspectRatio_scaleToFitWithCrop_narrow";
     presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
-            .setAspectRatio(1f, PresentationFrameProcessor.LAYOUT_SCALE_TO_FIT_WITH_CROP)
-            .build();
+        new Presentation.Builder()
+            .setAspectRatio(1f, Presentation.LAYOUT_SCALE_TO_FIT_WITH_CROP)
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -264,9 +269,10 @@ public void drawFrame_changeAspectRatio_scaleToFitWithCrop_wide_producesExpected
       throws Exception {
     String testId = "drawFrame_changeAspectRatio_scaleToFitWithCrop_wide";
     presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
-            .setAspectRatio(2f, PresentationFrameProcessor.LAYOUT_SCALE_TO_FIT_WITH_CROP)
-            .build();
+        new Presentation.Builder()
+            .setAspectRatio(2f, Presentation.LAYOUT_SCALE_TO_FIT_WITH_CROP)
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -293,9 +299,10 @@ public void drawFrame_changeAspectRatio_stretchToFit_narrow_producesExpectedOutp
       throws Exception {
     String testId = "drawFrame_changeAspectRatio_stretchToFit_narrow";
     presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
-            .setAspectRatio(1f, PresentationFrameProcessor.LAYOUT_STRETCH_TO_FIT)
-            .build();
+        new Presentation.Builder()
+            .setAspectRatio(1f, Presentation.LAYOUT_STRETCH_TO_FIT)
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -322,9 +329,10 @@ public void drawFrame_changeAspectRatio_stretchToFit_wide_producesExpectedOutput
       throws Exception {
     String testId = "drawFrame_changeAspectRatio_stretchToFit_wide";
     presentationFrameProcessor =
-        new PresentationFrameProcessor.Builder()
-            .setAspectRatio(2f, PresentationFrameProcessor.LAYOUT_STRETCH_TO_FIT)
-            .build();
+        new Presentation.Builder()
+            .setAspectRatio(2f, Presentation.LAYOUT_STRETCH_TO_FIT)
+            .build()
+            .toGlFrameProcessor();
     presentationFrameProcessor.initialize(
         getApplicationContext(), inputTexId, inputWidth, inputHeight);
     Size outputSize = presentationFrameProcessor.getOutputSize();
@@ -346,7 +354,7 @@ public void drawFrame_changeAspectRatio_stretchToFit_wide_producesExpectedOutput
     assertThat(averagePixelAbsoluteDifference).isAtMost(MAXIMUM_AVERAGE_PIXEL_ABSOLUTE_DIFFERENCE);
   }
 
-  private void setupOutputTexture(int outputWidth, int outputHeight) throws IOException {
+  private void setupOutputTexture(int outputWidth, int outputHeight) {
     outputTexId = GlUtil.createTexture(outputWidth, outputHeight);
     int frameBuffer = GlUtil.createFboForTexture(outputTexId);
     GlUtil.focusFramebuffer(

Diff for: libraries/transformer/src/main/java/androidx/media3/transformer/EncoderCompatibilityFrameProcessor.java renamed to libraries/transformer/src/main/java/androidx/media3/transformer/EncoderCompatibilityTransformation.java

@@ -20,23 +20,22 @@
 import static androidx.media3.common.util.Assertions.checkStateNotNull;
 
 import android.content.Context;
+import android.graphics.Matrix;
 import android.util.Size;
-import androidx.annotation.VisibleForTesting;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.util.GlUtil;
-import java.io.IOException;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
- * Copies frames from a texture and applies {@link Format#rotationDegrees} for encoder
- * compatibility, if needed.
+ * Specifies a {@link Format#rotationDegrees} to apply to each frame for encoder compatibility, if
+ * needed.
  *
  * <p>Encoders commonly support higher maximum widths than maximum heights. This may rotate the
  * decoded frame before encoding, so the encoded frame's width >= height, and set {@link
  * Format#rotationDegrees} to ensure the frame is displayed in the correct orientation.
  */
-/* package */ class EncoderCompatibilityFrameProcessor implements GlFrameProcessor {
+/* package */ class EncoderCompatibilityTransformation implements MatrixTransformation {
   // TODO(b/218488308): Allow reconfiguration of the output size, as encoders may not support the
   //  requested output resolution.
 
@@ -45,26 +44,32 @@
   }
 
   private int outputRotationDegrees;
-  private @MonotonicNonNull ScaleToFitFrameProcessor rotateFrameProcessor;
+  private @MonotonicNonNull Matrix transformationMatrix;
 
   /** Creates a new instance. */
-  /* package */ EncoderCompatibilityFrameProcessor() {
-
+  public EncoderCompatibilityTransformation() {
     outputRotationDegrees = C.LENGTH_UNSET;
   }
 
   @Override
-  public void initialize(Context context, int inputTexId, int inputWidth, int inputHeight)
-      throws IOException {
-    configureOutputSizeAndRotation(inputWidth, inputHeight);
-    rotateFrameProcessor =
-        new ScaleToFitFrameProcessor.Builder().setRotationDegrees(outputRotationDegrees).build();
-    rotateFrameProcessor.initialize(context, inputTexId, inputWidth, inputHeight);
+  public Size configure(int inputWidth, int inputHeight) {
+    checkArgument(inputWidth > 0, "inputWidth must be positive");
+    checkArgument(inputHeight > 0, "inputHeight must be positive");
+
+    transformationMatrix = new Matrix();
+    if (inputHeight > inputWidth) {
+      outputRotationDegrees = 90;
+      transformationMatrix.postRotate(outputRotationDegrees);
+      return new Size(inputHeight, inputWidth);
+    } else {
+      outputRotationDegrees = 0;
+      return new Size(inputWidth, inputHeight);
+    }
   }
 
   @Override
-  public Size getOutputSize() {
-    return checkStateNotNull(rotateFrameProcessor).getOutputSize();
+  public Matrix getMatrix(long presentationTimeUs) {
+    return checkStateNotNull(transformationMatrix, "configure must be called first");
   }
 
   /**
@@ -78,28 +83,7 @@ public Size getOutputSize() {
   public int getOutputRotationDegrees() {
     checkState(
         outputRotationDegrees != C.LENGTH_UNSET,
-        "configureOutputSizeAndTransformationMatrix must be called before"
-            + " getOutputRotationDegrees");
+        "configure must be called before getOutputRotationDegrees");
     return outputRotationDegrees;
   }
-
-  @Override
-  public void drawFrame(long presentationTimeUs) {
-    checkStateNotNull(rotateFrameProcessor).drawFrame(presentationTimeUs);
-  }
-
-  @Override
-  public void release() {
-    if (rotateFrameProcessor != null) {
-      rotateFrameProcessor.release();
-    }
-  }
-
-  @VisibleForTesting // Allows robolectric testing of output size calculation without OpenGL.
-  /* package */ void configureOutputSizeAndRotation(int inputWidth, int inputHeight) {
-    checkArgument(inputWidth > 0, "inputWidth must be positive");
-    checkArgument(inputHeight > 0, "inputHeight must be positive");
-
-    outputRotationDegrees = (inputHeight > inputWidth) ? 90 : 0;
-  }
 }

Diff for: libraries/transformer/src/main/java/androidx/media3/transformer/FrameProcessorChain.java

@@ -190,14 +190,16 @@ private static ImmutableList<GlFrameProcessor> getFrameProcessors(
     // Scale to expand the frame to apply the pixelWidthHeightRatio.
     if (pixelWidthHeightRatio > 1f) {
       frameProcessors.add(
-          new ScaleToFitFrameProcessor.Builder()
+          new ScaleToFitTransformation.Builder()
               .setScale(/* scaleX= */ pixelWidthHeightRatio, /* scaleY= */ 1f)
-              .build());
+              .build()
+              .toGlFrameProcessor());
     } else if (pixelWidthHeightRatio < 1f) {
       frameProcessors.add(
-          new ScaleToFitFrameProcessor.Builder()
+          new ScaleToFitTransformation.Builder()
               .setScale(/* scaleX= */ 1f, /* scaleY= */ 1f / pixelWidthHeightRatio)
-              .build());
+              .build()
+              .toGlFrameProcessor());
     }
 
     for (int i = 0; i < effects.size(); i++) {

Diff for: libraries/transformer/src/main/java/androidx/media3/transformer/MatrixTransformationFrameProcessor.java

@@ -32,16 +32,15 @@
  * Applies a transformation matrix in the vertex shader, and copies input pixels into an output
  * frame based on their locations after applying this matrix.
  *
- * <p>Operations are done on normalized device coordinates (-1 to 1 on x and y axes). No automatic
- * adjustments (like done in {@link ScaleToFitFrameProcessor}) are applied on the transformation.
+ * <p>Operations are done on normalized device coordinates (-1 to 1 on x and y axes).
  *
  * <p>The background color of the output frame will be black.
  */
 // TODO(b/227625423): Compose multiple transformation matrices in a single shader with clipping
 //  after each matrix.
 @UnstableApi
 @SuppressWarnings("FunctionalInterfaceClash") // b/228192298
-public final class MatrixTransformationFrameProcessor implements GlFrameProcessor {
+/* package */ final class MatrixTransformationFrameProcessor implements GlFrameProcessor {
 
   static {
     GlUtil.glAssertionsEnabled = true;