diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java index dad6d7ee36..598aae8249 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlvPlaybackTest.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.e2etest; +import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; import androidx.test.core.app.ApplicationProvider; @@ -25,6 +26,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; @@ -52,12 +54,15 @@ public final class FlvPlaybackTest { @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(); player.setVideoSurface(new Surface(new SurfaceTexture(/* texName= */ 1))); - PlaybackOutput playbackOutput = PlaybackOutput.register(player, mediaCodecConfig); + PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); player.setMediaItem(MediaItem.fromUri("asset:///media/flv/" + inputFile)); player.prepare(); @@ -66,8 +71,6 @@ public final class FlvPlaybackTest { player.release(); DumpFileAsserts.assertOutput( - ApplicationProvider.getApplicationContext(), - playbackOutput, - "playbackdumps/flv/" + inputFile + ".dump"); + applicationContext, playbackOutput, "playbackdumps/flv/" + inputFile + ".dump"); } } diff --git a/testdata/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump b/testdata/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump index a6942b6345..3baf12962e 100644 --- a/testdata/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump +++ b/testdata/src/test/assets/playbackdumps/flv/sample-with-key-frame-index.flv.dump @@ -1,4 +1,4 @@ -MediaCodec (video/avc): +MediaCodecAdapter (exotest.video.avc): buffers.length = 72 buffers[0] = length 747, hash 59AEB08 buffers[1] = length 117, hash 57A315CB diff --git a/testdata/src/test/assets/playbackdumps/flv/sample.flv.dump b/testdata/src/test/assets/playbackdumps/flv/sample.flv.dump index d65c8edaf1..557025cda2 100644 --- a/testdata/src/test/assets/playbackdumps/flv/sample.flv.dump +++ b/testdata/src/test/assets/playbackdumps/flv/sample.flv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/mp4a-latm): +MediaCodecAdapter (exotest.audio.aac): buffers.length = 46 buffers[0] = length 23, hash 47DE9131 buffers[1] = length 6, hash 31EC5206 @@ -46,7 +46,7 @@ MediaCodec (audio/mp4a-latm): buffers[43] = length 229, hash FFF98DF0 buffers[44] = length 6, hash 31B22286 buffers[45] = length 0, hash 1 -MediaCodec (video/avc): +MediaCodecAdapter (exotest.video.avc): buffers.length = 31 buffers[0] = length 36477, hash F0F36CFE buffers[1] = length 5341, hash 40B85E2