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

Don't select buffer 1 if it's NULL/unavailable

This commit is contained in:
Dr. Chat 2015-07-10 23:15:15 -05:00
parent 6b52f2682e
commit f6eb23d86f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xenia/apu/xma_context.cc
View File

@ -227,6 +227,11 @@ void XmaContext::DecodePackets(XMA_CONTEXT_DATA& data) {
// SPUs also support stereo decoding. (data.is_stereo) // SPUs also support stereo decoding. (data.is_stereo)
// Quick die if there's no data.
if (!data.input_buffer_0_valid && !data.input_buffer_1_valid) {
return;
}
// 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) { if (!data.output_buffer_valid) {
@ -329,8 +334,10 @@ int XmaContext::StartPacket(XMA_CONTEXT_DATA& data) {
// See if we've finished with the input. // See if we've finished with the input.
// Block count is in packets, so expand by packet size. // Block count is in packets, so expand by packet size.
uint32_t input_size_0_bytes = (data.input_buffer_0_packet_count) * 2048; uint32_t input_size_0_bytes =
uint32_t input_size_1_bytes = (data.input_buffer_1_packet_count) * 2048; data.input_buffer_0_valid ? (data.input_buffer_0_packet_count) * 2048 : 0;
uint32_t input_size_1_bytes =
data.input_buffer_1_valid ? (data.input_buffer_1_packet_count) * 2048 : 0;
// Total input size // Total input size
uint32_t input_size_bytes = input_size_0_bytes + input_size_1_bytes; uint32_t input_size_bytes = input_size_0_bytes + input_size_1_bytes;
@ -346,7 +353,7 @@ int XmaContext::StartPacket(XMA_CONTEXT_DATA& data) {
uint32_t input_offset_bytes = seq_offset_bytes; uint32_t input_offset_bytes = seq_offset_bytes;
auto input_buffer = in0; auto input_buffer = in0;
if (seq_offset_bytes >= input_size_0_bytes) { if (seq_offset_bytes >= input_size_0_bytes && input_size_1_bytes) {
// Size overlap, select input buffer 1. // Size overlap, select input buffer 1.
// TODO: This needs testing. // TODO: This needs testing.
input_offset_bytes -= input_size_0_bytes; input_offset_bytes -= input_size_0_bytes;