From 633f02b9b292c47685fd637f9a5d112ce1fda788 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Mon, 28 Jan 2019 23:36:24 -0700
Subject: [PATCH] audio_core: hle: mf: avoid name conflicts
---
src/audio_core/hle/wmf_decoder.cpp | 2 +-
src/audio_core/hle/wmf_decoder_utils.cpp | 2 +-
src/audio_core/hle/wmf_decoder_utils.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/audio_core/hle/wmf_decoder.cpp b/src/audio_core/hle/wmf_decoder.cpp
index eb04ee34bf..cd5cc77d64 100644
--- a/src/audio_core/hle/wmf_decoder.cpp
+++ b/src/audio_core/hle/wmf_decoder.cpp
@@ -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;
}
diff --git a/src/audio_core/hle/wmf_decoder_utils.cpp b/src/audio_core/hle/wmf_decoder_utils.cpp
index a74e1bf64e..7f809e679d 100644
--- a/src/audio_core/hle/wmf_decoder_utils.cpp
+++ b/src/audio_core/hle/wmf_decoder_utils.cpp
@@ -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;
diff --git a/src/audio_core/hle/wmf_decoder_utils.h b/src/audio_core/hle/wmf_decoder_utils.h
index f502641139..2b9c545437 100644
--- a/src/audio_core/hle/wmf_decoder_utils.h
+++ b/src/audio_core/hle/wmf_decoder_utils.h
@@ -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>