Bug 1159456 - Finish and exit from Flush() even if MFTManager rejects sample. r=cpearce, a=sledru
authorKarl Tomlinson <karlt+@karlt.net>
Wed, 29 Apr 2015 04:36:13 +1200
changeset 260512 825e8ac4ab29
parent 260511 1a8cd9f5bdad
child 260513 cfa10b9f0f9d
push id805
push userryanvm@gmail.com
push date2015-05-18 17:06 +0000
treeherdermozilla-release@4bfd19d00ed4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, sledru
bugs1159456
milestone38.0.5
Bug 1159456 - Finish and exit from Flush() even if MFTManager rejects sample. r=cpearce, a=sledru
dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
--- a/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
+++ b/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
@@ -129,17 +129,17 @@ WMFMediaDataDecoder::Decode()
     HRESULT hr = mMFTManager->Input(input);
     if (FAILED(hr)) {
       NS_WARNING("MFTManager rejected sample");
       {
         MonitorAutoLock mon(mMonitor);
         PurgeInputQueue();
       }
       mCallback->Error();
-      return;
+      continue; // complete flush if flushing
     }
 
     mLastStreamOffset = input->byte_offset;
 
     ProcessOutput();
   }
 }