Skip to content

SDK / exoplayer

Go to a project
Commit 9de1bb7a by Oliver Woodman
Options

Add Matroska sample

parent 072c63c3
Inline Side-by-side
Showing with 6 additions and 3 deletions
demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
...@@ -87,9 +87,10 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, ...@@ -87,9 +87,10 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
public static final int TYPE_MP3 = 4; public static final int TYPE_MP3 = 4;
public static final int TYPE_FMP4 = 5; public static final int TYPE_FMP4 = 5;
public static final int TYPE_WEBM = 6; public static final int TYPE_WEBM = 6;
public static final int TYPE_TS = 7; public static final int TYPE_MKV = 7;
public static final int TYPE_AAC = 8; public static final int TYPE_TS = 8;
public static final int TYPE_M4A = 9; 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_TYPE_EXTRA = "content_type";
public static final String CONTENT_ID_EXTRA = "content_id"; public static final String CONTENT_ID_EXTRA = "content_id";
......
demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
...@@ -136,6 +136,8 @@ import java.util.Locale; ...@@ -136,6 +136,8 @@ import java.util.Locale;
new Sample("Apple TS 10s", "https://devimages.apple.com.edgekey.net/streaming/examples/" new Sample("Apple TS 10s", "https://devimages.apple.com.edgekey.net/streaming/examples/"
+ "bipbop_4x3/gear1/fileSequence0.ts", + "bipbop_4x3/gear1/fileSequence0.ts",
PlayerActivity.TYPE_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)", new Sample("Big Buck Bunny (MP4 Video)",
"http://redirector.c.youtube.com/videoplayback?id=604ed5ce52eda7ee&itag=22&source=youtube&" "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=" + "sparams=ip,ipbits,expire,source,id&ip=0.0.0.0&ipbits=0&expire=19000000000&signature="
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment