From 2a15480102e753ae33bf4ef05da2853dd79b31f7 Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 10 Aug 2016 04:22:26 -0700 Subject: [PATCH] Fix SmoothStreaming ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129851843 --- .../source/chunk/ChunkExtractorWrapper.java | 12 ------------ .../source/smoothstreaming/DefaultSsChunkSource.java | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java index dfeb727f14..e14daf0d20 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java @@ -59,18 +59,6 @@ public final class ChunkExtractorWrapper implements ExtractorOutput, TrackOutput // Accessed only on the loader thread. private boolean seenTrack; - /** - * @param extractor The extractor to wrap. - * @param manifestFormat A manifest defined {@link Format} whose data should be merged into any - * sample {@link Format} output from the {@link Extractor}. - * @param preferManifestDrmInitData Whether {@link DrmInitData} defined in {@code manifestFormat} - * should be preferred when the sample and manifest {@link Format}s are merged. - */ - public ChunkExtractorWrapper(Extractor extractor, Format manifestFormat, - boolean preferManifestDrmInitData) { - this(extractor, manifestFormat, preferManifestDrmInitData, true); - } - /** * @param extractor The extractor to wrap. * @param manifestFormat A manifest defined {@link Format} whose data should be merged into any diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java index 727e89a820..f0adb8c44a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java @@ -94,7 +94,7 @@ public class DefaultSsChunkSource implements SsChunkSource { extractorWrappers = new ChunkExtractorWrapper[trackSelection.length()]; for (int i = 0; i < extractorWrappers.length; i++) { int manifestTrackIndex = trackSelection.getIndexInTrackGroup(i); - Format format = streamElement.formats[i]; + Format format = streamElement.formats[manifestTrackIndex]; int nalUnitLengthFieldLength = streamElement.type == C.TRACK_TYPE_VIDEO ? 4 : -1; Track track = new Track(manifestTrackIndex, streamElement.type, streamElement.timescale, C.UNSET_TIME_US, manifest.durationUs, format, Track.TRANSFORMATION_NONE, @@ -102,7 +102,7 @@ public class DefaultSsChunkSource implements SsChunkSource { FragmentedMp4Extractor extractor = new FragmentedMp4Extractor( FragmentedMp4Extractor.FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME | FragmentedMp4Extractor.FLAG_WORKAROUND_IGNORE_TFDT_BOX, track); - extractorWrappers[i] = new ChunkExtractorWrapper(extractor, format, false); + extractorWrappers[i] = new ChunkExtractorWrapper(extractor, format, false, false); } }