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

Rejiggered ProcessXmaContext. Sound working again in Super Meat Boy.

This commit is contained in:
gibbed 2015-06-19 22:39:41 -05:00
parent 1a38586d9a
commit 641a4a5e47
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/xenia/apu/audio_system.cc
View File

@ -376,9 +376,13 @@ void AudioSystem::ProcessXmaContext(XMAContext& context, XMAContextData& data) {
// 3 - 48 kHz ? // 3 - 48 kHz ?
// SPUs also support stereo decoding. (data.is_stereo) // SPUs also support stereo decoding. (data.is_stereo)
while (data.output_buffer_valid) {
// Check the output buffer - we cannot decode anything else if it's // Check the output buffer - we cannot decode anything else if it's
// unavailable. // unavailable.
if (!data.output_buffer_valid) {
return;
}
// Output buffers are in raw PCM samples, 256 bytes per block. // Output buffers are in raw PCM samples, 256 bytes per block.
// Output buffer is a ring buffer. We need to write from the write offset // Output buffer is a ring buffer. We need to write from the write offset
// to the read offset. // to the read offset.
@ -391,25 +395,22 @@ void AudioSystem::ProcessXmaContext(XMAContext& context, XMAContextData& data) {
output_rb.set_write_offset(output_write_offset); output_rb.set_write_offset(output_write_offset);
size_t output_remaining_bytes = output_rb.write_count(); size_t output_remaining_bytes = output_rb.write_count();
if (!output_remaining_bytes) {
// Can't write any more data. Break.
// The game will kick us again with a new output buffer later.
data.output_buffer_valid = 0;
break;
}
// Decode until we can't write any more data.
while (output_remaining_bytes > 0) {
// This'll copy audio samples into the output buffer. // This'll copy audio samples into the output buffer.
// The samples need to be 2 bytes long! // The samples need to be 2 bytes long!
// Copies one frame at a time, so keep calling this until size == 0 // Copies one frame at a time, so keep calling this until size == 0
int read_bytes = 0; int read_bytes = 0;
int decode_attempts_remaining = 3; int decode_attempts_remaining = 3;
uint8_t tmp_buff[XMAContextData::kOutputMaxSizeBytes];
uint8_t work_buffer[XMAContextData::kOutputMaxSizeBytes];
while (decode_attempts_remaining) { while (decode_attempts_remaining) {
read_bytes = context.decoder->DecodePacket(tmp_buff, 0, read_bytes = context.decoder->DecodePacket(work_buffer, 0,
output_remaining_bytes); output_remaining_bytes);
if (read_bytes >= 0) { if (read_bytes >= 0) {
assert_true((read_bytes % 256) == 0); //assert_true((read_bytes % 256) == 0);
auto written_bytes = output_rb.Write(tmp_buff, read_bytes); auto written_bytes = output_rb.Write(work_buffer, read_bytes);
assert_true(read_bytes == written_bytes); assert_true(read_bytes == written_bytes);
// Ok. // Ok.
@ -437,6 +438,7 @@ void AudioSystem::ProcessXmaContext(XMAContext& context, XMAContextData& data) {
} }
data.output_buffer_write_offset = output_rb.write_offset() / 256; data.output_buffer_write_offset = output_rb.write_offset() / 256;
output_remaining_bytes -= read_bytes;
// If we need more data and the input buffers have it, grab it. // If we need more data and the input buffers have it, grab it.
if (read_bytes) { if (read_bytes) {
@ -455,6 +457,9 @@ void AudioSystem::ProcessXmaContext(XMAContext& context, XMAContextData& data) {
break; break;
} }
} }
// The game will kick us again with a new output buffer later.
data.output_buffer_valid = 0;
} }
int AudioSystem::PrepareXMAPacket(XMAContext &context, XMAContextData &data) { int AudioSystem::PrepareXMAPacket(XMAContext &context, XMAContextData &data) {