loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-04 22:20:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak DashTest VP9 constants.

Browse Source 
This is a no-op change that just makes the definitions consistent
with the H264 ones, for general neatness/consistency reasons.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=109892547
This commit is contained in:
olly 2015-12-10 06:31:28 -08:00 committed by Oliver Woodman
parent 0b0baa28be
commit f37fcddfb0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
playbacktests/src/main/java/com/google/android/exoplayer/playbacktests/gts/DashTest.java
View File

@ -101,6 +101,13 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
private static final String VORBIS_AUDIO_REPRESENTATION_ID = "2"; private static final String VORBIS_AUDIO_REPRESENTATION_ID = "2";
private static final String VP9_180P_VIDEO_REPRESENTATION_ID = "0"; private static final String VP9_180P_VIDEO_REPRESENTATION_ID = "0";
private static final String VP9_360P_VIDEO_REPRESENTATION_ID = "1"; private static final String VP9_360P_VIDEO_REPRESENTATION_ID = "1";
// The highest quality VP9 format mandated by the Android CDD.
private static final String VP9_CDD_FIXED = VP9_360P_VIDEO_REPRESENTATION_ID;
// Multiple VP9 formats mandated by the Android CDD.
private static final String[] VP9_CDD_ADAPTIVE =
new String[] {
VP9_180P_VIDEO_REPRESENTATION_ID,
VP9_360P_VIDEO_REPRESENTATION_ID};
// Whether adaptive tests should enable video formats beyond those mandated by the Android CDD // Whether adaptive tests should enable video formats beyond those mandated by the Android CDD
// if the device advertises support for them. // if the device advertises support for them.
@ -196,7 +203,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
return; return;
} }
testDashPlayback(getActivity(), VORBIS_AUDIO_FRAME_COUNT, VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST, testDashPlayback(getActivity(), VORBIS_AUDIO_FRAME_COUNT, VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST,
VORBIS_AUDIO_REPRESENTATION_ID, false, VP9_360P_VIDEO_REPRESENTATION_ID); VORBIS_AUDIO_REPRESENTATION_ID, false, VP9_CDD_FIXED);
} }
public void testVp9Adaptive() throws IOException { public void testVp9Adaptive() throws IOException {
@ -205,8 +212,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
return; return;
} }
testDashPlayback(getActivity(), VORBIS_AUDIO_FRAME_COUNT, VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST, testDashPlayback(getActivity(), VORBIS_AUDIO_FRAME_COUNT, VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST,
VORBIS_AUDIO_REPRESENTATION_ID, ALLOW_ADDITIONAL_VIDEO_FORMATS, VORBIS_AUDIO_REPRESENTATION_ID, ALLOW_ADDITIONAL_VIDEO_FORMATS, VP9_CDD_ADAPTIVE);
VP9_180P_VIDEO_REPRESENTATION_ID, VP9_360P_VIDEO_REPRESENTATION_ID);
} }
public void testVp9AdaptiveWithSeeking() throws IOException { public void testVp9AdaptiveWithSeeking() throws IOException {
@ -216,8 +222,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
} }
testDashPlayback(getActivity(), SEEKING_SCHEDULE, false, VORBIS_AUDIO_FRAME_COUNT, testDashPlayback(getActivity(), SEEKING_SCHEDULE, false, VORBIS_AUDIO_FRAME_COUNT,
VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST, VORBIS_AUDIO_REPRESENTATION_ID, VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST, VORBIS_AUDIO_REPRESENTATION_ID,
ALLOW_ADDITIONAL_VIDEO_FORMATS, VP9_180P_VIDEO_REPRESENTATION_ID, ALLOW_ADDITIONAL_VIDEO_FORMATS, VP9_CDD_ADAPTIVE);
VP9_360P_VIDEO_REPRESENTATION_ID);
} }
public void testVp9AdaptiveWithRendererDisabling() throws IOException { public void testVp9AdaptiveWithRendererDisabling() throws IOException {
@ -227,8 +232,7 @@ public final class DashTest extends ActivityInstrumentationTestCase2<HostActivit
} }
testDashPlayback(getActivity(), RENDERER_DISABLING_SCHEDULE, false, VORBIS_AUDIO_FRAME_COUNT, testDashPlayback(getActivity(), RENDERER_DISABLING_SCHEDULE, false, VORBIS_AUDIO_FRAME_COUNT,
VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST, VORBIS_AUDIO_REPRESENTATION_ID, VP9_VIDEO_FRAME_COUNT, VP9_MANIFEST, VORBIS_AUDIO_REPRESENTATION_ID,
ALLOW_ADDITIONAL_VIDEO_FORMATS, VP9_180P_VIDEO_REPRESENTATION_ID, ALLOW_ADDITIONAL_VIDEO_FORMATS, VP9_CDD_ADAPTIVE);
VP9_360P_VIDEO_REPRESENTATION_ID);
} }
// Internal. // Internal.