Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-15 02:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add PCM24 .wav [Omori (PC)]

Browse Source
This commit is contained in:
bnnm 2021-11-12 18:45:18 +01:00
parent da91874dca
commit 64abb33fd7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/meta/riff.c
View File

@ -131,6 +131,9 @@ static int read_fmt(int big_endian, STREAMFILE* sf, off_t offset, riff_fmt_chunk
} }
} }
if (!fmt->channels)
goto fail;
switch (fmt->codec) { switch (fmt->codec) {
case 0x00: /* Yamaha AICA ADPCM [Headhunter (DC), Bomber hehhe (DC), Rayman 2 (DC)] (unofficial) */ case 0x00: /* Yamaha AICA ADPCM [Headhunter (DC), Bomber hehhe (DC), Rayman 2 (DC)] (unofficial) */
if (fmt->bps != 4) goto fail; if (fmt->bps != 4) goto fail;
@ -142,17 +145,19 @@ static int read_fmt(int big_endian, STREAMFILE* sf, off_t offset, riff_fmt_chunk
case 0x01: /* PCM */ case 0x01: /* PCM */
switch (fmt->bps) { switch (fmt->bps) {
case 24: /* Omori (PC) */
fmt->coding_type = coding_PCM24LE;
break;
case 16: case 16:
fmt->coding_type = big_endian ? coding_PCM16BE : coding_PCM16LE; fmt->coding_type = big_endian ? coding_PCM16BE : coding_PCM16LE;
fmt->interleave = 0x02;
break; break;
case 8: case 8:
fmt->coding_type = coding_PCM8_U; fmt->coding_type = coding_PCM8_U;
fmt->interleave = 0x01;
break; break;
default: default:
goto fail; goto fail;
} }
fmt->interleave = fmt->block_size / fmt->channels;
break; break;
case 0x02: /* MSADPCM */ case 0x02: /* MSADPCM */
@ -666,12 +671,10 @@ VGMSTREAM* init_vgmstream_riff(STREAMFILE* sf) {
/* samples, codec init (after setting coding to ensure proper close on failure) */ /* samples, codec init (after setting coding to ensure proper close on failure) */
switch (fmt.coding_type) { switch (fmt.coding_type) {
case coding_PCM24LE:
case coding_PCM16LE: case coding_PCM16LE:
vgmstream->num_samples = pcm_bytes_to_samples(data_size, fmt.channels, 16);
break;
case coding_PCM8_U: case coding_PCM8_U:
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, 8); vgmstream->num_samples = pcm_bytes_to_samples(data_size, fmt.channels, fmt.bps);
break; break;
case coding_L5_555: case coding_L5_555:
@ -1068,10 +1071,8 @@ VGMSTREAM* init_vgmstream_rifx(STREAMFILE* sf) {
/* init, samples */ /* init, samples */
switch (fmt.coding_type) { switch (fmt.coding_type) {
case coding_PCM16BE: case coding_PCM16BE:
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, 16);
break;
case coding_PCM8_U: case coding_PCM8_U:
vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, 8); vgmstream->num_samples = pcm_bytes_to_samples(data_size, vgmstream->channels, fmt.bps);
break; break;
default: default:
goto fail; goto fail;