sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-26 09:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename media samples asset

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=131693969
This commit is contained in:
olly 2016-08-30 04:06:18 -07:00 committed by Oliver Woodman
parent 98919fe709
commit dfad7451ca
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
demo/src/main/assets/sample_media.exolist.json → demo/src/main/assets/media.exolist.json
View file

@ -287,8 +287,7 @@
{
"name": "Super speed (PlayReady)",
"uri": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism",
"drm_scheme": "playready",
"drm_license_url": "http://playready.directtaps.net/pr/svc/rightsmanager.asmx"
"drm_scheme": "playready"
}
]
},

10
demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
View file

@ -64,7 +64,7 @@ public class SampleChooserActivity extends Activity {
uris = new String[] {dataUri};
} else {
uris = new String[] {
"asset:///sample_media.exolist.json",
"asset:///media.exolist.json",
};
}
SampleListLoader loaderTask = new SampleListLoader();
@ -136,7 +136,8 @@ public class SampleChooserActivity extends Activity {
reader.beginObject();
while (reader.hasNext()) {
switch (reader.nextName()) {
String name = reader.nextName();
switch (name) {
case "name":
groupName = reader.nextString();
break;
@ -147,6 +148,11 @@ public class SampleChooserActivity extends Activity {
}
reader.endArray();
break;
case "_comment":
reader.nextString(); // Ignore.
break;
default:
throw new ParserException("Unsupported name: " + name);
}
}
reader.endObject();