loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Widevine VP9 samples

Browse Source
This commit is contained in:
Oliver Woodman 2015-10-30 11:58:36 +00:00
parent c53495e7e2
commit 2cb6db2b42
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java
View File

@ -63,13 +63,16 @@ public class SampleChooserActivity extends Activity {
sampleAdapter.addAll((Object[]) Samples.WIDEVINE_GTS); sampleAdapter.addAll((Object[]) Samples.WIDEVINE_GTS);
sampleAdapter.add(new Header("Widevine DASH")); sampleAdapter.add(new Header("Widevine DASH"));
sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_MP4); sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_MP4);
// try { try {
// if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, true) != null) { if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false) != null) {
// sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_WEBM); sampleAdapter.addAll((Object[]) Samples.WIDEVINE_VP9_WEBM_CLEAR);
// } }
// } catch (DecoderQueryException e) { if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, true) != null) {
// Log.e(TAG, "Failed to query vp9 decoder", e); sampleAdapter.addAll((Object[]) Samples.WIDEVINE_VP9_WEBM_SECURE);
// } }
} catch (DecoderQueryException e) {
Log.e(TAG, "Failed to query vp9 decoder", e);
}
sampleAdapter.add(new Header("SmoothStreaming")); sampleAdapter.add(new Header("SmoothStreaming"));
sampleAdapter.addAll((Object[]) Samples.SMOOTHSTREAMING); sampleAdapter.addAll((Object[]) Samples.SMOOTHSTREAMING);
sampleAdapter.add(new Header("HLS")); sampleAdapter.add(new Header("HLS"));

8
demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
View File

@ -105,7 +105,13 @@ import java.util.Locale;
PlayerActivity.TYPE_DASH), PlayerActivity.TYPE_DASH),
}; };
public static final Sample[] WIDEVINE_DASH_WEBM = new Sample[] { public static final Sample[] WIDEVINE_VP9_WEBM_CLEAR = new Sample[] {
new Sample("WV: Clear (WebM,VP9)",
"https://storage.googleapis.com/wvmedia/clear/vp9/sintel-multicodec-4k/sintel-vp9.mpd",
PlayerActivity.TYPE_DASH),
};
public static final Sample[] WIDEVINE_VP9_WEBM_SECURE = new Sample[] {
new Sample("WV: Secure (WebM,VP9)", "01234567", "widevine_test", new Sample("WV: Secure (WebM,VP9)", "01234567", "widevine_test",
"https://storage.googleapis.com/wvmedia/cenc/vp9/sintel-multicodec-4k/sintel-vp9.mpd", "https://storage.googleapis.com/wvmedia/cenc/vp9/sintel-multicodec-4k/sintel-vp9.mpd",
PlayerActivity.TYPE_DASH), PlayerActivity.TYPE_DASH),