From a2265f1daee2a9b73bccb7d638b79635ff0a3ab4 Mon Sep 17 00:00:00 2001 From: shahddaghash Date: Mon, 14 Apr 2025 07:44:20 -0700 Subject: [PATCH] Replace deprecated ShadowMediaCodecConfig factory methods This is part of the efforts for adding encoder support for ShadowMediaCodecConfig to use it for ExoPlayer and Transcoding tests. * Replaced `ShadowMediaCodecConfig#forAllSupportedMimeTypes()` calls with `ShadowMediaCodecConfig#withAllDefaultSupportedCodecs()` * Replaced `ShadowMediaCodecConfig#withNoDefaultSupportedMimeTypes() calls with `ShadowMediaCodexConfig#withNoDefaultSupportedCodecs()` PiperOrigin-RevId: 747413859 --- .../src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java | 2 +- .../media3/exoplayer/ExoPlayerWithPrewarmingRenderersTest.java | 2 +- .../media3/exoplayer/audio/AudioCapabilitiesEndToEndTest.java | 2 +- .../media3/exoplayer/audio/AudioOffloadEndToEndTest.java | 2 +- .../media3/exoplayer/e2etest/AnalyticsListenerPlaybackTest.java | 2 +- .../media3/exoplayer/e2etest/ClippingPlaylistPlaybackTest.java | 2 +- .../exoplayer/e2etest/EndToEndOffloadFailureRecoveryTest.java | 2 +- .../androidx/media3/exoplayer/e2etest/FlacPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/FlvPlaybackTest.java | 2 +- .../media3/exoplayer/e2etest/MergingPlaylistPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/MkaPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java | 2 +- .../media3/exoplayer/e2etest/MotionPhotoPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java | 2 +- .../androidx/media3/exoplayer/e2etest/OggOpusPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/OggPlaybackTest.java | 2 +- .../e2etest/ParseAv1SampleDependenciesPlaybackTest.java | 2 +- .../androidx/media3/exoplayer/e2etest/PlaylistPlaybackTest.java | 2 +- .../exoplayer/e2etest/PrewarmingRendererPlaybackTest.java | 2 +- .../androidx/media3/exoplayer/e2etest/SilencePlaybackTest.java | 2 +- .../androidx/media3/exoplayer/e2etest/SubtitlePlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/TsPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/Vp9PlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/e2etest/WavPlaybackTest.java | 2 +- .../androidx/media3/exoplayer/e2etest/WebvttPlaybackTest.java | 2 +- .../source/ads/ServerSideAdInsertionMediaSourceTest.java | 2 +- .../media3/exoplayer/dash/e2etest/DashPlaybackTest.java | 2 +- .../androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java | 2 +- .../java/androidx/media3/exoplayer/rtsp/RtspPlaybackTest.java | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java index 7daeba9640..674136d7a5 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java @@ -263,7 +263,7 @@ public final class ExoPlayerTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); // The explicit boolean parameter is only used to give clear test names. @Parameter(0) diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerWithPrewarmingRenderersTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerWithPrewarmingRenderersTest.java index f6b7c7060e..82f10a3cc9 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerWithPrewarmingRenderersTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerWithPrewarmingRenderersTest.java @@ -83,7 +83,7 @@ public class ExoPlayerWithPrewarmingRenderersTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Before public void setUp() { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioCapabilitiesEndToEndTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioCapabilitiesEndToEndTest.java index cfd0c48e44..03f9328cbc 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioCapabilitiesEndToEndTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioCapabilitiesEndToEndTest.java @@ -88,7 +88,7 @@ public class AudioCapabilitiesEndToEndTest { @Rule public ShadowMediaCodecConfig shadowMediaCodecConfig = - ShadowMediaCodecConfig.withNoDefaultSupportedMimeTypes(); + ShadowMediaCodecConfig.withNoDefaultSupportedCodecs(); @Before public void setUp() { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioOffloadEndToEndTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioOffloadEndToEndTest.java index 48afe2663e..5bf5ee13e4 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioOffloadEndToEndTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/AudioOffloadEndToEndTest.java @@ -61,7 +61,7 @@ public class AudioOffloadEndToEndTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Before public void setup() { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/AnalyticsListenerPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/AnalyticsListenerPlaybackTest.java index accb0d255b..0054b82e5b 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/AnalyticsListenerPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/AnalyticsListenerPlaybackTest.java @@ -48,7 +48,7 @@ public class AnalyticsListenerPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void loadEventsReportedAsExpected() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ClippingPlaylistPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ClippingPlaylistPlaybackTest.java index 11e386b65f..dc7c1b1a68 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ClippingPlaylistPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ClippingPlaylistPlaybackTest.java @@ -69,7 +69,7 @@ public final class ClippingPlaylistPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void playbackWithClippingMediaSources() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndOffloadFailureRecoveryTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndOffloadFailureRecoveryTest.java index 3b70e4778f..153726c5ac 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndOffloadFailureRecoveryTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndOffloadFailureRecoveryTest.java @@ -57,7 +57,7 @@ public class EndToEndOffloadFailureRecoveryTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); public FakeClock fakeClock; public DefaultTrackSelector trackSelector; diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlacPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlacPlaybackTest.java index af4eeaaff1..b8002cda02 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlacPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlacPlaybackTest.java @@ -57,7 +57,7 @@ public class FlacPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlvPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlvPlaybackTest.java index ea94fa07a6..5ba8ff2138 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlvPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/FlvPlaybackTest.java @@ -47,7 +47,7 @@ public final class FlvPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MergingPlaylistPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MergingPlaylistPlaybackTest.java index 11d7c0d8eb..7626e4d94d 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MergingPlaylistPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MergingPlaylistPlaybackTest.java @@ -86,7 +86,7 @@ public final class MergingPlaylistPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void transitionBetweenDifferentMergeConfigurations() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkaPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkaPlaybackTest.java index 65a58f3bdc..d2d7d01f51 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkaPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkaPlaybackTest.java @@ -50,7 +50,7 @@ public final class MkaPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java index bc55759650..6ab8f385f5 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java @@ -64,7 +64,7 @@ public final class MkvPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MotionPhotoPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MotionPhotoPlaybackTest.java index 90c4c83211..9ccba99941 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MotionPhotoPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MotionPhotoPlaybackTest.java @@ -51,7 +51,7 @@ public class MotionPhotoPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java index 374094baa4..7fdfe77184 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java @@ -54,7 +54,7 @@ public final class Mp3PlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java index 63f19748fb..0dc22cf4a0 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java @@ -76,7 +76,7 @@ public class Mp4PlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggOpusPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggOpusPlaybackTest.java index c5263a2de6..9a8ae1532c 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggOpusPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggOpusPlaybackTest.java @@ -52,7 +52,7 @@ public final class OggOpusPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); public FakeClock fakeClock; public OffloadRenderersFactory offloadRenderersFactory; diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggPlaybackTest.java index b6c5c983db..8ddefcaa2b 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/OggPlaybackTest.java @@ -50,7 +50,7 @@ public final class OggPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ParseAv1SampleDependenciesPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ParseAv1SampleDependenciesPlaybackTest.java index 15ab905468..91ea39bf60 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ParseAv1SampleDependenciesPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/ParseAv1SampleDependenciesPlaybackTest.java @@ -58,7 +58,7 @@ public class ParseAv1SampleDependenciesPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void playback_withClippedMediaItem_skipNonReferenceInputSamples() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PlaylistPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PlaylistPlaybackTest.java index 22ad2ed47a..0b4c5627ab 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PlaylistPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PlaylistPlaybackTest.java @@ -52,7 +52,7 @@ public final class PlaylistPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test_bypassOnThenOff() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PrewarmingRendererPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PrewarmingRendererPlaybackTest.java index ffc648c124..34edeaf0ec 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PrewarmingRendererPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/PrewarmingRendererPlaybackTest.java @@ -56,7 +56,7 @@ public class PrewarmingRendererPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void playback_withTwoMediaItemsAndSecondaryVideoRenderer_dumpsCorrectOutput() diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SilencePlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SilencePlaybackTest.java index 31ee7bbd0d..e8a6579337 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SilencePlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SilencePlaybackTest.java @@ -37,7 +37,7 @@ public final class SilencePlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test_500ms() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SubtitlePlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SubtitlePlaybackTest.java index dcf81fd356..7e69de21d5 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SubtitlePlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/SubtitlePlaybackTest.java @@ -60,7 +60,7 @@ public class SubtitlePlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); // https://github.com/androidx/media/issues/1721 @Test diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/TsPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/TsPlaybackTest.java index 5912d06e3e..e5ef01eeef 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/TsPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/TsPlaybackTest.java @@ -74,7 +74,7 @@ public class TsPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Vp9PlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Vp9PlaybackTest.java index d52f24ef21..43d86d5822 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Vp9PlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Vp9PlaybackTest.java @@ -51,7 +51,7 @@ public final class Vp9PlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WavPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WavPlaybackTest.java index 8b63daebee..18151b5072 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WavPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WavPlaybackTest.java @@ -44,7 +44,7 @@ public final class WavPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WebvttPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WebvttPlaybackTest.java index 887f047903..197cc87d4a 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WebvttPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/WebvttPlaybackTest.java @@ -68,7 +68,7 @@ public class WebvttPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void test() throws Exception { diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java index b2bc1fa309..78c0c2402b 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/ads/ServerSideAdInsertionMediaSourceTest.java @@ -104,7 +104,7 @@ public final class ServerSideAdInsertionMediaSourceTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); private static final String TEST_ASSET = "asset:///media/mp4/sample.mp4"; diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java index ef4c45ddf8..90b00bf1b2 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java @@ -75,7 +75,7 @@ public final class DashPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void webvttStandaloneFile() throws Exception { diff --git a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java index 575526c01d..beb03c99a9 100644 --- a/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java +++ b/libraries/exoplayer_hls/src/test/java/androidx/media3/exoplayer/hls/e2etest/HlsPlaybackTest.java @@ -70,7 +70,7 @@ public final class HlsPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Test public void webvttStandaloneSubtitlesFile() throws Exception { diff --git a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspPlaybackTest.java b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspPlaybackTest.java index 9bdab3e0db..54e719866d 100644 --- a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspPlaybackTest.java +++ b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspPlaybackTest.java @@ -80,7 +80,7 @@ public final class RtspPlaybackTest { @Rule public ShadowMediaCodecConfig mediaCodecConfig = - ShadowMediaCodecConfig.forAllSupportedMimeTypes(); + ShadowMediaCodecConfig.withAllDefaultSupportedCodecs(); @Before public void setUp() throws Exception {