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

audio_core: hle: mf: lint

Browse source
This commit is contained in:
liushuyu 2019-02-13 15:15:11 -07:00
parent 671ac441e9
commit a4ba35fe3a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,8 @@ unique_mfptr<IMFTransform> MFDecoderInit(GUID audio_format) {
if (FAILED(hr)) if (FAILED(hr))
transform = nullptr; transform = nullptr;
activate[n]->Release(); activate[n]->Release();
if (SUCCEEDED(hr))
break;
} }
if (transform == nullptr) { if (transform == nullptr) {
ReportError("Failed to initialize MFT", hr); ReportError("Failed to initialize MFT", hr);
@ -59,10 +61,11 @@ unique_mfptr<IMFTransform> MFDecoderInit(GUID audio_format) {
return nullptr; return nullptr;
} }
CoTaskMemFree(activate); CoTaskMemFree(activate);
return std::move(transform); return transform;
} }
unique_mfptr<IMFSample> CreateSample(void* data, DWORD len, DWORD alignment, LONGLONG duration) { unique_mfptr<IMFSample> CreateSample(const void* data, DWORD len, DWORD alignment,
LONGLONG duration) {
HRESULT hr = S_OK; HRESULT hr = S_OK;
unique_mfptr<IMFMediaBuffer> buf; unique_mfptr<IMFMediaBuffer> buf;
unique_mfptr<IMFSample> sample; unique_mfptr<IMFSample> sample;

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

@ -74,7 +74,7 @@ struct ADTSMeta {
// exported functions // exported functions
unique_mfptr<IMFTransform> MFDecoderInit(GUID audio_format = MFAudioFormat_AAC); unique_mfptr<IMFTransform> MFDecoderInit(GUID audio_format = MFAudioFormat_AAC);
unique_mfptr<IMFSample> CreateSample(void* data, DWORD len, DWORD alignment = 1, unique_mfptr<IMFSample> CreateSample(const void* data, DWORD len, DWORD alignment = 1,
LONGLONG duration = 0); LONGLONG duration = 0);
bool SelectInputMediaType(IMFTransform* transform, int in_stream_id, const ADTSData& adts, bool SelectInputMediaType(IMFTransform* transform, int in_stream_id, const ADTSData& adts,
const UINT8* user_data, UINT32 user_data_len, const UINT8* user_data, UINT32 user_data_len,