Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1304820 - use stagefright instead of rust parser when rust parser fails to parse a file. r=kinetik

Browse Source 
MozReview-Commit-ID: 8tjl9MICvWo

--HG--
extra : rebase_source : 7bb71369eb969fd762d99079dbc7f174e1f0d75e
This commit is contained in:
Alfredo.Yang 2016-09-23 14:37:07 +08:00
parent c4106a36a9
commit 849aca37da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/binding/MP4Metadata.cpp
View File

@ -340,9 +340,10 @@ bool
MP4Metadata::ReadTrackIndex(FallibleTArray<Index::Indice>& aDest, mozilla::TrackID aTrackID) MP4Metadata::ReadTrackIndex(FallibleTArray<Index::Indice>& aDest, mozilla::TrackID aTrackID)
{ {
#ifdef MOZ_RUST_MP4PARSE #ifdef MOZ_RUST_MP4PARSE
if (mRust && mPreferRust) { if (mRust && mPreferRust && mRust->ReadTrackIndex(aDest, aTrackID)) {
return mRust->ReadTrackIndex(aDest, aTrackID); return true;
} }
aDest.Clear();
#endif #endif
return mStagefright->ReadTrackIndex(aDest, aTrackID); return mStagefright->ReadTrackIndex(aDest, aTrackID);
} }
@ -839,7 +840,7 @@ MP4MetadataRust::ReadTrackIndex(FallibleTArray<Index::Indice>& aDest, mozilla::T
} }
// For non-fragmented mp4. // For non-fragmented mp4.
MOZ_ASSERT(false, "Not yet implemented"); NS_WARNING("Not yet implemented");
return false; return false;
} }