From a0552a2d7a8d120852c38b901de26978a344edee Mon Sep 17 00:00:00 2001
From: EdnessP <55930127+EdnessP@users.noreply.github.com>
Date: Sat, 29 Jul 2023 00:06:32 +0300
Subject: [PATCH] Reflections IMA ADPCM: Use interleave block size for frame
 samples

---
 src/base/decode.c  | 5 +++--
 src/meta/xa_xa30.c | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/base/decode.c b/src/base/decode.c
index 3ac6d89b..61bc66bb 100644
--- a/src/base/decode.c
+++ b/src/base/decode.c
@@ -422,10 +422,11 @@ int decode_get_samples_per_frame(VGMSTREAM* vgmstream) {
         case coding_APPLE_IMA4:
             return 64;
         case coding_MS_IMA:
-        case coding_REF_IMA:
-            return ((vgmstream->frame_size - 0x04*vgmstream->channels) * 2 / vgmstream->channels) + 1;/* +1 from header sample */
+            return ((vgmstream->frame_size - 0x04*vgmstream->channels) * 2 / vgmstream->channels) + 1; /* +1 from header sample */
         case coding_MS_IMA_mono:
             return ((vgmstream->frame_size - 0x04) * 2) + 1; /* +1 from header sample */
+        case coding_REF_IMA:
+            return ((vgmstream->interleave_block_size - 0x04 * vgmstream->channels) * 2 / vgmstream->channels) + 1; /* +1 from header sample */
         case coding_RAD_IMA:
             return (vgmstream->interleave_block_size - 0x04*vgmstream->channels) * 2 / vgmstream->channels;
         case coding_NDS_IMA:
diff --git a/src/meta/xa_xa30.c b/src/meta/xa_xa30.c
index e6f390f7..8c24b8dd 100644
--- a/src/meta/xa_xa30.c
+++ b/src/meta/xa_xa30.c
@@ -5,7 +5,7 @@
 VGMSTREAM * init_vgmstream_xa_xa30(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
     off_t start_offset;
-    int loop_flag, channel_count, codec;
+    int loop_flag, channel_count, codec, interleave_block_size;
     size_t stream_size;
     int total_subsongs, target_subsong = streamFile->stream_index;
 
@@ -31,6 +31,7 @@ VGMSTREAM * init_vgmstream_xa_xa30(STREAMFILE *streamFile) {
     codec = read_32bitLE(0x0c,streamFile);
     start_offset = read_32bitLE(0x10 + 0x04*(target_subsong-1),streamFile);
     stream_size  = read_32bitLE(0x18 + 0x04*(target_subsong-1),streamFile);
+    interleave_block_size = read_32bitLE(0x24, streamFile);
 
 
     /* build the VGMSTREAM */
@@ -47,14 +48,14 @@ VGMSTREAM * init_vgmstream_xa_xa30(STREAMFILE *streamFile) {
         case 0x00:   /* PCM (rare, seen in Driver 3) */
             vgmstream->coding_type = coding_PCM16LE;
             vgmstream->layout_type = layout_interleave;
-            vgmstream->interleave_block_size = read_32bitLE(0x24,streamFile) / 2;
+            vgmstream->interleave_block_size = interleave_block_size / 2;
             vgmstream->num_samples = pcm_bytes_to_samples(stream_size, channel_count, 16);
             break;
 
         case 0x01:   /* MS-IMA variation */
             vgmstream->coding_type = coding_REF_IMA;
             vgmstream->layout_type = layout_none;
-            vgmstream->interleave_block_size = read_32bitLE(0x24,streamFile);
+            vgmstream->interleave_block_size = interleave_block_size;
             vgmstream->num_samples = ms_ima_bytes_to_samples(stream_size, vgmstream->interleave_block_size, channel_count);
             break;