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

Add Matroska sample

Browse Source
This commit is contained in:
Oliver Woodman 2015-06-18 14:18:51 +01:00
parent 072c63c33e
commit 9de1bb7a01
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
View File

@ -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";

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

@ -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="