From 0d1dac93c4ef844fb605c2367ba3fe2e34db6076 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 17 Dec 2020 15:35:32 +0000 Subject: [PATCH] Use CapturingRenderersFactory in DashPlaybackTest PiperOrigin-RevId: 348018409 --- .../exoplayer2/e2etest/DashPlaybackTest.java | 13 ++++++++----- .../assets/playbackdumps/dash/webvtt-in-mp4.dump | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/e2etest/DashPlaybackTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/e2etest/DashPlaybackTest.java index fc7f697cca..d14c702a25 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/e2etest/DashPlaybackTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/e2etest/DashPlaybackTest.java @@ -17,6 +17,7 @@ package com.google.android.exoplayer2.e2etest; import static com.google.android.exoplayer2.util.Assertions.checkNotNull; +import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; import androidx.test.core.app.ApplicationProvider; @@ -28,6 +29,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.android.exoplayer2.trackselection.DefaultTrackSelector; import org.junit.Rule; @@ -48,12 +50,15 @@ public final class DashPlaybackTest { // https://github.com/google/ExoPlayer/issues/7985 @Test public void webvttInMp4() 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(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); - PlaybackOutput playbackOutput = PlaybackOutput.register(player, mediaCodecConfig); + PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); // Ensure the subtitle track is selected. DefaultTrackSelector trackSelector = @@ -66,8 +71,6 @@ public final class DashPlaybackTest { player.release(); DumpFileAsserts.assertOutput( - ApplicationProvider.getApplicationContext(), - playbackOutput, - "playbackdumps/dash/webvtt-in-mp4.dump"); + applicationContext, playbackOutput, "playbackdumps/dash/webvtt-in-mp4.dump"); } } diff --git a/testdata/src/test/assets/playbackdumps/dash/webvtt-in-mp4.dump b/testdata/src/test/assets/playbackdumps/dash/webvtt-in-mp4.dump index f0f2f8d4df..e7b8f94b80 100644 --- a/testdata/src/test/assets/playbackdumps/dash/webvtt-in-mp4.dump +++ b/testdata/src/test/assets/playbackdumps/dash/webvtt-in-mp4.dump @@ -1,4 +1,4 @@ -MediaCodec (video/avc): +MediaCodecAdapter (exotest.video.avc): buffers.length = 31 buffers[0] = length 36692, hash D216076E buffers[1] = length 5312, hash D45D3CA0