From cc7c48acdb858551d3e9d8a6b3dbee82b4058f43 Mon Sep 17 00:00:00 2001
From: EdnessP <55930127+EdnessP@users.noreply.github.com>
Date: Fri, 5 Apr 2024 14:39:10 +0300
Subject: [PATCH] VAS: Multi-stream blocked music/ambience
---
src/base/render.c | 1 +
src/formats.c | 1 +
src/layout/blocked.c | 3 +++
src/layout/blocked_vas.c | 17 ++++++++++++++
src/layout/layout.h | 1 +
src/libvgmstream.vcxproj | 1 +
src/libvgmstream.vcxproj.filters | 3 +++
src/meta/vas.c | 38 ++++++++++++++++++++++----------
src/vgmstream_types.h | 1 +
9 files changed, 54 insertions(+), 12 deletions(-)
create mode 100644 src/layout/blocked_vas.c
diff --git a/src/base/render.c b/src/base/render.c
index d8a1b07f..fa76dae0 100644
--- a/src/base/render.c
+++ b/src/base/render.c
@@ -302,6 +302,7 @@ int render_layout(sample_t* buf, int32_t sample_count, VGMSTREAM* vgmstream) {
case layout_blocked_vid1:
case layout_blocked_ubi_sce:
case layout_blocked_tt_ad:
+ case layout_blocked_vas:
render_vgmstream_blocked(buf, sample_count, vgmstream);
break;
case layout_segmented:
diff --git a/src/formats.c b/src/formats.c
index 1b728712..3061f97c 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -972,6 +972,7 @@ static const layout_info layout_info_list[] = {
{layout_blocked_vid1, "blocked (VID1)"},
{layout_blocked_ubi_sce, "blocked (Ubi SCE)"},
{layout_blocked_tt_ad, "blocked (TT AD)"},
+ {layout_blocked_vas, "blocked (VAS)"},
};
static const meta_info meta_info_list[] = {
diff --git a/src/layout/blocked.c b/src/layout/blocked.c
index 637502ee..09870526 100644
--- a/src/layout/blocked.c
+++ b/src/layout/blocked.c
@@ -207,6 +207,9 @@ void block_update(off_t block_offset, VGMSTREAM* vgmstream) {
case layout_blocked_tt_ad:
block_update_tt_ad(block_offset,vgmstream);
break;
+ case layout_blocked_vas:
+ block_update_vas(block_offset,vgmstream);
+ break;
default: /* not a blocked layout */
break;
}
diff --git a/src/layout/blocked_vas.c b/src/layout/blocked_vas.c
new file mode 100644
index 00000000..f946c008
--- /dev/null
+++ b/src/layout/blocked_vas.c
@@ -0,0 +1,17 @@
+#include "layout.h"
+#include "../vgmstream.h"
+
+/* VAS - Manhunt 2 PSP blocked audio layout */
+void block_update_vas(off_t block_offset, VGMSTREAM* vgmstream) {
+ size_t block_size;
+ int num_streams;
+
+ /* no headers */
+ block_size = 0x40;
+ num_streams = vgmstream->num_streams;
+
+ vgmstream->current_block_offset = block_offset;
+ vgmstream->next_block_offset = block_offset + (block_size * num_streams);
+ vgmstream->current_block_size = block_size;
+ vgmstream->ch[0].offset = block_offset;
+}
diff --git a/src/layout/layout.h b/src/layout/layout.h
index 11a7d9aa..b0e530ec 100644
--- a/src/layout/layout.h
+++ b/src/layout/layout.h
@@ -48,6 +48,7 @@ void block_update_vs_square(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_vid1(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_ubi_sce(off_t block_offset, VGMSTREAM* vgmstream);
void block_update_tt_ad(off_t block_offset, VGMSTREAM* vgmstream);
+void block_update_vas(off_t block_offset, VGMSTREAM* vgmstream);
/* other layouts */
void render_vgmstream_interleave(sample_t* buffer, int32_t sample_count, VGMSTREAM* vgmstream);
diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj
index b4a4708a..5214404d 100644
--- a/src/libvgmstream.vcxproj
+++ b/src/libvgmstream.vcxproj
@@ -319,6 +319,7 @@
+
diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters
index 5c15896b..6ab9eb91 100644
--- a/src/libvgmstream.vcxproj.filters
+++ b/src/libvgmstream.vcxproj.filters
@@ -778,6 +778,9 @@
layout\Source Files
+
+ layout\Source Files
+
layout\Source Files
diff --git a/src/meta/vas.c b/src/meta/vas.c
index 14bc153d..ec423ac0 100644
--- a/src/meta/vas.c
+++ b/src/meta/vas.c
@@ -5,8 +5,9 @@
VGMSTREAM* init_vgmstream_vas(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL;
off_t stream_offset;
- size_t stream_size;
- int sample_rate, channels, loop_flag = 0;
+ size_t data_size, stream_size;
+ int sample_rate, num_streams, channels, loop_flag = 0;
+ int is_v2, block_size, target_subsong = sf->stream_index;
/* checks */
@@ -19,21 +20,33 @@ VGMSTREAM* init_vgmstream_vas(STREAMFILE* sf) {
if (!check_extensions(sf, "vas"))
goto fail;
- stream_size = read_u32le(0x04, sf);
+ data_size = read_u32le(0x04, sf);
sample_rate = read_u16le(0x08, sf);
- /* read_u8(0x0C, sf); // interleave size * 0x10? never used, always mono */
- channels = read_u8(0x0B, sf);
- if (channels != 1) goto fail;
+ if (read_u8(0x0A, sf)) goto fail; /* always 0? */
+ num_streams = read_u8(0x0B, sf);
+ if (num_streams < 1 || num_streams > 32) goto fail;
+ if (!target_subsong) target_subsong = 1;
+ is_v2 = is_id32be(0x00, sf, "2AGs");
+
+ block_size = 0x40;
stream_offset = 0x0C;
- /* offset by 32 bytes for v2, stream name field? always empty in Manhunt 2 */
- if (is_id32be(0x00, sf, "2AGs"))
- stream_offset += 0x20;
+ /* only in v2, 32 byte buffer of the intended order for stream blocks */
+ if (is_v2) stream_offset += 0x20;
/* might conflict with the standard VAG otherwise */
- if (stream_size + stream_offset != get_streamfile_size(sf))
+ if (data_size + stream_offset != get_streamfile_size(sf))
goto fail;
-
+
+ target_subsong -= 1; /* zero index */
+ /* currently threre are no known v1 multi-stream blocked sounds, prerelease
+ * builds also use v2 for those, but this should be how v1 works in theory */
+ stream_offset += block_size * (is_v2 ? read_u8(0x0C + target_subsong, sf) : target_subsong);
+
+
+ stream_size = data_size / num_streams;
+
+ channels = 1; /* might be read_u8(0x0A, sf) + 1? */
/* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channels, loop_flag);
@@ -41,10 +54,11 @@ VGMSTREAM* init_vgmstream_vas(STREAMFILE* sf) {
vgmstream->meta_type = meta_VAS;
vgmstream->coding_type = coding_PSX;
- vgmstream->layout_type = layout_none;
+ vgmstream->num_streams = num_streams;
vgmstream->sample_rate = sample_rate;
vgmstream->stream_size = stream_size;
vgmstream->interleave_block_size = 0;
+ vgmstream->layout_type = layout_blocked_vas;
vgmstream->num_samples = ps_bytes_to_samples(stream_size, channels);
if (!vgmstream_open_stream(vgmstream, sf, stream_offset))
diff --git a/src/vgmstream_types.h b/src/vgmstream_types.h
index 24565980..050ca9fa 100644
--- a/src/vgmstream_types.h
+++ b/src/vgmstream_types.h
@@ -233,6 +233,7 @@ typedef enum {
layout_blocked_vid1,
layout_blocked_ubi_sce,
layout_blocked_tt_ad,
+ layout_blocked_vas,
/* otherwise odd */
layout_segmented, /* song divided in segments (song sections) */