From 01c399164d400b8575bf4e3dacd34ca820d7c270 Mon Sep 17 00:00:00 2001 From: "Herman S." <429230+has207@users.noreply.github.com> Date: Sat, 21 Feb 2026 16:46:15 +0900 Subject: [PATCH] Revert "[XMA] Fix loop trigger guard and comparison direction" This reverts commit ff4fcc7b6bba6db2d582d4c986862b6c4b2fccdd. --- src/xenia/apu/xma_context_new.cc | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/xenia/apu/xma_context_new.cc b/src/xenia/apu/xma_context_new.cc index 6f93bcfef..324ec13d4 100644 --- a/src/xenia/apu/xma_context_new.cc +++ b/src/xenia/apu/xma_context_new.cc @@ -649,27 +649,18 @@ void XmaContextNew::UpdateLoopStatus(XMA_CONTEXT_DATA* data) { const uint32_t loop_start = std::max(kBitsPerPacketHeader, data->loop_start); const uint32_t loop_end = std::max(kBitsPerPacketHeader, data->loop_end); - if (loop_end < loop_start) { - XELOGW( - "XmaContext {}: Degenerate loop region (end {} < start {}), ignoring", - id(), loop_end, loop_start); + if (loop_end <= loop_start) { return; } - XELOGAPU("XmaContext {}: Looped Data: {} > {} (Start: {}) Remaining: {}", + XELOGAPU("XmaContext {}: Looped Data: {} < {} (Start: {}) Remaining: {}", id(), data->input_buffer_read_offset, data->loop_end, data->loop_start, data->loop_count); - if (data->input_buffer_read_offset <= loop_end) { + if (data->input_buffer_read_offset < loop_end) { return; } - // Read offset has advanced past the loop end frame — loop back. - XELOGAPU( - "XmaContext {}: Loop triggered - offset {} past end {}, " - "jumping to start {} (remaining: {} -> {})", - id(), data->input_buffer_read_offset, loop_end, loop_start, - data->loop_count, data->loop_count == 255 ? 255 : data->loop_count - 1); data->input_buffer_read_offset = loop_start; loop_start_skip_pending_ = true;