From 237766548ca59f00d4ddaf7f82f2c9137f1d39b7 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 17 Dec 2020 15:10:09 +0000
Subject: [PATCH] Use CapturingRenderersFactory in MkaPlaybackTest

PiperOrigin-RevId: 348015304
---
 .../android/exoplayer2/e2etest/MkaPlaybackTest.java | 13 ++++++++-----
 .../playbackdumps/mka/bear-flac-16bit.mka.dump      |  2 +-
 .../playbackdumps/mka/bear-flac-24bit.mka.dump      |  2 +-
 .../mka/bear-opus-negative-gain.mka.dump            |  2 +-
 .../assets/playbackdumps/mka/bear-opus.mka.dump     |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java
index 1db1fa94d1..78ff4299d1 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkaPlaybackTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.e2etest;
 
+import android.content.Context;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.Player;
@@ -23,6 +24,7 @@ import com.google.android.exoplayer2.robolectric.PlaybackOutput;
 import com.google.android.exoplayer2.robolectric.ShadowMediaCodecConfig;
 import com.google.android.exoplayer2.robolectric.TestPlayerRunHelper;
 import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
+import com.google.android.exoplayer2.testutil.CapturingRenderersFactory;
 import com.google.android.exoplayer2.testutil.DumpFileAsserts;
 import com.google.common.collect.ImmutableList;
 import org.junit.Rule;
@@ -54,11 +56,14 @@ public final class MkaPlaybackTest {
 
   @Test
   public void test() throws Exception {
+    Context applicationContext = ApplicationProvider.getApplicationContext();
+    CapturingRenderersFactory capturingRenderersFactory =
+        new CapturingRenderersFactory(applicationContext);
     SimpleExoPlayer player =
-        new SimpleExoPlayer.Builder(ApplicationProvider.getApplicationContext())
+        new SimpleExoPlayer.Builder(applicationContext, capturingRenderersFactory)
             .setClock(new AutoAdvancingFakeClock())
             .build();
-    PlaybackOutput playbackOutput = PlaybackOutput.register(player, mediaCodecConfig);
+    PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory);
 
     player.setMediaItem(MediaItem.fromUri("asset:///media/mka/" + inputFile));
     player.prepare();
@@ -67,8 +72,6 @@ public final class MkaPlaybackTest {
     player.release();
 
     DumpFileAsserts.assertOutput(
-        ApplicationProvider.getApplicationContext(),
-        playbackOutput,
-        "playbackdumps/mka/" + inputFile + ".dump");
+        applicationContext, playbackOutput, "playbackdumps/mka/" + inputFile + ".dump");
   }
 }
diff --git a/testdata/src/test/assets/playbackdumps/mka/bear-flac-16bit.mka.dump b/testdata/src/test/assets/playbackdumps/mka/bear-flac-16bit.mka.dump
index 17b7a89085..7d6cf6cb6b 100644
--- a/testdata/src/test/assets/playbackdumps/mka/bear-flac-16bit.mka.dump
+++ b/testdata/src/test/assets/playbackdumps/mka/bear-flac-16bit.mka.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/flac):
+MediaCodecAdapter (exotest.audio.flac):
   buffers.length = 30
   buffers[0] = length 3608, hash EE7EFC6C
   buffers[1] = length 4278, hash 7BAF8A9
diff --git a/testdata/src/test/assets/playbackdumps/mka/bear-flac-24bit.mka.dump b/testdata/src/test/assets/playbackdumps/mka/bear-flac-24bit.mka.dump
index 75bfed7e79..17260b2916 100644
--- a/testdata/src/test/assets/playbackdumps/mka/bear-flac-24bit.mka.dump
+++ b/testdata/src/test/assets/playbackdumps/mka/bear-flac-24bit.mka.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/flac):
+MediaCodecAdapter (exotest.audio.flac):
   buffers.length = 30
   buffers[0] = length 3610, hash C0423D1B
   buffers[1] = length 4280, hash 2E8BEA95
diff --git a/testdata/src/test/assets/playbackdumps/mka/bear-opus-negative-gain.mka.dump b/testdata/src/test/assets/playbackdumps/mka/bear-opus-negative-gain.mka.dump
index 5c3a9f9286..24a32498ee 100644
--- a/testdata/src/test/assets/playbackdumps/mka/bear-opus-negative-gain.mka.dump
+++ b/testdata/src/test/assets/playbackdumps/mka/bear-opus-negative-gain.mka.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/opus):
+MediaCodecAdapter (exotest.audio.opus):
   buffers.length = 138
   buffers[0] = length 375, hash 147EA9B
   buffers[1] = length 187, hash C8ADD7C2
diff --git a/testdata/src/test/assets/playbackdumps/mka/bear-opus.mka.dump b/testdata/src/test/assets/playbackdumps/mka/bear-opus.mka.dump
index 5c3a9f9286..24a32498ee 100644
--- a/testdata/src/test/assets/playbackdumps/mka/bear-opus.mka.dump
+++ b/testdata/src/test/assets/playbackdumps/mka/bear-opus.mka.dump
@@ -1,4 +1,4 @@
-MediaCodec (audio/opus):
+MediaCodecAdapter (exotest.audio.opus):
   buffers.length = 138
   buffers[0] = length 375, hash 147EA9B
   buffers[1] = length 187, hash C8ADD7C2