Skip to content

SDK / exoplayer

Go to a project
Commit 149ea905 by andrewlewis Committed by Oliver Woodman
Options

Fix throws in DashStreamingTest 

Some methods marked as throwing DecoderQueryException actually
did not throw it. Switch to marking throws Exception
everywhere.

PiperOrigin-RevId: 277674401
parent f5377d9b
Inline Side-by-side
Showing with 33 additions and 33 deletions
playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java
...@@ -101,7 +101,7 @@ public final class DashStreamingTest { ...@@ -101,7 +101,7 @@ public final class DashStreamingTest {
// H264 CDD. // H264 CDD.
@Test @Test
public void testH264Fixed() { public void testH264Fixed() throws Exception {
testRunner testRunner
.setStreamName("test_h264_fixed") .setStreamName("test_h264_fixed")
.setManifestUrl(DashTestData.H264_MANIFEST) .setManifestUrl(DashTestData.H264_MANIFEST)
...@@ -112,7 +112,7 @@ public final class DashStreamingTest { ...@@ -112,7 +112,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testH264Adaptive() throws DecoderQueryException { public void testH264Adaptive() throws Exception {
if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) { if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
// Pass. // Pass.
return; return;
...@@ -128,7 +128,7 @@ public final class DashStreamingTest { ...@@ -128,7 +128,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testH264AdaptiveWithSeeking() throws DecoderQueryException { public void testH264AdaptiveWithSeeking() throws Exception {
if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) { if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
// Pass. // Pass.
return; return;
...@@ -146,7 +146,7 @@ public final class DashStreamingTest { ...@@ -146,7 +146,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testH264AdaptiveWithRendererDisabling() throws DecoderQueryException { public void testH264AdaptiveWithRendererDisabling() throws Exception {
if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) { if (shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
// Pass. // Pass.
return; return;
...@@ -166,7 +166,7 @@ public final class DashStreamingTest { ...@@ -166,7 +166,7 @@ public final class DashStreamingTest {
// H265 CDD. // H265 CDD.
@Test @Test
public void testH265FixedV23() { public void testH265FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -181,7 +181,7 @@ public final class DashStreamingTest { ...@@ -181,7 +181,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testH265AdaptiveV24() throws DecoderQueryException { public void testH265AdaptiveV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -197,7 +197,7 @@ public final class DashStreamingTest { ...@@ -197,7 +197,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testH265AdaptiveWithSeekingV24() throws DecoderQueryException { public void testH265AdaptiveWithSeekingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -214,7 +214,7 @@ public final class DashStreamingTest { ...@@ -214,7 +214,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testH265AdaptiveWithRendererDisablingV24() throws DecoderQueryException { public void testH265AdaptiveWithRendererDisablingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -233,7 +233,7 @@ public final class DashStreamingTest { ...@@ -233,7 +233,7 @@ public final class DashStreamingTest {
// VP9 (CDD). // VP9 (CDD).
@Test @Test
public void testVp9Fixed360pV23() { public void testVp9Fixed360pV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -249,7 +249,7 @@ public final class DashStreamingTest { ...@@ -249,7 +249,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testVp9AdaptiveV24() throws DecoderQueryException { public void testVp9AdaptiveV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -265,7 +265,7 @@ public final class DashStreamingTest { ...@@ -265,7 +265,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testVp9AdaptiveWithSeekingV24() throws DecoderQueryException { public void testVp9AdaptiveWithSeekingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -282,7 +282,7 @@ public final class DashStreamingTest { ...@@ -282,7 +282,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testVp9AdaptiveWithRendererDisablingV24() throws DecoderQueryException { public void testVp9AdaptiveWithRendererDisablingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -302,7 +302,7 @@ public final class DashStreamingTest { ...@@ -302,7 +302,7 @@ public final class DashStreamingTest {
// 23.976 fps. // 23.976 fps.
@Test @Test
public void test23FpsH264FixedV23() { public void test23FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -319,7 +319,7 @@ public final class DashStreamingTest { ...@@ -319,7 +319,7 @@ public final class DashStreamingTest {
// 24 fps. // 24 fps.
@Test @Test
public void test24FpsH264FixedV23() { public void test24FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -336,7 +336,7 @@ public final class DashStreamingTest { ...@@ -336,7 +336,7 @@ public final class DashStreamingTest {
// 29.97 fps. // 29.97 fps.
@Test @Test
public void test29FpsH264FixedV23() { public void test29FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -355,7 +355,7 @@ public final class DashStreamingTest { ...@@ -355,7 +355,7 @@ public final class DashStreamingTest {
// H264 CDD. // H264 CDD.
@Test @Test
public void testWidevineH264FixedV18() throws DecoderQueryException { public void testWidevineH264FixedV18() throws Exception {
if (Util.SDK_INT < 18) { if (Util.SDK_INT < 18) {
// Pass. // Pass.
return; return;
...@@ -372,7 +372,7 @@ public final class DashStreamingTest { ...@@ -372,7 +372,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineH264AdaptiveV18() throws DecoderQueryException { public void testWidevineH264AdaptiveV18() throws Exception {
if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) { if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
// Pass. // Pass.
return; return;
...@@ -389,7 +389,7 @@ public final class DashStreamingTest { ...@@ -389,7 +389,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineH264AdaptiveWithSeekingV18() throws DecoderQueryException { public void testWidevineH264AdaptiveWithSeekingV18() throws Exception {
if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) { if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
// Pass. // Pass.
return; return;
...@@ -407,7 +407,7 @@ public final class DashStreamingTest { ...@@ -407,7 +407,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineH264AdaptiveWithRendererDisablingV18() throws DecoderQueryException { public void testWidevineH264AdaptiveWithRendererDisablingV18() throws Exception {
if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) { if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
// Pass. // Pass.
return; return;
...@@ -427,7 +427,7 @@ public final class DashStreamingTest { ...@@ -427,7 +427,7 @@ public final class DashStreamingTest {
// H265 CDD. // H265 CDD.
@Test @Test
public void testWidevineH265FixedV23() throws DecoderQueryException { public void testWidevineH265FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -444,7 +444,7 @@ public final class DashStreamingTest { ...@@ -444,7 +444,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineH265AdaptiveV24() throws DecoderQueryException { public void testWidevineH265AdaptiveV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -461,7 +461,7 @@ public final class DashStreamingTest { ...@@ -461,7 +461,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineH265AdaptiveWithSeekingV24() throws DecoderQueryException { public void testWidevineH265AdaptiveWithSeekingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -479,7 +479,7 @@ public final class DashStreamingTest { ...@@ -479,7 +479,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineH265AdaptiveWithRendererDisablingV24() throws DecoderQueryException { public void testWidevineH265AdaptiveWithRendererDisablingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -499,7 +499,7 @@ public final class DashStreamingTest { ...@@ -499,7 +499,7 @@ public final class DashStreamingTest {
// VP9 (CDD). // VP9 (CDD).
@Test @Test
public void testWidevineVp9Fixed360pV23() throws DecoderQueryException { public void testWidevineVp9Fixed360pV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -516,7 +516,7 @@ public final class DashStreamingTest { ...@@ -516,7 +516,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineVp9AdaptiveV24() throws DecoderQueryException { public void testWidevineVp9AdaptiveV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -533,7 +533,7 @@ public final class DashStreamingTest { ...@@ -533,7 +533,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineVp9AdaptiveWithSeekingV24() throws DecoderQueryException { public void testWidevineVp9AdaptiveWithSeekingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -551,7 +551,7 @@ public final class DashStreamingTest { ...@@ -551,7 +551,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testWidevineVp9AdaptiveWithRendererDisablingV24() throws DecoderQueryException { public void testWidevineVp9AdaptiveWithRendererDisablingV24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -572,7 +572,7 @@ public final class DashStreamingTest { ...@@ -572,7 +572,7 @@ public final class DashStreamingTest {
// 23.976 fps. // 23.976 fps.
@Test @Test
public void testWidevine23FpsH264FixedV23() throws DecoderQueryException { public void testWidevine23FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -590,7 +590,7 @@ public final class DashStreamingTest { ...@@ -590,7 +590,7 @@ public final class DashStreamingTest {
// 24 fps. // 24 fps.
@Test @Test
public void testWidevine24FpsH264FixedV23() throws DecoderQueryException { public void testWidevine24FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -608,7 +608,7 @@ public final class DashStreamingTest { ...@@ -608,7 +608,7 @@ public final class DashStreamingTest {
// 29.97 fps. // 29.97 fps.
@Test @Test
public void testWidevine29FpsH264FixedV23() throws DecoderQueryException { public void testWidevine29FpsH264FixedV23() throws Exception {
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// Pass. // Pass.
return; return;
...@@ -627,7 +627,7 @@ public final class DashStreamingTest { ...@@ -627,7 +627,7 @@ public final class DashStreamingTest {
// Decoder info. // Decoder info.
@Test @Test
public void testDecoderInfoH264() throws DecoderQueryException { public void testDecoderInfoH264() throws Exception {
MediaCodecInfo decoderInfo = MediaCodecInfo decoderInfo =
MediaCodecUtil.getDecoderInfo( MediaCodecUtil.getDecoderInfo(
MimeTypes.VIDEO_H264, /* secure= */ false, /* tunneling= */ false); MimeTypes.VIDEO_H264, /* secure= */ false, /* tunneling= */ false);
...@@ -636,7 +636,7 @@ public final class DashStreamingTest { ...@@ -636,7 +636,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testDecoderInfoH265V24() throws DecoderQueryException { public void testDecoderInfoH265V24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
...@@ -649,7 +649,7 @@ public final class DashStreamingTest { ...@@ -649,7 +649,7 @@ public final class DashStreamingTest {
} }
@Test @Test
public void testDecoderInfoVP9V24() throws DecoderQueryException { public void testDecoderInfoVP9V24() throws Exception {
if (Util.SDK_INT < 24) { if (Util.SDK_INT < 24) {
// Pass. // Pass.
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment