From bf236b5978eba7fb0e5a4fb17895dd09cbd63d05 Mon Sep 17 00:00:00 2001 From: Anthony Jones Date: Fri, 5 Dec 2014 14:17:23 -0800 Subject: [PATCH] Bug 1098126 - Disable MoofParser for EME; r=rillian --- media/libstagefright/binding/MoofParser.cpp | 4 +--- media/libstagefright/binding/mp4_demuxer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp index 1eba8032978e..1b13729b202e 100644 --- a/media/libstagefright/binding/MoofParser.cpp +++ b/media/libstagefright/binding/MoofParser.cpp @@ -72,10 +72,8 @@ bool MoofParser::BlockingReadNextMoof() { nsTArray byteRanges; - int64_t size; - bool hasSize = mSource->Length(&size); byteRanges.AppendElement( - MediaByteRange(0,hasSize ? size : std::numeric_limits::max())); + MediaByteRange(0, std::numeric_limits::max())); mp4_demuxer::BlockingStream* stream = new BlockingStream(mSource); BoxContext context(stream, byteRanges); diff --git a/media/libstagefright/binding/mp4_demuxer.cpp b/media/libstagefright/binding/mp4_demuxer.cpp index 2d13d09e8546..6a39719b58e6 100644 --- a/media/libstagefright/binding/mp4_demuxer.cpp +++ b/media/libstagefright/binding/mp4_demuxer.cpp @@ -111,7 +111,7 @@ MP4Demuxer::Init() nsRefPtr index = new Index(mPrivate->mAudio->exportIndex(), mSource, mAudioConfig.mTrackId); mPrivate->mIndexes.AppendElement(index); - if (index->IsFragmented()) { + if (index->IsFragmented() && !mAudioConfig.crypto.valid) { mPrivate->mAudioIterator = new SampleIterator(index); } } else if (!mPrivate->mVideo.get() && !strncmp(mimeType, "video/", 6)) { @@ -124,7 +124,7 @@ MP4Demuxer::Init() nsRefPtr index = new Index(mPrivate->mVideo->exportIndex(), mSource, mVideoConfig.mTrackId); mPrivate->mIndexes.AppendElement(index); - if (index->IsFragmented()) { + if (index->IsFragmented() && !mVideoConfig.crypto.valid) { mPrivate->mVideoIterator = new SampleIterator(index); } }