From 6fb5052d2fb6208fd56d5ade55a5f45d0bfa34d9 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 26 Oct 2015 15:53:29 +0000 Subject: [PATCH] Fix vp9 samples --- .../android/exoplayer/demo/SampleChooserActivity.java | 11 +++++++++++ .../com/google/android/exoplayer/demo/Samples.java | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java index e830f648e3..ca41495820 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java @@ -15,13 +15,17 @@ */ package com.google.android.exoplayer.demo; +import com.google.android.exoplayer.MediaCodecUtil; +import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; import com.google.android.exoplayer.demo.Samples.Sample; +import com.google.android.exoplayer.util.MimeTypes; import android.app.Activity; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -48,6 +52,13 @@ public class SampleChooserActivity extends Activity { sampleAdapter.add(new Header("YouTube DASH")); sampleAdapter.addAll((Object[]) Samples.YOUTUBE_DASH_MP4); + try { + if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false) != null) { + sampleAdapter.addAll((Object[]) Samples.YOUTUBE_DASH_WEBM); + } + } catch (DecoderQueryException e) { + Log.e(TAG, "Failed to query vp9 decoder", e); + } sampleAdapter.add(new Header("Widevine DASH Policy Tests (GTS)")); sampleAdapter.addAll((Object[]) Samples.WIDEVINE_GTS); sampleAdapter.add(new Header("Widevine DASH")); diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java index 3f95d400f1..0162e043aa 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java @@ -45,12 +45,12 @@ import java.util.Locale; } public static final Sample[] YOUTUBE_DASH_MP4 = new Sample[] { - new Sample("Google Glass", + new Sample("Google Glass (MP4,H264)", "http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?" + "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&" + "ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7." + "8506521BFC350652163895D4C26DEE124209AA9E&key=ik0", PlayerActivity.TYPE_DASH), - new Sample("Google Play", + new Sample("Google Play (MP4,H264)", "http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?" + "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&" + "ipbits=0&expire=19000000000&signature=A2716F75795F5D2AF0E88962FFCD10DB79384F29." @@ -58,12 +58,12 @@ import java.util.Locale; }; public static final Sample[] YOUTUBE_DASH_WEBM = new Sample[] { - new Sample("Google Glass", + new Sample("Google Glass (WebM,VP9)", "http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?" + "as=fmp4_audio_clear,webm2_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&" + "ipbits=0&expire=19000000000&signature=249B04F79E984D7F86B4D8DB48AE6FAF41C17AB3." + "7B9F0EC0505E1566E59B8E488E9419F253DDF413&key=ik0", PlayerActivity.TYPE_DASH), - new Sample("Google Play", + new Sample("Google Play (WebM,VP9)", "http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?" + "as=fmp4_audio_clear,webm2_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&" + "ipbits=0&expire=19000000000&signature=B1C2A74783AC1CC4865EB312D7DD2D48230CC9FD."