Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-23 22:41:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add S3V support for SVDX (AC). Fix looping for 2DX9 and SD9.

Browse Source
This commit is contained in:
bxaimc 2022-04-20 23:05:37 -04:00
parent 9d47eded30
commit 1b4049c445
10 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/formats.c
View File

@ -431,7 +431,7 @@ static const char* extension_list[] = {
"rxx", //txth/reserved [Full Auto (X360)]
"s14",
"s3v", //txth/reserved [Sound Voltex 5 (AC)]
"s3v", //Sound Voltex (AC)
"sab",
"sad",
"saf",
@ -1388,6 +1388,7 @@ static const meta_info meta_info_list[] = {
{meta_DSP_APEX, "Koei Tecmo APEX header"},
{meta_MPEG, "MPEG header"},
{meta_SSPF, "Konami SSPF header"},
{meta_S3V, "Konami S3V header"},
};
void get_vgmstream_coding_description(VGMSTREAM* vgmstream, char* out, size_t out_size) {

1
src/libvgmstream.vcxproj
View File

@ -245,6 +245,7 @@
<ClCompile Include="meta\ps2_iab.c" />
<ClCompile Include="meta\mss.c" />
<ClCompile Include="meta\mtaf.c" />
<ClCompile Include="meta\s3v.c" />
<ClCompile Include="meta\spm.c" />
<ClCompile Include="meta\rad.c" />
<ClCompile Include="meta\sbk.c" />

3
src/libvgmstream.vcxproj.filters
View File

@ -1981,5 +1981,8 @@
<ClCompile Include="meta\sspf.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
<ClCompile Include="meta\s3v.c">
<Filter>meta\Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

7
src/meta/2dx9.c
View File

@ -24,7 +24,7 @@ VGMSTREAM * init_vgmstream_2dx9(STREAMFILE *streamFile) {
if (read_32bitBE(0x6a,streamFile) != 0x64617461) /* data */
goto fail;
loop_flag = 0;
loop_flag = (read_16bitLE(0x0e,streamFile) > 0);
channel_count = read_16bitLE(0x2e,streamFile);
start_offset = 0x72;
@ -35,6 +35,11 @@ VGMSTREAM * init_vgmstream_2dx9(STREAMFILE *streamFile) {
vgmstream->meta_type = meta_2DX9;
vgmstream->sample_rate = read_32bitLE(0x30,streamFile);
vgmstream->num_samples = read_32bitLE(0x66,streamFile);
if (loop_flag) {
vgmstream->loop_start_sample = 0;
vgmstream->loop_end_sample = vgmstream->num_samples;
}
vgmstream->coding_type = coding_MSADPCM;
vgmstream->layout_type = layout_none;
vgmstream->frame_size = read_16bitLE(0x38,streamFile);

2
src/meta/meta.h
View File

@ -980,4 +980,6 @@ VGMSTREAM* init_vgmstream_mpeg(STREAMFILE* sf);
VGMSTREAM* init_vgmstream_sspf(STREAMFILE* sf);
VGMSTREAM* init_vgmstream_s3v(STREAMFILE* sf);
#endif /*_META_H*/

62
src/meta/s3v.c Normal file
View File

@ -0,0 +1,62 @@
#include "meta.h"
#include "../coding/coding.h"
/* S3V - from Konami arcade games [SOUND VOLTEX series (AC)] */
VGMSTREAM * init_vgmstream_s3v(STREAMFILE *sf) {
VGMSTREAM * vgmstream = NULL;
off_t start_offset;
int32_t channel_count, loop_flag;
size_t data_size;
/* checks */
if (!check_extensions(sf, "s3v"))
goto fail;
/* check header */
if (read_32bitBE(0x00,sf) != 0x53335630) /* S3V0 */
goto fail;
/* No discernible loop_flag so we'll just use signatures.
Might have to update on a per game basis. */
switch (read_32bitBE(0x14, sf)) {
case 0x82FA0000: // SOUND VOLTEX EXCEED GEAR ver5
case 0x1BFD0000: // SOUND VOLTEX EXCEED GEAR ver6
loop_flag = 1;
break;
default:
loop_flag = 0;
}
start_offset = 0x20;
data_size = read_32bitLE(0x08, sf);
channel_count = 2;
/* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail;
vgmstream->meta_type = meta_S3V;
#ifdef VGM_USE_FFMPEG
vgmstream->codec_data = init_ffmpeg_offset(sf, start_offset, data_size);
if (!vgmstream->codec_data) goto fail;
vgmstream->sample_rate = ffmpeg_get_sample_rate(vgmstream->codec_data);
vgmstream->num_samples = ffmpeg_get_samples(vgmstream->codec_data);
if (loop_flag) {
vgmstream->loop_start_sample = read_32bitLE(0x10, sf);
vgmstream->loop_end_sample = vgmstream->num_samples;
}
vgmstream->coding_type = coding_FFmpeg;
vgmstream->layout_type = layout_none;
#endif
if (!vgmstream_open_stream(vgmstream, sf, start_offset))
goto fail;
return vgmstream;
fail:
close_vgmstream(vgmstream);
return NULL;
}

21
src/meta/sd9.c
View File

@ -22,12 +22,11 @@ VGMSTREAM * init_vgmstream_sd9(STREAMFILE *streamFile) {
if (read_32bitBE(0x72, streamFile) != 0x64617461) /* data */
goto fail;
/* Probably better to check if loop end exists and use as loop flag.
Blame SD9s from beatmania IIDX 21: Spada that have a flase flag
but still "loop" */
/* Some SD9s may loop without any loop points specificed.
If loop_flag is set with no points, loop entire song. */
//loop_flag = (read_16bitLE(0x0e,streamFile)==0x1);
loop_flag = read_32bitLE(0x18, streamFile); // use loop end
loop_flag = read_16bitLE(0x0e,streamFile);
//loop_flag = read_32bitLE(0x18, streamFile); // use loop end
channel_count = read_16bitLE(0x36, streamFile);
start_offset = 0x7a;
@ -37,7 +36,17 @@ VGMSTREAM * init_vgmstream_sd9(STREAMFILE *streamFile) {
vgmstream->sample_rate = read_32bitLE(0x38, streamFile);
vgmstream->num_samples = read_32bitLE(0x6e, streamFile);
if (loop_flag) {
if (loop_flag > 0) {
vgmstream->loop_start_sample = read_32bitLE(0x14, streamFile) / 2 / channel_count;
vgmstream->loop_end_sample = read_32bitLE(0x18, streamFile) / 2 / channel_count;
if (vgmstream->loop_end_sample == 0) {
vgmstream->loop_end_sample = vgmstream->num_samples;
}
}
/* beatmania IIDX 21: Spada is a special case. Loop flag is false but loops exist.
Konami, Why? */
if ((loop_flag < 0) && (read_32bitLE(0x18, streamFile) !=0)) {
vgmstream->loop_start_sample = read_32bitLE(0x14, streamFile) / 2 / channel_count;
vgmstream->loop_end_sample = read_32bitLE(0x18, streamFile) / 2 / channel_count;
}

1
src/vgmstream.c
View File

@ -521,6 +521,7 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
init_vgmstream_ubi_ckd_cwav,
init_vgmstream_sspf,
init_vgmstream_opus_rsnd,
init_vgmstream_s3v,
/* lower priority metas (no clean header identity, somewhat ambiguous, or need extension/companion file to identify) */
init_vgmstream_mpeg,

1
src/vgmstream.h
View File

@ -755,6 +755,7 @@ typedef enum {
meta_DSP_APEX,
meta_MPEG,
meta_SSPF,
meta_S3V,
} meta_t;