fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[APU] Fixed typo that prevented last packet in stream to be processed

Browse Source
This commit is contained in:
Gliniak
2022-10-24 21:33:25 +02:00
parent fac2a89d0f
commit 6b11787c93
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,7 +421,7 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
while (packets_skip_ > 0) { while (packets_skip_ > 0) {
packets_skip_--; packets_skip_--;
packet_idx++; packet_idx++;
if (packet_idx >= current_input_packet_count) { if (packet_idx > current_input_packet_count) {
if (!reuse_input_buffer) { if (!reuse_input_buffer) {
// Last packet. Try setup once more. // Last packet. Try setup once more.
reuse_input_buffer = TrySetupNextLoop(data, true); reuse_input_buffer = TrySetupNextLoop(data, true);
@@ -639,13 +639,14 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
uint32_t offset = std::max(kBitsPerHeader, data->input_buffer_read_offset); uint32_t offset = std::max(kBitsPerHeader, data->input_buffer_read_offset);
offset = static_cast<uint32_t>( offset = static_cast<uint32_t>(
GetNextFrame(current_input_buffer, current_input_size, offset)); GetNextFrame(current_input_buffer, current_input_size, offset));
if (frame_idx + 1 >= frame_count) { if (frame_idx + 1 >= frame_count) {
// Skip to next packet (no split frame) // Skip to next packet (no split frame)
packets_skip_ = xma::GetPacketSkipCount(packet) + 1; packets_skip_ = xma::GetPacketSkipCount(packet) + 1;
while (packets_skip_ > 0) { while (packets_skip_ > 0) {
packets_skip_--; packets_skip_--;
packet_idx++; packet_idx++;
if (packet_idx >= current_input_packet_count) { if (packet_idx > current_input_packet_count) {
if (!reuse_input_buffer) { if (!reuse_input_buffer) {
// Last packet. Try setup once more. // Last packet. Try setup once more.
reuse_input_buffer = TrySetupNextLoop(data, true); reuse_input_buffer = TrySetupNextLoop(data, true);
@@ -664,7 +665,7 @@ void XmaContext::Decode(XMA_CONTEXT_DATA* data) {
} }
if (offset == 0 || frame_idx == -1) { if (offset == 0 || frame_idx == -1) {
// Next packet but we already skipped to it // Next packet but we already skipped to it
if (packet_idx >= current_input_packet_count) { if (packet_idx > current_input_packet_count) {
// Buffer is fully used // Buffer is fully used
if (!reuse_input_buffer) { if (!reuse_input_buffer) {
// Last packet. Try setup once more. // Last packet. Try setup once more.