From 9de1bb7a0118db4ce3cdca1538ef5788b5b07503 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Thu, 18 Jun 2015 14:18:51 +0100 Subject: [PATCH] Add Matroska sample --- .../com/google/android/exoplayer/demo/PlayerActivity.java | 7 ++++--- .../java/com/google/android/exoplayer/demo/Samples.java | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java index aaf85ab1ba..0a0d19a2ce 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java @@ -87,9 +87,10 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, public static final int TYPE_MP3 = 4; public static final int TYPE_FMP4 = 5; public static final int TYPE_WEBM = 6; - public static final int TYPE_TS = 7; - public static final int TYPE_AAC = 8; - public static final int TYPE_M4A = 9; + public static final int TYPE_MKV = 7; + public static final int TYPE_TS = 8; + public static final int TYPE_AAC = 9; + public static final int TYPE_M4A = 10; public static final String CONTENT_TYPE_EXTRA = "content_type"; public static final String CONTENT_ID_EXTRA = "content_id"; 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 58184bcd8e..551513161f 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 @@ -136,6 +136,8 @@ import java.util.Locale; new Sample("Apple TS 10s", "https://devimages.apple.com.edgekey.net/streaming/examples/" + "bipbop_4x3/gear1/fileSequence0.ts", PlayerActivity.TYPE_TS), + new Sample("Android screens (Matroska)", "http://storage.googleapis.com/exoplayer-test-media-1/" + + "mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv", PlayerActivity.TYPE_MKV), new Sample("Big Buck Bunny (MP4 Video)", "http://redirector.c.youtube.com/videoplayback?id=604ed5ce52eda7ee&itag=22&source=youtube&" + "sparams=ip,ipbits,expire,source,id&ip=0.0.0.0&ipbits=0&expire=19000000000&signature="