sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-10 12:05:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Test

Browse source
This commit is contained in:
Oliver Woodman 2015-06-25 19:17:00 +01:00
parent 5e65b40864
commit ed856b2a71
2 changed files with 13 additions and 7 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/Samples.java
View file

@ -43,11 +43,8 @@ import java.util.Locale;
}
public static final Sample[] YOUTUBE_DASH_MP4 = new Sample[] {
new Sample("Google Glass",
"http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?"
+ "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"
+ "ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7."
+ "8506521BFC350652163895D4C26DEE124209AA9E&key=ik0", PlayerActivity.TYPE_DASH),
new Sample("XXXXXXXXX",
"http://178.33.229.111/live/mp4:Videolina/playlist.m3u8", PlayerActivity.TYPE_HLS),
new Sample("Google Play",
"http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?"
+ "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"

13
library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java
View file

@ -171,7 +171,7 @@ import java.util.Collections;
break;
case STATE_READING_HEADER:
int targetLength = hasCrc ? HEADER_SIZE + CRC_SIZE : HEADER_SIZE;
if (continueRead(data, mpaScratch.getData(), targetLength)) {
if (continueRead(data, mpaScratch.data, targetLength)) {
parseHeader();
bytesRead = targetLength;
state = STATE_READING_SAMPLE;
@ -287,7 +287,16 @@ import java.util.Collections;
mpaScratch.setPosition(0);
ParsableByteArray header = new ParsableByteArray(mpaScratch.getData(),headerLength);
ParsableByteArray header = new ParsableByteArray(mpaScratch.data,headerLength);
output.sampleData(header, headerLength);
}
/* (non-Javadoc)
* @see com.google.android.exoplayer.extractor.ts.ElementaryStreamReader#seek()
*/
@Override
public void seek() {
// TODO(olly): Auto-generated method stub
}
}