Commit ed856b2a by Oliver Woodman

Test

parent 5e65b408
...@@ -43,11 +43,8 @@ import java.util.Locale; ...@@ -43,11 +43,8 @@ import java.util.Locale;
} }
public static final Sample[] YOUTUBE_DASH_MP4 = new Sample[] { public static final Sample[] YOUTUBE_DASH_MP4 = new Sample[] {
new Sample("Google Glass", new Sample("XXXXXXXXX",
"http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?" "http://178.33.229.111/live/mp4:Videolina/playlist.m3u8", PlayerActivity.TYPE_HLS),
+ "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("Google Play", new Sample("Google Play",
"http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?" "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&" + "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"
......
...@@ -171,7 +171,7 @@ import java.util.Collections; ...@@ -171,7 +171,7 @@ import java.util.Collections;
break; break;
case STATE_READING_HEADER: case STATE_READING_HEADER:
int targetLength = hasCrc ? HEADER_SIZE + CRC_SIZE : HEADER_SIZE; int targetLength = hasCrc ? HEADER_SIZE + CRC_SIZE : HEADER_SIZE;
if (continueRead(data, mpaScratch.getData(), targetLength)) { if (continueRead(data, mpaScratch.data, targetLength)) {
parseHeader(); parseHeader();
bytesRead = targetLength; bytesRead = targetLength;
state = STATE_READING_SAMPLE; state = STATE_READING_SAMPLE;
...@@ -287,7 +287,16 @@ import java.util.Collections; ...@@ -287,7 +287,16 @@ import java.util.Collections;
mpaScratch.setPosition(0); mpaScratch.setPosition(0);
ParsableByteArray header = new ParsableByteArray(mpaScratch.getData(),headerLength); ParsableByteArray header = new ParsableByteArray(mpaScratch.data,headerLength);
output.sampleData(header, 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
}
} }
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