Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-12-01 01:27:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some Ubi Lyn with Ogg [Rabbids Go Home (PC)]

Browse Source
This commit is contained in:
bnnm 2021-12-18 12:18:22 +01:00
parent 45f14a8a7b
commit 599004276f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meta/ubi_lyn.c
View File

@ -139,15 +139,19 @@ VGMSTREAM* init_vgmstream_ubi_lyn(STREAMFILE* sf) {
break; break;
#ifdef VGM_USE_VORBIS #ifdef VGM_USE_VORBIS
case 0x3157: { /* Ogg (PC), interleaved 1ch */ case 0x3156: /* Ogg (PC), interleaved 1ch (older version) [Rabbids Go Home (PC)] */
case 0x3157: { /* Ogg (PC), interleaved 1ch (newer version) [Adventures of Tintin (PC)] */
size_t interleave_size; size_t interleave_size;
layered_layout_data* data = NULL; layered_layout_data* data = NULL;
int i; int i;
if (read_u32le(start_offset+0x00,sf) != 1) /* id? */ if (codec == 0x3157) {
goto fail; if (read_u32le(start_offset+0x00,sf) != 1) /* id? */
goto fail;
start_offset += 0x04;
}
interleave_size = read_u32le(start_offset+0x04,sf); interleave_size = read_u32le(start_offset+0x00,sf);
/* interleave is adjusted so there is no smaller last block, it seems */ /* interleave is adjusted so there is no smaller last block, it seems */
vgmstream->coding_type = coding_OGG_VORBIS; vgmstream->coding_type = coding_OGG_VORBIS;
@ -161,8 +165,8 @@ VGMSTREAM* init_vgmstream_ubi_lyn(STREAMFILE* sf) {
/* open each layer subfile */ /* open each layer subfile */
for (i = 0; i < channels; i++) { for (i = 0; i < channels; i++) {
STREAMFILE* temp_sf = NULL; STREAMFILE* temp_sf = NULL;
size_t logical_size = read_u32le(start_offset+0x08 + 0x04*i,sf); size_t logical_size = read_u32le(start_offset+0x04 + 0x04*i,sf);
off_t layer_offset = start_offset + 0x08 + 0x04*channels; //+ interleave_size*i; off_t layer_offset = start_offset + 0x04 + 0x04*channels;
temp_sf = setup_ubi_lyn_streamfile(sf, layer_offset, interleave_size, i, channels, logical_size); temp_sf = setup_ubi_lyn_streamfile(sf, layer_offset, interleave_size, i, channels, logical_size);
if (!temp_sf) goto fail; if (!temp_sf) goto fail;