Commit 2b893853 by olly Committed by Oliver Woodman

Put all DASH gts URLs in the same place

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209752603
parent 38ea53fc
...@@ -36,12 +36,6 @@ public final class CommonEncryptionDrmTest { ...@@ -36,12 +36,6 @@ public final class CommonEncryptionDrmTest {
private static final String TAG = "CencDrmTest"; private static final String TAG = "CencDrmTest";
private static final String URL_cenc =
"https://storage.googleapis.com/exoplayer-test-media-1/gts/tears-cenc.mpd";
private static final String URL_cbc1 =
"https://storage.googleapis.com/exoplayer-test-media-1/gts/tears-aes-cbc1.mpd";
private static final String URL_cbcs =
"https://storage.googleapis.com/exoplayer-test-media-1/gts/tears-aes-cbcs.mpd";
private static final String ID_AUDIO = "0"; private static final String ID_AUDIO = "0";
private static final String[] IDS_VIDEO = new String[] {"1", "2"}; private static final String[] IDS_VIDEO = new String[] {"1", "2"};
...@@ -76,7 +70,10 @@ public final class CommonEncryptionDrmTest { ...@@ -76,7 +70,10 @@ public final class CommonEncryptionDrmTest {
// Pass. // Pass.
return; return;
} }
testRunner.setStreamName("test_widevine_h264_scheme_cenc").setManifestUrl(URL_cenc).run(); testRunner
.setStreamName("test_widevine_h264_scheme_cenc")
.setManifestUrl(DashTestData.WIDEVINE_SCHEME_CENC)
.run();
} }
@Test @Test
...@@ -87,7 +84,10 @@ public final class CommonEncryptionDrmTest { ...@@ -87,7 +84,10 @@ public final class CommonEncryptionDrmTest {
// Pass. // Pass.
return; return;
} }
testRunner.setStreamName("test_widevine_h264_scheme_cbc1").setManifestUrl(URL_cbc1).run(); testRunner
.setStreamName("test_widevine_h264_scheme_cbc1")
.setManifestUrl(DashTestData.WIDEVINE_SCHEME_CBC1)
.run();
} }
@Test @Test
...@@ -98,7 +98,10 @@ public final class CommonEncryptionDrmTest { ...@@ -98,7 +98,10 @@ public final class CommonEncryptionDrmTest {
// Pass. // Pass.
return; return;
} }
testRunner.setStreamName("test_widevine_h264_scheme_cbcs").setManifestUrl(URL_cbcs).run(); testRunner
.setStreamName("test_widevine_h264_scheme_cbcs")
.setManifestUrl(DashTestData.WIDEVINE_SCHEME_CBCS)
.run();
} }
@Test @Test
......
...@@ -22,22 +22,35 @@ import com.google.android.exoplayer2.util.Util; ...@@ -22,22 +22,35 @@ import com.google.android.exoplayer2.util.Util;
*/ */
public final class DashTestData { public final class DashTestData {
private static final String BASE_URL = "https://storage.googleapis.com/exoplayer-test-media-1/" private static final String BASE_URL =
+ "gen-4/screens/dash-vod-single-segment/"; "https://storage.googleapis.com/exoplayer-test-media-1/gen-4/";
private static final String BASE_URL_SCREENS = BASE_URL + "screens/dash-vod-single-segment/";
private static final String BASE_URL_COMMON_ENCRYPTION = BASE_URL + "common-encryption/";
// Clear content manifests. // Clear content manifests.
public static final String H264_MANIFEST = BASE_URL + "manifest-h264.mpd"; public static final String H264_MANIFEST = BASE_URL_SCREENS + "manifest-h264.mpd";
public static final String H265_MANIFEST = BASE_URL + "manifest-h265.mpd"; public static final String H265_MANIFEST = BASE_URL_SCREENS + "manifest-h265.mpd";
public static final String VP9_MANIFEST = BASE_URL + "manifest-vp9.mpd"; public static final String VP9_MANIFEST = BASE_URL_SCREENS + "manifest-vp9.mpd";
public static final String H264_23_MANIFEST = BASE_URL + "manifest-h264-23.mpd"; public static final String H264_23_MANIFEST = BASE_URL_SCREENS + "manifest-h264-23.mpd";
public static final String H264_24_MANIFEST = BASE_URL + "manifest-h264-24.mpd"; public static final String H264_24_MANIFEST = BASE_URL_SCREENS + "manifest-h264-24.mpd";
public static final String H264_29_MANIFEST = BASE_URL + "manifest-h264-29.mpd"; public static final String H264_29_MANIFEST = BASE_URL_SCREENS + "manifest-h264-29.mpd";
// Widevine encrypted content manifests. // Widevine encrypted content manifests.
public static final String WIDEVINE_H264_MANIFEST = BASE_URL + "manifest-h264-enc.mpd"; public static final String WIDEVINE_H264_MANIFEST = BASE_URL_SCREENS + "manifest-h264-enc.mpd";
public static final String WIDEVINE_H265_MANIFEST = BASE_URL + "manifest-h265-enc.mpd"; public static final String WIDEVINE_H265_MANIFEST = BASE_URL_SCREENS + "manifest-h265-enc.mpd";
public static final String WIDEVINE_VP9_MANIFEST = BASE_URL + "manifest-vp9-enc.mpd"; public static final String WIDEVINE_VP9_MANIFEST = BASE_URL_SCREENS + "manifest-vp9-enc.mpd";
public static final String WIDEVINE_H264_23_MANIFEST = BASE_URL + "manifest-h264-23-enc.mpd"; public static final String WIDEVINE_H264_23_MANIFEST =
public static final String WIDEVINE_H264_24_MANIFEST = BASE_URL + "manifest-h264-24-enc.mpd"; BASE_URL_SCREENS + "manifest-h264-23-enc.mpd";
public static final String WIDEVINE_H264_29_MANIFEST = BASE_URL + "manifest-h264-29-enc.mpd"; public static final String WIDEVINE_H264_24_MANIFEST =
BASE_URL_SCREENS + "manifest-h264-24-enc.mpd";
public static final String WIDEVINE_H264_29_MANIFEST =
BASE_URL_SCREENS + "manifest-h264-29-enc.mpd";
// Widevine encrypted content manifests using different common encryption schemes.
public static final String WIDEVINE_SCHEME_CENC = BASE_URL_COMMON_ENCRYPTION + "tears-cenc.mpd";
public static final String WIDEVINE_SCHEME_CBC1 =
BASE_URL_COMMON_ENCRYPTION + "tears-aes-cbc1.mpd";
public static final String WIDEVINE_SCHEME_CBCS =
BASE_URL_COMMON_ENCRYPTION + "tears-aes-cbcs.mpd";
public static final String AAC_AUDIO_REPRESENTATION_ID = "141"; public static final String AAC_AUDIO_REPRESENTATION_ID = "141";
public static final String H264_BASELINE_240P_VIDEO_REPRESENTATION_ID = "avc-baseline-240"; public static final String H264_BASELINE_240P_VIDEO_REPRESENTATION_ID = "avc-baseline-240";
......
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