Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-21 20:59:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix .xwc v4 XMA2 [Syndicate (X360)]

Browse Source
This commit is contained in:
bnnm 2020-02-03 00:19:47 +01:00
parent 6803c939e4
commit 48f7e163e6
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/meta/xwc.c
View File

@ -74,17 +74,30 @@ VGMSTREAM * init_vgmstream_xwc(STREAMFILE *streamFile) {
#ifdef VGM_USE_FFMPEG #ifdef VGM_USE_FFMPEG
case 0x584D4100: { /* "XMA\0" (X360) */ case 0x584D4100: { /* "XMA\0" (X360) */
uint8_t buf[0x100]; uint8_t buf[0x100];
int32_t bytes, seek_size, block_size, block_count, sample_rate; int32_t bytes, seek_size, block_size, block_count, sample_rate, chunk_size;
seek_size = read_32bitLE(extra_offset+0x00, streamFile); seek_size = read_32bitLE(extra_offset + 0x00, streamFile);
start_offset = extra_offset+0x04 + seek_size + read_32bitLE(extra_offset+0x04+seek_size, streamFile) + 0x08; chunk_size = read_32bitLE(extra_offset + 0x04 + seek_size, streamFile);
start_offset = extra_offset+ 0x04 + seek_size + chunk_size + 0x08;
start_offset += (start_offset % 0x800) ? 0x800 - (start_offset % 0x800) : 0; /* padded */ start_offset += (start_offset % 0x800) ? 0x800 - (start_offset % 0x800) : 0; /* padded */
data_size = data_size - start_offset; data_size = data_size - start_offset;
sample_rate = read_32bitBE(extra_offset+0x04+seek_size+0x10, streamFile); if (chunk_size == 0x34) { /* new XMA2 */
block_size = read_32bitBE(extra_offset+0x04+seek_size+0x1c, streamFile); sample_rate = read_32bitLE(extra_offset+0x04+seek_size+0x08, streamFile);
block_count = read_32bitBE(extra_offset+0x04+seek_size+0x28, streamFile); block_size = read_32bitLE(extra_offset+0x04+seek_size+0x20, streamFile);
/* others: scrambled RIFF fmt BE values */ block_count = data_size / block_size;
/* others: standard RIFF XMA2 fmt? */
}
else if (chunk_size == 0x2c) { /* old XMA2 */
sample_rate = read_32bitBE(extra_offset+0x04+seek_size+0x10, streamFile);
block_size = read_32bitBE(extra_offset+0x04+seek_size+0x1c, streamFile);
block_count = read_32bitBE(extra_offset+0x04+seek_size+0x28, streamFile);
/* others: scrambled RIFF fmt BE values */
}
else {
goto fail;
}
bytes = ffmpeg_make_riff_xma2(buf,0x100, vgmstream->num_samples, data_size, vgmstream->channels, sample_rate, block_count, block_size); bytes = ffmpeg_make_riff_xma2(buf,0x100, vgmstream->num_samples, data_size, vgmstream->channels, sample_rate, block_count, block_size);
vgmstream->codec_data = init_ffmpeg_header_offset(streamFile, buf,bytes, start_offset,data_size); vgmstream->codec_data = init_ffmpeg_header_offset(streamFile, buf,bytes, start_offset,data_size);