N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

audio_core: hle: mf: avoid name conflicts

Browse source
This commit is contained in:
liushuyu 2019-01-28 23:36:24 -07:00 committed by B3N30
parent 452ac7b874
commit 633f02b9b2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/audio_core/hle/wmf_decoder.cpp
View file

@ -215,7 +215,7 @@ std::optional<BinaryResponse> WMFDecoder::Impl::Decode(const BinaryRequest& requ
// if the decode issues are caused by MFT not accepting new samples, try again // if the decode issues are caused by MFT not accepting new samples, try again
// NOTICE: you are required to check the output even if you already knew/guessed // NOTICE: you are required to check the output even if you already knew/guessed
// MFT didn't accept the input sample // MFT didn't accept the input sample
if (input_status == TRY_AGAIN) { if (input_status == NOT_ACCEPTED) {
// try again // try again
continue; continue;
} }

2
src/audio_core/hle/wmf_decoder_utils.cpp
View file

@ -250,7 +250,7 @@ MFInputState SendSample(IMFTransform* transform, DWORD in_stream_id, IMFSample*
if (in_sample) { if (in_sample) {
hr = transform->ProcessInput(in_stream_id, in_sample, 0); hr = transform->ProcessInput(in_stream_id, in_sample, 0);
if (hr == MF_E_NOTACCEPTING) { if (hr == MF_E_NOTACCEPTING) {
return TRY_AGAIN; // try again return NOT_ACCEPTED; // try again
} else if (FAILED(hr)) { } else if (FAILED(hr)) {
ReportError("MFT: Failed to process input", hr); ReportError("MFT: Failed to process input", hr);
return INPUT_ERROR; return INPUT_ERROR;

2
src/audio_core/hle/wmf_decoder_utils.h
View file

@ -18,7 +18,7 @@
#include "adts.h" #include "adts.h"
enum MFOutputState { FATAL_ERROR, OK, NEED_MORE_INPUT, NEED_RECONFIG, HAVE_MORE_DATA }; enum MFOutputState { FATAL_ERROR, OK, NEED_MORE_INPUT, NEED_RECONFIG, HAVE_MORE_DATA };
enum MFInputState { INPUT_ERROR, INPUT_OK, TRY_AGAIN }; enum MFInputState { INPUT_ERROR, INPUT_OK, NOT_ACCEPTED };
// utility functions // utility functions
template <class T> template <class T>