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

Fix some .seg [Eragon (X360)]

Browse Source
This commit is contained in:
bnnm 2023-06-30 23:02:10 +02:00
parent 596aa76076
commit 1b06bf45d2
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/meta/seg.c
View File

@ -6,11 +6,10 @@
/* SEG - from Stormfront games [Eragon (multi), Forgotten Realms: Demon Stone (multi) */ /* SEG - from Stormfront games [Eragon (multi), Forgotten Realms: Demon Stone (multi) */
VGMSTREAM* init_vgmstream_seg(STREAMFILE* sf) { VGMSTREAM* init_vgmstream_seg(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
off_t start_offset; uint32_t start_offset, data_size;
int loop_flag, channel_count; int loop_flag, channels;
size_t data_size;
uint32_t codec; uint32_t codec;
int32_t (*read_32bit)(off_t,STREAMFILE*) = NULL; read_u32_t read_u32;
/* checks */ /* checks */
@ -19,19 +18,16 @@ VGMSTREAM* init_vgmstream_seg(STREAMFILE* sf) {
if (!check_extensions(sf, "seg")) if (!check_extensions(sf, "seg"))
goto fail; goto fail;
codec = read_32bitBE(0x04,sf); codec = read_u32be(0x04,sf);
/* 0x08: version? (2: Eragon, Spiderwick Chronicles Wii / 3: Spiderwick Chronicles X360 / 4: Spiderwick Chronicles PC) */ /* 0x08: version? (2: Eragon, Spiderwick Chronicles Wii / 3: Eragon X360, Spiderwick Chronicles X360 / 4: Spiderwick Chronicles PC) */
if (guess_endian32(0x08,sf)) { read_u32 = guess_read_u32(0x08, sf);
read_32bit = read_32bitBE;
} else {
read_32bit = read_32bitLE;
}
/* 0x0c: file size */ /* 0x0c: file size */
data_size = read_32bit(0x10, sf); /* including interleave padding */ data_size = read_u32(0x10, sf); /* including interleave padding */
/* 0x14: null */ /* 0x14: null */
loop_flag = read_32bit(0x20,sf); /* rare */ loop_flag = read_u32(0x20,sf); /* rare */
channel_count = read_32bit(0x24,sf); channels = read_u32(0x24,sf);
/* 0x28: extradata 1 entries (0x08 per entry, unknown) */ /* 0x28: extradata 1 entries (0x08 per entry, unknown) */
/* 0x2c: extradata 1 offset */ /* 0x2c: extradata 1 offset */
/* 0x30: extradata 2 entries (0x10 or 0x14 per entry, seek/hist table?) */ /* 0x30: extradata 2 entries (0x10 or 0x14 per entry, seek/hist table?) */
@ -41,12 +37,12 @@ VGMSTREAM* init_vgmstream_seg(STREAMFILE* sf) {
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag); vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->meta_type = meta_SEG; vgmstream->meta_type = meta_SEG;
vgmstream->sample_rate = read_32bit(0x18,sf); vgmstream->sample_rate = read_u32(0x18,sf);
vgmstream->num_samples = read_32bit(0x1c,sf); vgmstream->num_samples = read_u32(0x1c,sf);
if (loop_flag) { if (loop_flag) {
vgmstream->loop_start_sample = 0; vgmstream->loop_start_sample = 0;
vgmstream->loop_end_sample = vgmstream->num_samples; vgmstream->loop_end_sample = vgmstream->num_samples;
@ -86,14 +82,29 @@ VGMSTREAM* init_vgmstream_seg(STREAMFILE* sf) {
#ifdef VGM_USE_FFMPEG #ifdef VGM_USE_FFMPEG
case 0x78623300: { /* "xb3\0" */ case 0x78623300: { /* "xb3\0" */
int block_size = 0x4000; /* no apparent flag */
if (read_u32be(start_offset, sf) == 0) {
/* Eragon (PC) */
start_offset += 0x20A; /* one frame */
vgmstream->codec_data = init_ffmpeg_xma2_raw(sf, start_offset, data_size, vgmstream->num_samples, vgmstream->channels, vgmstream->sample_rate, block_size, 0); mpeg_custom_config cfg = {0};
if (!vgmstream->codec_data) goto fail;
vgmstream->coding_type = coding_FFmpeg; vgmstream->codec_data = init_mpeg_custom(sf, start_offset, &vgmstream->coding_type, channels, MPEG_STANDARD, &cfg);
vgmstream->layout_type = layout_none; if (!vgmstream->codec_data) goto fail;
vgmstream->layout_type = layout_none;
}
else {
/* The Spiderwick Chronicles (X360) */
int block_size = 0x4000;
vgmstream->codec_data = init_ffmpeg_xma2_raw(sf, start_offset, data_size, vgmstream->num_samples, vgmstream->channels, vgmstream->sample_rate, block_size, 0);
if (!vgmstream->codec_data) goto fail;
vgmstream->coding_type = coding_FFmpeg;
vgmstream->layout_type = layout_none;
xma_fix_raw_samples(vgmstream, sf, start_offset,data_size, 0, 0,0); /* samples are ok */
}
xma_fix_raw_samples(vgmstream, sf, start_offset,data_size, 0, 0,0); /* samples are ok */
break; break;
} }
#endif #endif

5
src/util/endianness.h
View File

@ -3,6 +3,7 @@
#include "../streamfile.h" #include "../streamfile.h"
#include "reader_get.h" #include "reader_get.h"
#include "reader_sf.h"
typedef uint32_t (*read_u32_t)(off_t, STREAMFILE*); typedef uint32_t (*read_u32_t)(off_t, STREAMFILE*);
typedef int32_t (*read_s32_t)(off_t, STREAMFILE*); typedef int32_t (*read_s32_t)(off_t, STREAMFILE*);
@ -25,4 +26,8 @@ static inline int guess_endian32(off_t offset, STREAMFILE* sf) {
return get_u32le(buf) > get_u32be(buf) ? 1 : 0; return get_u32le(buf) > get_u32be(buf) ? 1 : 0;
} }
static inline read_u32_t guess_read_u32(off_t offset, STREAMFILE* sf) {
return guess_endian32(0x08,sf) ? read_u32be : read_u32le;
}
#endif #endif