From 3bf5e6b0e463d95b6875d7398aaef5032fd98e4c Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 17 Dec 2020 15:02:45 +0000 Subject: [PATCH] Use CapturingRenderersFactory in FlacPlaybackTest PiperOrigin-RevId: 348014322 --- .../exoplayer2/e2etest/FlacPlaybackTest.java | 13 ++++++++----- .../test/assets/playbackdumps/flac/bear.flac.dump | 2 +- .../flac/bear_no_min_max_frame_size.flac.dump | 2 +- .../flac/bear_no_num_samples.flac.dump | 2 +- .../bear_no_seek_table_no_num_samples.flac.dump | 2 +- .../flac/bear_one_metadata_block.flac.dump | 2 +- .../flac/bear_uncommon_sample_rate.flac.dump | 2 +- .../playbackdumps/flac/bear_with_id3.flac.dump | 2 +- .../playbackdumps/flac/bear_with_picture.flac.dump | 2 +- .../flac/bear_with_vorbis_comments.flac.dump | 2 +- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java index 9dc09edc5b..cb2c945ec3 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/e2etest/FlacPlaybackTest.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; @@ -61,11 +63,14 @@ public class FlacPlaybackTest { @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/flac/" + inputFile)); player.prepare(); @@ -74,8 +79,6 @@ public class FlacPlaybackTest { player.release(); DumpFileAsserts.assertOutput( - ApplicationProvider.getApplicationContext(), - playbackOutput, - "playbackdumps/flac/" + inputFile + ".dump"); + applicationContext, playbackOutput, "playbackdumps/flac/" + inputFile + ".dump"); } } diff --git a/testdata/src/test/assets/playbackdumps/flac/bear.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_no_min_max_frame_size.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_no_min_max_frame_size.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_no_min_max_frame_size.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_no_min_max_frame_size.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_no_num_samples.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_no_num_samples.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_no_num_samples.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_no_num_samples.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_no_seek_table_no_num_samples.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_no_seek_table_no_num_samples.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_no_seek_table_no_num_samples.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_no_seek_table_no_num_samples.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_one_metadata_block.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_one_metadata_block.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_one_metadata_block.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_one_metadata_block.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_uncommon_sample_rate.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_uncommon_sample_rate.flac.dump index 19608afa66..e5d8e30ff1 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_uncommon_sample_rate.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_uncommon_sample_rate.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 28 buffers[0] = length 5415, hash 915DBC66 buffers[1] = length 5529, hash EFD564F7 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_with_id3.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_with_id3.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_with_id3.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_with_id3.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_with_picture.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_with_picture.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_with_picture.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_with_picture.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54 diff --git a/testdata/src/test/assets/playbackdumps/flac/bear_with_vorbis_comments.flac.dump b/testdata/src/test/assets/playbackdumps/flac/bear_with_vorbis_comments.flac.dump index aa6cfbc9e1..36a685ba05 100644 --- a/testdata/src/test/assets/playbackdumps/flac/bear_with_vorbis_comments.flac.dump +++ b/testdata/src/test/assets/playbackdumps/flac/bear_with_vorbis_comments.flac.dump @@ -1,4 +1,4 @@ -MediaCodec (audio/flac): +MediaCodecAdapter (exotest.audio.flac): buffers.length = 34 buffers[0] = length 5030, hash D2B60530 buffers[1] = length 5066, hash 4C932A54