loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)", "name": "Super speed (PlayReady)",
"uri": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism", "uri": "http://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism",
"drm_scheme": "playready", "drm_scheme": "playready"
"drm_license_url": "http://playready.directtaps.net/pr/svc/rightsmanager.asmx"
} }
] ]
}, },

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