From ed856b2a71ab4c1c1ef76d0e790aac6e6ba9ac84 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Thu, 25 Jun 2015 19:17:00 +0100 Subject: [PATCH] Test --- .../com/google/android/exoplayer/demo/Samples.java | 7 ++----- .../android/exoplayer/extractor/ts/MpaReader.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java index 551513161f..8d46bbbfae 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java @@ -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&" diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java index 2131f2f7a5..6314d4c322 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java @@ -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 + + } }