зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1098126
- Disable MoofParser for EME; r=rillian
This commit is contained in:
Родитель
4a402212d8
Коммит
bf236b5978
|
@ -72,10 +72,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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче