From 15aad266b6cab6c7ec8f69972d90f7ae1ec024fc Mon Sep 17 00:00:00 2001 From: mishragaurav Date: Fri, 10 Mar 2017 09:15:10 -0800 Subject: [PATCH] Use separate Widevine license keys to package test audio for Exoplayer GTS. Android doesn't support secure decoding for audio. Hence use Audio keys that always require L3 support only. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=149764063 --- .../exoplayer2/playbacktests/gts/DashHostedTest.java | 7 ++++--- .../exoplayer2/playbacktests/gts/DashTestData.java | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashHostedTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashHostedTest.java index 24765f282d..1cc220ba0a 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashHostedTest.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashHostedTest.java @@ -178,10 +178,11 @@ public final class DashHostedTest extends ExoHostedTest { private static final float MAX_DROPPED_VIDEO_FRAME_FRACTION = 0.01f; private static final String MANIFEST_URL_PREFIX = "https://storage.googleapis.com/exoplayer-test-" - + "media-1/gen-3/screens/dash-vod-single-segment/"; + + "media-1/gen-4/screens/dash-vod-single-segment/"; - private static final String WIDEVINE_L1_SUFFIX = "-hw.mpd"; - private static final String WIDEVINE_L3_SUFFIX = "-sw.mpd"; + // TODO: Don't need separate suffixes. Clean up. + private static final String WIDEVINE_L1_SUFFIX = ".mpd"; + private static final String WIDEVINE_L3_SUFFIX = ".mpd"; private static final String WIDEVINE_LICENSE_URL = "https://proxy.uat.widevine.com/proxy?provider=widevine_test&video_id="; diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java index c95614bc87..ecb78c6c55 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestData.java @@ -88,10 +88,10 @@ public final class DashTestData { // Widevine encrypted content representation ids. public static final String WIDEVINE_AAC_AUDIO_REPRESENTATION_ID = "0"; - public static final String WIDEVINE_H264_BASELINE_240P_VIDEO_REPRESENTATION_ID = "1"; - public static final String WIDEVINE_H264_BASELINE_480P_VIDEO_REPRESENTATION_ID = "2"; - public static final String WIDEVINE_H264_MAIN_240P_VIDEO_REPRESENTATION_ID = "3"; - public static final String WIDEVINE_H264_MAIN_480P_VIDEO_REPRESENTATION_ID = "4"; + public static final String WIDEVINE_H264_BASELINE_240P_VIDEO_REPRESENTATION_ID = "2"; + public static final String WIDEVINE_H264_BASELINE_480P_VIDEO_REPRESENTATION_ID = "3"; + public static final String WIDEVINE_H264_MAIN_240P_VIDEO_REPRESENTATION_ID = "4"; + public static final String WIDEVINE_H264_MAIN_480P_VIDEO_REPRESENTATION_ID = "5"; // The highest quality H264 format mandated by the Android CDD. public static final String WIDEVINE_H264_CDD_FIXED = Util.SDK_INT < 23 ? WIDEVINE_H264_BASELINE_480P_VIDEO_REPRESENTATION_ID @@ -113,8 +113,8 @@ public final class DashTestData { public static final String WIDEVINE_H264_BASELINE_480P_24FPS_VIDEO_REPRESENTATION_ID = "2"; public static final String WIDEVINE_H264_BASELINE_480P_29FPS_VIDEO_REPRESENTATION_ID = "2"; - public static final String WIDEVINE_H265_BASELINE_288P_VIDEO_REPRESENTATION_ID = "1"; - public static final String WIDEVINE_H265_BASELINE_360P_VIDEO_REPRESENTATION_ID = "2"; + public static final String WIDEVINE_H265_BASELINE_288P_VIDEO_REPRESENTATION_ID = "2"; + public static final String WIDEVINE_H265_BASELINE_360P_VIDEO_REPRESENTATION_ID = "3"; // The highest quality H265 format mandated by the Android CDD. public static final String WIDEVINE_H265_CDD_FIXED = WIDEVINE_H265_BASELINE_360P_VIDEO_REPRESENTATION_ID;