From 2c40ef2a9064315deb5d1bf8e0799a23d5c6abaa Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 28 Jan 2019 21:20:46 -0700 Subject: [PATCH] audio_core: hle: mf: rename functions --- src/audio_core/hle/adts.h | 4 ++-- src/audio_core/hle/adts_reader.cpp | 4 ++-- src/audio_core/hle/wmf_decoder_utils.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/audio_core/hle/adts.h b/src/audio_core/hle/adts.h index c2f5304fa..bd68422be 100644 --- a/src/audio_core/hle/adts.h +++ b/src/audio_core/hle/adts.h @@ -17,6 +17,6 @@ struct ADTSData { u32 samplerate; }; -u32 parse_adts(char* buffer, struct ADTSData* out); +u32 ParseADTS(char* buffer, struct ADTSData* out); // last two bytes of MF AAC decoder user data -u16 mf_get_aac_tag(struct ADTSData input); +u16 MFGetAACTag(struct ADTSData input); diff --git a/src/audio_core/hle/adts_reader.cpp b/src/audio_core/hle/adts_reader.cpp index 540aed577..1bb3b4c76 100644 --- a/src/audio_core/hle/adts_reader.cpp +++ b/src/audio_core/hle/adts_reader.cpp @@ -7,7 +7,7 @@ constexpr std::array freq_table = {96000, 88200, 64000, 48000, 44100, 3 16000, 12000, 11025, 8000, 7350, 0, 0, 0}; constexpr std::array channel_table = {0, 1, 2, 3, 4, 5, 6, 8}; -u32 parse_adts(char* buffer, struct ADTSData* out) { +u32 ParseADTS(char* buffer, struct ADTSData* out) { u32 tmp = 0; // sync word 0xfff @@ -40,7 +40,7 @@ u32 parse_adts(char* buffer, struct ADTSData* out) { } // last two bytes of MF AAC decoder user data -u16 mf_get_aac_tag(struct ADTSData input) { +u16 MFGetAACTag(struct ADTSData input) { u16 tag = 0; tag |= input.profile << 11; diff --git a/src/audio_core/hle/wmf_decoder_utils.cpp b/src/audio_core/hle/wmf_decoder_utils.cpp index 515dc0e5c..4568a1147 100644 --- a/src/audio_core/hle/wmf_decoder_utils.cpp +++ b/src/audio_core/hle/wmf_decoder_utils.cpp @@ -214,12 +214,12 @@ int DetectMediaType(char* buffer, size_t len, ADTSData* output, char** aac_tag) UINT8 aac_tmp[] = {0x01, 0x00, 0xfe, 00, 00, 00, 00, 00, 00, 00, 00, 00, 0x00, 0x00}; uint16_t tag = 0; - uint32_t result = parse_adts(buffer, &tmp); + uint32_t result = ParseADTS(buffer, &tmp); if (result == 0) { return -1; } - tag = mf_get_aac_tag(tmp); + tag = MFGetAACTag(tmp); aac_tmp[12] |= (tag & 0xff00) >> 8; aac_tmp[13] |= (tag & 0x00ff); memcpy(*aac_tag, aac_tmp, 14);