wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset a9a186400dd8 (bug 1146729) for being the likely cause of breaking ICS debug m-13 permared

Browse Source
This commit is contained in:
Wes Kocher 2015-04-03 13:09:56 -07:00
parent 708e77ce5f
commit ec07ea8a29
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/DecoderTraits.cpp
View File

@ -350,10 +350,16 @@ static bool
IsMP4SupportedType(const nsACString& aType, IsMP4SupportedType(const nsACString& aType,
const nsAString& aCodecs = EmptyString()) const nsAString& aCodecs = EmptyString())
{ {
// MP4Decoder/Reader is currently used for MSE and mp4 files local playback. // Currently on B2G, FMP4 is only working for MSE playback.
// For other normal MP4, it still uses current omx decoder.
// Bug 1061034 is a follow-up bug to enable all MP4s with MOZ_FMP4
#ifdef MOZ_OMX_DECODER
return false;
#else
bool haveAAC, haveMP3, haveH264; bool haveAAC, haveMP3, haveH264;
return Preferences::GetBool("media.fragmented-mp4.exposed", false) && return Preferences::GetBool("media.fragmented-mp4.exposed", false) &&
MP4Decoder::CanHandleMediaType(aType, aCodecs, haveAAC, haveH264, haveMP3); MP4Decoder::CanHandleMediaType(aType, aCodecs, haveAAC, haveH264, haveMP3);
#endif
} }
#endif #endif