mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 993003 - Ensure we abort media load if IMFSourceReader creation fails. r=padenot
This commit is contained in:
parent
ba592ad56e
commit
6e3295989a
@ -507,8 +507,7 @@ WMFReader::ReadMetadata(MediaInfo* aInfo,
|
||||
HRESULT hr;
|
||||
|
||||
const bool triedToInitDXVA = mUseHwAccel;
|
||||
hr = CreateSourceReader();
|
||||
if (FAILED(hr)) {
|
||||
if (FAILED(CreateSourceReader())) {
|
||||
mSourceReader = nullptr;
|
||||
if (triedToInitDXVA && !mUseHwAccel) {
|
||||
// We tried to initialize DXVA and failed. Try again to create the
|
||||
@ -517,14 +516,16 @@ WMFReader::ReadMetadata(MediaInfo* aInfo,
|
||||
// (AMD Radeon 3000) we cannot successfully reconfigure an existing
|
||||
// reader to not use DXVA after we've failed to configure DXVA.
|
||||
// See bug 987127.
|
||||
hr = CreateSourceReader();
|
||||
if (FAILED(hr)) {
|
||||
NS_WARNING("Failed to create IMFSourceReader");
|
||||
if (FAILED(CreateSourceReader())) {
|
||||
mSourceReader = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!mSourceReader) {
|
||||
NS_WARNING("Failed to create IMFSourceReader");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (mInfo.HasVideo()) {
|
||||
DECODER_LOG("Using DXVA: %s", (mUseHwAccel ? "Yes" : "No"));
|
||||
|
Loading…
Reference in New Issue
Block a user