From 4198f7e242da9097373338c1305c2e936e8c044c Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Tue, 9 Jan 2024 04:34:41 -0800
Subject: [PATCH] Add utility testing Player.Listener in transformer tests

PiperOrigin-RevId: 596891721
---
 .../src/test/assets/media/jpeg/white-1x1.jpg      | Bin 0 -> 518 bytes
 ...eTestListener.java => PlayerTestListener.java} |   8 ++++----
 .../VideoEffectsPreviewPerformanceTest.java       |   3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 libraries/test_data/src/test/assets/media/jpeg/white-1x1.jpg
 rename libraries/transformer/src/androidTest/java/androidx/media3/transformer/{mh/performance/PerformanceTestListener.java => PlayerTestListener.java} (93%)

diff --git a/libraries/test_data/src/test/assets/media/jpeg/white-1x1.jpg b/libraries/test_data/src/test/assets/media/jpeg/white-1x1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..392269c49cb82d16d0053e9ab8e2f3561671b3b8
GIT binary patch
literal 518
zcmbV{OA5k35Jan{Q6dQTfO~PDJIq1|=%wav;vxKOyh+=WU_i+SQoAW$O;y|7-q1^P
zZa`Pf8n72m?W;ITRX$mo?Q?cTtUyp05h5khZrHo?t4(qF@4}wg3K3KkVBQr<hp5W4
rT!mbKI1C7xI0b|r7_C^Ru3{8mI_B?ah~KD(nMpb~sRJe&9e8{IJ|a5g

literal 0
HcmV?d00001

diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PerformanceTestListener.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java
similarity index 93%
rename from libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PerformanceTestListener.java
rename to libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java
index a89fbe0cfc..087188c089 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/PerformanceTestListener.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/PlayerTestListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.transformer.mh.performance;
+package androidx.media3.transformer;
 
 import android.os.ConditionVariable;
 import androidx.annotation.Nullable;
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
-/** A listener for testing previewing performance. */
-/* package */ class PerformanceTestListener implements Player.Listener, AnalyticsListener {
+/** Utility {@link Player.Listener} for testing. */
+public final class PlayerTestListener implements Player.Listener, AnalyticsListener {
 
   private final ConditionVariable playerReady;
   private final ConditionVariable playerEnded;
@@ -41,7 +41,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
    * @param testTimeoutMs The timeout value in milliseconds for which {@link
    *     #waitUntilPlayerReady()} and {@link #waitUntilPlayerEnded()} waits.
    */
-  public PerformanceTestListener(long testTimeoutMs) {
+  public PlayerTestListener(long testTimeoutMs) {
     playerReady = new ConditionVariable();
     playerEnded = new ConditionVariable();
     playbackException = new AtomicReference<>();
diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java
index 0fc7e616e3..f43b96ace4 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/performance/VideoEffectsPreviewPerformanceTest.java
@@ -28,6 +28,7 @@ import androidx.media3.common.PlaybackException;
 import androidx.media3.exoplayer.DecoderCounters;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.exoplayer.util.EventLogger;
+import androidx.media3.transformer.PlayerTestListener;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -66,7 +67,7 @@ public class VideoEffectsPreviewPerformanceTest {
    */
   @Test
   public void exoplayerEffectsPreviewTest() throws PlaybackException, TimeoutException {
-    PerformanceTestListener listener = new PerformanceTestListener(TEST_TIMEOUT_MS);
+    PlayerTestListener listener = new PlayerTestListener(TEST_TIMEOUT_MS);
     instrumentation.runOnMainSync(
         () -> {
           player = new ExoPlayer.Builder(ApplicationProvider.getApplicationContext()).build();