Bug 1301059: Do not use H264Converter when video decode is suspended. r?kaku draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 07 Sep 2016 23:59:59 +1000
changeset 411038 cce44501d640c8088865ebb65d0e35477fc96275
parent 411037 3312d94aae12a379062f680a1fad7e58d8d7e570
child 411039 2a721aecad32eebc8de649bd13dd1fe4179088ad
push id28822
push userbmo:jyavenard@mozilla.com
push dateWed, 07 Sep 2016 14:02:29 +0000
reviewerskaku
bugs1301059
milestone51.0a1
Bug 1301059: Do not use H264Converter when video decode is suspended. r?kaku MozReview-Commit-ID: FWvn3Xkalsl
dom/media/platforms/PDMFactory.cpp
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -262,17 +262,17 @@ PDMFactory::CreateDecoderWithPDM(Platfor
       TimeDuration::FromMilliseconds(MediaPrefs::PDMFuzzingInterval()));
     callbackWrapper->SetDontDelayInputExhausted(!MediaPrefs::PDMFuzzingDelayInputExhausted());
     callback = callbackWrapper.get();
   }
 
   CreateDecoderParams params = aParams;
   params.mCallback = callback;
 
-  if (MP4Decoder::IsH264(config.mMimeType)) {
+  if (MP4Decoder::IsH264(config.mMimeType) && !aParams.mUseBlankDecoder) {
     RefPtr<H264Converter> h = new H264Converter(aPDM, params);
     const nsresult rv = h->GetLastError();
     if (NS_SUCCEEDED(rv) || rv == NS_ERROR_NOT_INITIALIZED) {
       // The H264Converter either successfully created the wrapped decoder,
       // or there wasn't enough AVCC data to do so. Otherwise, there was some
       // problem, for example WMF DLLs were missing.
       m = h.forget();
     }