octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio_core: hle: mf: return values as std::optional

Browse Source
This commit is contained in:
liushuyu
2019-02-05 21:13:40 -07:00
committed by B3N30
parent 25fa10327b
commit 6332e57069
5 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/audio_core/hle/adts_reader.cpp
View File

@ -8,36 +8,39 @@ constexpr std::array<u32, 16> freq_table = {96000, 88200, 64000, 48000, 44100, 3
16000, 12000, 11025, 8000, 7350, 0, 0, 0};
constexpr std::array<u8, 8> channel_table = {0, 1, 2, 3, 4, 5, 6, 8};
u32 ParseADTS(char* buffer, ADTSData* out) {
ADTSData ParseADTS(char* buffer) {
u32 tmp = 0;
ADTSData out;
// sync word 0xfff
tmp = (buffer[0] << 8) | (buffer[1] & 0xf0);
if ((tmp & 0xffff) != 0xfff0)
return 0;
out->MPEG2 = (buffer[1] >> 3) & 0x1;
if ((tmp & 0xffff) != 0xfff0) {
out.length = 0;
return out;
}
out.MPEG2 = (buffer[1] >> 3) & 0x1;
// bit 17 to 18
out->profile = (buffer[2] >> 6) + 1;
out.profile = (buffer[2] >> 6) + 1;
// bit 19 to 22
tmp = (buffer[2] >> 2) & 0xf;
out->samplerate_idx = tmp;
out->samplerate = (tmp > 15) ? 0 : freq_table[tmp];
out.samplerate_idx = tmp;
out.samplerate = (tmp > 15) ? 0 : freq_table[tmp];
// bit 24 to 26
tmp = ((buffer[2] & 0x1) << 2) | ((buffer[3] >> 6) & 0x3);
out->channel_idx = tmp;
out->channels = (tmp > 7) ? 0 : channel_table[tmp];
out.channel_idx = tmp;
out.channels = (tmp > 7) ? 0 : channel_table[tmp];
// bit 55 to 56
out->framecount = (buffer[6] & 0x3) + 1;
out.framecount = (buffer[6] & 0x3) + 1;
// bit 31 to 43
tmp = (buffer[3] & 0x3) << 11;
tmp |= (buffer[4] << 3) & 0x7f8;
tmp |= (buffer[5] >> 5) & 0x7;
out->length = tmp;
out.length = tmp;
return tmp;
return out;
}
// last two bytes of MF AAC decoder user data