From 56d30205ba34eadc9bc8a3e3ed6b92d280abb5a0 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 17 Dec 2020 15:14:44 +0000 Subject: [PATCH] Use CapturingRenderersFactory in MkvPlaybackTest PiperOrigin-RevId: 348015859 --- .../android/exoplayer2/e2etest/MkvPlaybackTest.java | 13 ++++++++----- .../test/assets/playbackdumps/mkv/sample.mkv.dump | 4 ++-- .../sample_with_htc_rotation_track_name.mkv.dump | 4 ++-- .../mkv/sample_with_null_terminated_srt.mkv.dump | 4 ++-- ...mple_with_null_terminated_ssa_subtitles.mkv.dump | 4 ++-- .../playbackdumps/mkv/sample_with_srt.mkv.dump | 4 ++-- .../mkv/sample_with_ssa_subtitles.mkv.dump | 4 ++-- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java index 483b4aa3e5..7aa9fff35d 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/MkvPlaybackTest.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; @@ -58,12 +60,15 @@ public final class MkvPlaybackTest { @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/mkv/" + inputFile)); player.prepare(); @@ -72,8 +77,6 @@ public final class MkvPlaybackTest { player.release(); DumpFileAsserts.assertOutput( - ApplicationProvider.getApplicationContext(), - playbackOutput, - "playbackdumps/mkv/" + inputFile + ".dump"); + applicationContext, playbackOutput, "playbackdumps/mkv/" + inputFile + ".dump"); } } diff --git a/testdata/src/test/assets/playbackdumps/mkv/sample.mkv.dump b/testdata/src/test/assets/playbackdumps/mkv/sample.mkv.dump index 9cae6de0ca..2279019f2c 100644 --- a/testdata/src/test/assets/playbackdumps/mkv/sample.mkv.dump +++ b/testdata/src/test/assets/playbackdumps/mkv/sample.mkv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/ac3): +MediaCodecAdapter (exotest.audio.ac3): buffers.length = 30 buffers[0] = length 416, hash 211F2286 buffers[1] = length 418, hash 77425A86 @@ -30,7 +30,7 @@ MediaCodec (audio/ac3): buffers[27] = length 418, hash DE46E5D3 buffers[28] = length 418, hash 56AB8D37 buffers[29] = 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 diff --git a/testdata/src/test/assets/playbackdumps/mkv/sample_with_htc_rotation_track_name.mkv.dump b/testdata/src/test/assets/playbackdumps/mkv/sample_with_htc_rotation_track_name.mkv.dump index 9cae6de0ca..2279019f2c 100644 --- a/testdata/src/test/assets/playbackdumps/mkv/sample_with_htc_rotation_track_name.mkv.dump +++ b/testdata/src/test/assets/playbackdumps/mkv/sample_with_htc_rotation_track_name.mkv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/ac3): +MediaCodecAdapter (exotest.audio.ac3): buffers.length = 30 buffers[0] = length 416, hash 211F2286 buffers[1] = length 418, hash 77425A86 @@ -30,7 +30,7 @@ MediaCodec (audio/ac3): buffers[27] = length 418, hash DE46E5D3 buffers[28] = length 418, hash 56AB8D37 buffers[29] = 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 diff --git a/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_srt.mkv.dump b/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_srt.mkv.dump index 9cae6de0ca..2279019f2c 100644 --- a/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_srt.mkv.dump +++ b/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_srt.mkv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/ac3): +MediaCodecAdapter (exotest.audio.ac3): buffers.length = 30 buffers[0] = length 416, hash 211F2286 buffers[1] = length 418, hash 77425A86 @@ -30,7 +30,7 @@ MediaCodec (audio/ac3): buffers[27] = length 418, hash DE46E5D3 buffers[28] = length 418, hash 56AB8D37 buffers[29] = 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 diff --git a/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.dump b/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.dump index 9cae6de0ca..2279019f2c 100644 --- a/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.dump +++ b/testdata/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/ac3): +MediaCodecAdapter (exotest.audio.ac3): buffers.length = 30 buffers[0] = length 416, hash 211F2286 buffers[1] = length 418, hash 77425A86 @@ -30,7 +30,7 @@ MediaCodec (audio/ac3): buffers[27] = length 418, hash DE46E5D3 buffers[28] = length 418, hash 56AB8D37 buffers[29] = 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 diff --git a/testdata/src/test/assets/playbackdumps/mkv/sample_with_srt.mkv.dump b/testdata/src/test/assets/playbackdumps/mkv/sample_with_srt.mkv.dump index 9cae6de0ca..2279019f2c 100644 --- a/testdata/src/test/assets/playbackdumps/mkv/sample_with_srt.mkv.dump +++ b/testdata/src/test/assets/playbackdumps/mkv/sample_with_srt.mkv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/ac3): +MediaCodecAdapter (exotest.audio.ac3): buffers.length = 30 buffers[0] = length 416, hash 211F2286 buffers[1] = length 418, hash 77425A86 @@ -30,7 +30,7 @@ MediaCodec (audio/ac3): buffers[27] = length 418, hash DE46E5D3 buffers[28] = length 418, hash 56AB8D37 buffers[29] = 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 diff --git a/testdata/src/test/assets/playbackdumps/mkv/sample_with_ssa_subtitles.mkv.dump b/testdata/src/test/assets/playbackdumps/mkv/sample_with_ssa_subtitles.mkv.dump index 9cae6de0ca..2279019f2c 100644 --- a/testdata/src/test/assets/playbackdumps/mkv/sample_with_ssa_subtitles.mkv.dump +++ b/testdata/src/test/assets/playbackdumps/mkv/sample_with_ssa_subtitles.mkv.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/ac3): +MediaCodecAdapter (exotest.audio.ac3): buffers.length = 30 buffers[0] = length 416, hash 211F2286 buffers[1] = length 418, hash 77425A86 @@ -30,7 +30,7 @@ MediaCodec (audio/ac3): buffers[27] = length 418, hash DE46E5D3 buffers[28] = length 418, hash 56AB8D37 buffers[29] = 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