mirror of
https://github.com/PabloMK7/citra.git
synced 2024-11-29 10:50:17 +00:00
audio_core: hle: mf: avoid name conflicts
This commit is contained in:
parent
452ac7b874
commit
633f02b9b2
3 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
// NOTICE: you are required to check the output even if you already knew/guessed
|
||||
// MFT didn't accept the input sample
|
||||
if (input_status == TRY_AGAIN) {
|
||||
if (input_status == NOT_ACCEPTED) {
|
||||
// try again
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -250,7 +250,7 @@ MFInputState SendSample(IMFTransform* transform, DWORD in_stream_id, IMFSample*
|
|||
if (in_sample) {
|
||||
hr = transform->ProcessInput(in_stream_id, in_sample, 0);
|
||||
if (hr == MF_E_NOTACCEPTING) {
|
||||
return TRY_AGAIN; // try again
|
||||
return NOT_ACCEPTED; // try again
|
||||
} else if (FAILED(hr)) {
|
||||
ReportError("MFT: Failed to process input", hr);
|
||||
return INPUT_ERROR;
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "adts.h"
|
||||
|
||||
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
|
||||
template <class T>
|
||||
|
|
Loading…
Reference in a new issue