Fix some Switch .bfwav interleave/panning; cleanup

This commit is contained in:
bnnm 2018-04-18 20:10:48 +02:00
parent e8aad5a38a
commit adc7a776f9

View File

@ -1,145 +1,133 @@
#include "meta.h" #include "meta.h"
#include "../util.h" #include "../coding/coding.h"
/* FWAV - Nintendo streams */
VGMSTREAM * init_vgmstream_bfwav(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_bfwav(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
char filename[PATH_LIMIT]; off_t start_offset;
off_t info_offset, data_offset;
coding_t coding_type; int channel_count, loop_flag, codec;
coding_t coding_PCM16; int big_endian;
size_t interleave = 0;
int32_t (*read_32bit)(off_t,STREAMFILE*) = NULL; int32_t (*read_32bit)(off_t,STREAMFILE*) = NULL;
int16_t (*read_16bit)(off_t,STREAMFILE*) = NULL; int16_t (*read_16bit)(off_t,STREAMFILE*) = NULL;
/*int ima = 0;*/
int nsmbu_flag = 0; int nsmbu_flag = 0;
off_t data_offset;
off_t head_offset;
int codec_number;
int channel_count;
int loop_flag;
off_t start_offset; /* checks */
/* .bfwavnsmbu: fake extension to detect New Super Mario Bros U files with weird sample rate */
/* check extension, case insensitive */ if (!check_extensions(streamFile, "bfwav,fwav,bfwavnsmbu"))
streamFile->get_name(streamFile, filename, sizeof(filename));
if (strcasecmp("bfwav", filename_extension(filename)) && strcasecmp("fwav", filename_extension(filename))) {
if (strcasecmp("bfwavnsmbu",filename_extension(filename))) goto fail;
else nsmbu_flag = 1;
}
/* check header */
if ((uint32_t)read_32bitBE(0, streamFile) != 0x46574156) /* "FWAV" */
goto fail; goto fail;
nsmbu_flag = check_extensions(streamFile, "bfwavnsmbu");
if ((uint16_t)read_16bitBE(4, streamFile) == 0xFEFF) { /* endian marker (BE most common) */ /* FWAV header */
if (read_32bitBE(0x00, streamFile) != 0x46574156) /* "FWAV" */
goto fail;
/* 0x06(2): header size (0x40), 0x08: version (0x00010200), 0x0c: file size 0x10(2): sections (2) */
if ((uint16_t)read_16bitBE(0x04, streamFile) == 0xFEFF) { /* BE BOM check */
read_32bit = read_32bitBE; read_32bit = read_32bitBE;
read_16bit = read_16bitBE; read_16bit = read_16bitBE;
coding_PCM16 = coding_PCM16BE; big_endian = 1;
} else if ((uint16_t)read_16bitBE(4, streamFile) == 0xFFFE) { /* LE endian marker */ } else if ((uint16_t)read_16bitBE(0x04, streamFile) == 0xFFFE) { /* LE BOM check */
read_32bit = read_32bitLE; read_32bit = read_32bitLE;
read_16bit = read_16bitLE; read_16bit = read_16bitLE;
coding_PCM16 = coding_PCM16LE; big_endian = 0;
} else { } else {
goto fail; goto fail;
} }
/* get head offset, check */ info_offset = read_32bit(0x18, streamFile); /* 0x14(2): info mark (0x7000), 0x1c: info size */
head_offset = read_32bit(0x18, streamFile); data_offset = read_32bit(0x24, streamFile); /* 0x20(2): data mark (0x7001), 0x28: data size */
data_offset = read_32bit(0x24, streamFile);
if ((uint32_t)read_32bitBE(head_offset, streamFile) != 0x494E464F) /* "INFO" (FWAV)*/ /* INFO section */
if (read_32bitBE(info_offset, streamFile) != 0x494E464F) /* "INFO" */
goto fail; goto fail;
codec = read_8bit(info_offset + 0x08, streamFile);
loop_flag = read_8bit(info_offset + 0x09, streamFile);
channel_count = read_32bit(info_offset + 0x1C, streamFile);
/* parse channel table */
{
off_t channel1_info, data_start;
int i;
/* check type details */ channel1_info = info_offset + 0x1c + read_32bit(info_offset+0x20+0x08*0+0x04, streamFile);
codec_number = read_8bit(head_offset + 0x8, streamFile); data_start = read_32bit(channel1_info+0x04, streamFile); /* within "DATA" after 0x08 */
loop_flag = read_8bit(head_offset + 0x9, streamFile);
channel_count = read_32bit(head_offset + 0x1C, streamFile);
switch (codec_number) { /* channels use absolute offsets but should be ok as interleave */
case 0: interleave = 0;
coding_type = coding_PCM8; if (channel_count > 1) {
break; off_t channel2_info = info_offset + 0x1c + read_32bit(info_offset+0x20+0x08*1+0x04, streamFile);
case 1: interleave = read_32bit(channel2_info+0x04, streamFile) - data_start;
coding_type = coding_PCM16; }
break;
case 2: start_offset = data_offset + 0x08 + data_start;
coding_type = coding_NGC_DSP;
break; /* validate all channels just in case of multichannel with non-constant interleave */
default: for (i = 0; i < channel_count; i++) {
goto fail; /* channel table, 0x00: flag (0x7100), 0x04: channel info offset */
off_t channel_info = info_offset + 0x1c + read_32bit(info_offset+0x20+0x08*i+0x04, streamFile);
/* channel info, 0x00(2): flag (0x1f00), 0x04: offset, 0x08(2): ADPCM flag (0x0300), 0x0c: ADPCM offset */
if ((uint16_t)read_16bit(channel_info+0x00, streamFile) != 0x1F00)
goto fail;
if (read_32bit(channel_info+0x04, streamFile) != data_start + interleave*i)
goto fail;
}
} }
if (channel_count < 1) goto fail;
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count, loop_flag); vgmstream = allocate_vgmstream(channel_count, loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
/* fill in the vital statistics */ vgmstream->sample_rate = read_32bit(info_offset + 0x0C, streamFile);
vgmstream->num_samples = read_32bit(head_offset + 0x14, streamFile);
if (nsmbu_flag) if (nsmbu_flag)
vgmstream->sample_rate = 16000; vgmstream->sample_rate = 16000;
else
vgmstream->sample_rate = (uint16_t)read_32bit(head_offset + 0xC, streamFile);
/* channels and loop flag are set by allocate_vgmstream */
vgmstream->loop_start_sample = read_32bit(head_offset + 0x10, streamFile); vgmstream->num_samples = read_32bit(info_offset + 0x14, streamFile);
vgmstream->loop_start_sample = read_32bit(info_offset + 0x10, streamFile);
vgmstream->loop_end_sample = vgmstream->num_samples; vgmstream->loop_end_sample = vgmstream->num_samples;
vgmstream->coding_type = coding_type;
if (channel_count == 1)
vgmstream->layout_type = layout_none;
else
vgmstream->layout_type = layout_interleave;
vgmstream->meta_type = meta_FWAV; vgmstream->meta_type = meta_FWAV;
vgmstream->layout_type = (channel_count == 1) ? layout_none : layout_interleave;
vgmstream->interleave_block_size = interleave;
vgmstream->interleave_block_size = read_32bit(read_32bit(0x6c, streamFile) + 0x60, streamFile) - 0x18; switch (codec) {
case 0x00:
vgmstream->coding_type = coding_PCM8;
break;
case 0x01:
vgmstream->coding_type = big_endian ? coding_PCM16BE : coding_PCM16LE;
break;
start_offset = data_offset + 0x20; case 0x02:
vgmstream->coding_type = coding_NGC_DSP;
if (vgmstream->coding_type == coding_NGC_DSP) {
int i, j;
for (j = 0; j<vgmstream->channels; j++) {
for (i = 0; i<16; i++) {
off_t coeffheader = head_offset + 0x1C + read_32bit(head_offset + 0x24 + (j*8), streamFile);
off_t coef_offset;
if ((uint32_t)read_16bit(coeffheader, streamFile) != 0x1F00) goto fail;
coef_offset = read_32bit(coeffheader + 0xC, streamFile) + coeffheader;
vgmstream->ch[j].adpcm_coef[i] = read_16bit(coef_offset + i * 2, streamFile);
}
}
}
/* open the file for reading by each channel */
{ {
int i; int i, c;
for (i = 0; i<channel_count; i++) { off_t coef_header, coef_offset;
if (vgmstream->layout_type == layout_interleave)
vgmstream->ch[i].streamfile = streamFile->open(streamFile, filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
else
vgmstream->ch[i].streamfile = streamFile->open(streamFile, filename,0x1000);
if (!vgmstream->ch[i].streamfile) goto fail; for (i = 0; i < vgmstream->channels; i++) {
for (c = 0; c < 16; c++) {
vgmstream->ch[i].channel_start_offset = coef_header = info_offset + 0x1C + read_32bit(info_offset + 0x24 + (i*0x08), streamFile);
vgmstream->ch[i].offset = coef_offset = read_32bit(coef_header + 0x0c, streamFile) + coef_header;
start_offset + i*vgmstream->interleave_block_size; vgmstream->ch[i].adpcm_coef[c] = read_16bit(coef_offset + c*2, streamFile);
} }
} }
}
break;
default: /* 0x03: IMA? */
goto fail;
}
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
goto fail;
return vgmstream; return vgmstream;
/* clean up anything we may have opened */
fail: fail:
if (vgmstream) close_vgmstream(vgmstream); close_vgmstream(vgmstream);
return NULL; return NULL;
} }