diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp index 93c0b6caad9..71dde82879d 100644 --- a/dom/media/DecoderTraits.cpp +++ b/dom/media/DecoderTraits.cpp @@ -350,16 +350,10 @@ static bool IsMP4SupportedType(const nsACString& aType, const nsAString& aCodecs = EmptyString()) { -// 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 + // MP4Decoder/Reader is currently used for MSE and mp4 files local playback. bool haveAAC, haveMP3, haveH264; return Preferences::GetBool("media.fragmented-mp4.exposed", false) && MP4Decoder::CanHandleMediaType(aType, aCodecs, haveAAC, haveH264, haveMP3); -#endif } #endif