Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-07 11:56:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1098126 - Disable MoofParser for EME; r=rillian

Browse Source
This commit is contained in:
Anthony Jones 2014-12-05 14:01:44 -08:00
parent 03b7ea76e0
commit 4117cec7b0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/libstagefright/binding/MoofParser.cpp
View File

@ -4,6 +4,7 @@
#include "mp4_demuxer/MoofParser.h"
#include "mp4_demuxer/Box.h"
#include <limits>
namespace mp4_demuxer
{
@ -72,10 +73,8 @@ bool
MoofParser::BlockingReadNextMoof()
{
nsTArray<MediaByteRange> byteRanges;
int64_t size;
bool hasSize = mSource->Length(&size);
byteRanges.AppendElement(
MediaByteRange(0,hasSize ? size : std::numeric_limits<int64_t>::max()));
MediaByteRange(0, std::numeric_limits<int64_t>::max()));
mp4_demuxer::BlockingStream* stream = new BlockingStream(mSource);
BoxContext context(stream, byteRanges);

4
media/libstagefright/binding/mp4_demuxer.cpp
View File

@ -111,7 +111,7 @@ MP4Demuxer::Init()
nsRefPtr<Index> 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> 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);
}
}