From 316a2ce0ee4f49ba8bce2c9ec9028ebf1e773263 Mon Sep 17 00:00:00 2001
From: tofunmi <tofunmi@google.com>
Date: Wed, 19 Apr 2023 17:54:23 +0100
Subject: [PATCH] Remove deprecated constructor in
 DefaultVideoFrameProcessor.Factory

Remove deprecated factory constructor and replace all call instances of it.

PiperOrigin-RevId: 525476062
---
 ...faultVideoFrameProcessorImageFrameOutputTest.java |  2 +-
 .../effect/DefaultVideoFrameProcessorPixelTest.java  |  2 +-
 ...aultVideoFrameProcessorVideoFrameReleaseTest.java |  3 ++-
 .../media3/effect/DefaultVideoFrameProcessor.java    | 12 ------------
 .../mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java      |  2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java
index ccaca2a57e..f527da2d45 100644
--- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java
+++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorImageFrameOutputTest.java
@@ -123,7 +123,7 @@ public class DefaultVideoFrameProcessorImageFrameOutputTest {
       String testId) {
     return new VideoFrameProcessorTestRunner.Builder()
         .setTestId(testId)
-        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory())
+        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory.Builder().build())
         .setIsInputTextureExternal(false)
         .setOnOutputFrameAvailableListener(
             unused -> checkNotNull(framesProduced).incrementAndGet());
diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java
index 587843a0e1..ade54bd5ec 100644
--- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java
+++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorPixelTest.java
@@ -506,7 +506,7 @@ public final class DefaultVideoFrameProcessorPixelTest {
       String testId) {
     return new VideoFrameProcessorTestRunner.Builder()
         .setTestId(testId)
-        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory())
+        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory.Builder().build())
         .setVideoAssetPath(INPUT_SDR_MP4_ASSET_STRING);
   }
 
diff --git a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameReleaseTest.java b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameReleaseTest.java
index efeeca6bd4..66b6d39de0 100644
--- a/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameReleaseTest.java
+++ b/libraries/effect/src/androidTest/java/androidx/media3/effect/DefaultVideoFrameProcessorVideoFrameReleaseTest.java
@@ -292,7 +292,8 @@ public final class DefaultVideoFrameProcessorVideoFrameReleaseTest {
     CountDownLatch videoFrameProcessingEndedCountDownLatch = new CountDownLatch(1);
     defaultVideoFrameProcessor =
         checkNotNull(
-            new DefaultVideoFrameProcessor.Factory()
+            new DefaultVideoFrameProcessor.Factory.Builder()
+                .build()
                 .create(
                     getApplicationContext(),
                     ImmutableList.of((GlEffect) (context, useHdr) -> blankFrameProducer),
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
index 8f7fc87a56..979c69bf69 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java
@@ -143,18 +143,6 @@ public final class DefaultVideoFrameProcessor implements VideoFrameProcessor {
       this.textureOutputListener = textureOutputListener;
     }
 
-    // TODO(276913828): Remove and change all calls to a builder.
-    /**
-     * @deprecated Use {@link DefaultVideoFrameProcessor.Factory.Builder} instead.
-     */
-    @Deprecated
-    public Factory() {
-      this(
-          /* enableColorTransfers= */ true,
-          GlObjectsProvider.DEFAULT,
-          /* textureOutputListener= */ null);
-    }
-
     /**
      * {@inheritDoc}
      *
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java
index 968f418444..6644d4956c 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ToneMapHdrToSdrUsingOpenGlPixelTest.java
@@ -213,6 +213,6 @@ public final class ToneMapHdrToSdrUsingOpenGlPixelTest {
       String testId) {
     return new VideoFrameProcessorTestRunner.Builder()
         .setTestId(testId)
-        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory());
+        .setVideoFrameProcessorFactory(new DefaultVideoFrameProcessor.Factory.Builder().build());
   }
 }