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

Fix widevine samples

Browse Source
This commit is contained in:
Oliver Woodman 2015-10-26 15:52:36 +00:00
parent 195c0c8884
commit 22a302c28e
1 changed files with 1 additions and 16 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

@ -15,17 +15,13 @@
*/ */
package com.google.android.exoplayer.demo; 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.demo.Samples.Sample;
import com.google.android.exoplayer.util.MimeTypes;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -56,19 +52,8 @@ 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 {
if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false) != null) {
sampleAdapter.addAll((Object[]) Samples.WIDEVINE_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"));
sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_MP4);
// try { // try {
// if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false) != null) { // if (MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, true) != null) {
// sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_WEBM); // sampleAdapter.addAll((Object[]) Samples.WIDEVINE_DASH_WEBM);
// } // }
// } catch (DecoderQueryException e) { // } catch (DecoderQueryException e) {