mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
Bug 1165802 - backout 3f28c4380901 in bug 1162364 that causes media mochitests timeouts. r=karlt
This commit is contained in:
parent
7f51884ce9
commit
3d5ee73bae
@ -205,7 +205,6 @@ WMFAudioMFTManager::Output(int64_t aStreamOffset,
|
||||
aOutData = nullptr;
|
||||
RefPtr<IMFSample> sample;
|
||||
HRESULT hr;
|
||||
bool alreadyDidTypeChange = false;
|
||||
while (true) {
|
||||
hr = mDecoder->Output(&sample);
|
||||
if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
|
||||
@ -214,8 +213,6 @@ WMFAudioMFTManager::Output(int64_t aStreamOffset,
|
||||
if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
|
||||
hr = UpdateOutputType();
|
||||
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
|
||||
NS_ENSURE_FALSE(alreadyDidTypeChange, MF_E_TRANSFORM_STREAM_CHANGE);
|
||||
alreadyDidTypeChange = true;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
|
@ -482,7 +482,6 @@ WMFVideoMFTManager::Output(int64_t aStreamOffset,
|
||||
RefPtr<IMFSample> sample;
|
||||
HRESULT hr;
|
||||
aOutData = nullptr;
|
||||
bool alreadyDidTypeChange = false;
|
||||
|
||||
// Loop until we decode a sample, or an unexpected error that we can't
|
||||
// handle occurs.
|
||||
@ -498,9 +497,7 @@ WMFVideoMFTManager::Output(int64_t aStreamOffset,
|
||||
MOZ_ASSERT(!sample);
|
||||
hr = ConfigureVideoFrameGeometry();
|
||||
NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
|
||||
NS_ENSURE_FALSE(alreadyDidTypeChange, MF_E_TRANSFORM_STREAM_CHANGE);
|
||||
// Loop back and try decoding again...
|
||||
alreadyDidTypeChange = true;
|
||||
continue;
|
||||
}
|
||||
if (SUCCEEDED(hr)) {
|
||||
|
Loading…
Reference in New Issue
Block a user