citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-24 12:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4763 from liushuyu/dsp_aac

Browse source 
audio_core: dsp_hle: use better f32 to s16 algorithm
This commit is contained in:
Weiyi Wang 2019-05-02 14:08:32 -04:00 committed by GitHub
parent ad34f86f3b 8021361bb4
commit c445fe4515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/audio_core/hle/ffmpeg_decoder.cpp
View file

@ -218,6 +218,7 @@ std::optional<BinaryResponse> FFMPEGDecoder::Impl::Decode(const BinaryRequest& r
for (std::size_t channel(0); channel < decoded_frame->channels; channel++) { for (std::size_t channel(0); channel < decoded_frame->channels; channel++) {
std::memcpy(&val_float, decoded_frame->data[channel] + current_pos, std::memcpy(&val_float, decoded_frame->data[channel] + current_pos,
sizeof(val_float)); sizeof(val_float));
val_float = std::clamp(val_float, -1.0f, 1.0f);
s16 val = static_cast<s16>(0x7FFF * val_float); s16 val = static_cast<s16>(0x7FFF * val_float);
out_streams[channel].push_back(val & 0xFF); out_streams[channel].push_back(val & 0xFF);
out_streams[channel].push_back(val >> 8); out_streams[channel].push_back(val >> 8);

2
src/audio_core/hle/wmf_decoder.cpp
View file

@ -129,7 +129,7 @@ MFOutputState WMFDecoder::Impl::DecodingLoop(ADTSData adts_header,
f32 val_f32; f32 val_f32;
for (std::size_t i = 0; i < output_buffer->size();) { for (std::size_t i = 0; i < output_buffer->size();) {
for (std::size_t channel = 0; channel < adts_header.channels; channel++) { for (std::size_t channel = 0; channel < adts_header.channels; channel++) {
val_f32 = output_buffer->at(i); val_f32 = std::clamp(output_buffer->at(i), -1.0f, 1.0f);
s16 val = static_cast<s16>(0x7FFF * val_f32); s16 val = static_cast<s16>(0x7FFF * val_f32);
out_streams[channel].push_back(val & 0xFF); out_streams[channel].push_back(val & 0xFF);
out_streams[channel].push_back(val >> 8); out_streams[channel].push_back(val >> 8);