зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1533215 - Remove assert that can be triggered by malformed MP4. r=jya
The assert removed here can be triggered by malformed mp4s that lack certain crypto info (the sinf box), but that still indicate samples are encrypted via sample description entries. I plan to follow up the removal here by adding logs so we have some way to detect this case. This will be done as part of bug 1547328. Depends on D29692 Differential Revision: https://phabricator.services.mozilla.com/D29693 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
be7276c15c
Коммит
db3021c25c
|
@ -131,9 +131,8 @@ already_AddRefed<MediaRawData> SampleIterator::GetNext() {
|
|||
// treat it as unencrypted, even if other fragments may be encrypted.
|
||||
if (sampleDescriptionEntry->mIsEncryptedEntry) {
|
||||
if (!moofParser->mSinf.IsValid()) {
|
||||
MOZ_ASSERT_UNREACHABLE(
|
||||
"Sample description entry reports sample is encrypted, but no "
|
||||
"sinf was parsed!");
|
||||
// The sample description entry says this sample is encrypted, but we
|
||||
// don't have a relevant sinf box, this shouldn't happen, so bail.
|
||||
return nullptr;
|
||||
}
|
||||
if (moofParser->mSinf.mDefaultEncryptionType == AtomType("cenc")) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче