ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Whoops, we should be converting samples from more than one channel!

This commit is contained in:
Dr. Chat 2015-05-30 21:27:59 -05:00
parent fedf7357a5
commit dfd689e22b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/apu/audio_decoder.cc
View File

@ -84,7 +84,7 @@ int AudioDecoder::Initialize() {
// Current frame stuff whatever // Current frame stuff whatever
// samples per frame * 2 max channels * output bytes // samples per frame * 2 max channels * output bytes
current_frame_ = current_frame_ =
new uint8_t[XMAContextData::kSamplesPerFrame * 2 * (bits / 8)]; new uint8_t[XMAContextData::kSamplesPerFrame * 2 * 2];
current_frame_pos_ = 0; current_frame_pos_ = 0;
frame_samples_size_ = 0; frame_samples_size_ = 0;
@ -196,7 +196,8 @@ int AudioDecoder::DecodePacket(uint8_t *output, size_t output_offset,
float *sample_array = (float *)decoded_frame_->data[0]; float *sample_array = (float *)decoded_frame_->data[0];
// Loop through every sample, convert and drop it into the output array. // Loop through every sample, convert and drop it into the output array.
for (int i = 0; i < decoded_frame_->nb_samples; i++) { for (int i = 0; i < context_->channels * decoded_frame_->nb_samples;
i++) {
// Raw sample should be within [-1, 1]. // Raw sample should be within [-1, 1].
// Clamp it, just in case. // Clamp it, just in case.
float raw_sample = xe::saturate(sample_array[i]); float raw_sample = xe::saturate(sample_array[i]);