Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-29 19:37:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add TXTH interleave defaults for PSX/DSP/PCM16/PCM8 to simplify usage

Browse Source
This commit is contained in:
bnnm 2019-02-23 01:49:09 +01:00
parent dd31d1af33
commit e3a76d35aa
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/meta/txth.c
View File

@ -265,9 +265,9 @@ VGMSTREAM * init_vgmstream_txth(STREAMFILE *streamFile) {
/* setup adpcm */ /* setup adpcm */
if (coding == coding_AICA || coding == coding_AICA_int) { if (coding == coding_AICA || coding == coding_AICA_int) {
int i; int ch;
for (i=0;i<vgmstream->channels;i++) { for (ch = 0; ch < vgmstream->channels; ch++) {
vgmstream->ch[i].adpcm_step_index = 0x7f; vgmstream->ch[ch].adpcm_step_index = 0x7f;
} }
} }
@ -317,10 +317,12 @@ VGMSTREAM * init_vgmstream_txth(STREAMFILE *streamFile) {
goto fail; /* only 2ch+..+2ch layout is known */ goto fail; /* only 2ch+..+2ch layout is known */
} }
break; break;
case coding_NGC_DTK: case coding_NGC_DTK:
if (vgmstream->channels != 2) goto fail; if (vgmstream->channels != 2) goto fail;
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
break; break;
case coding_NGC_DSP: case coding_NGC_DSP:
if (txth.channels > 1 && txth.codec_mode == 0) { if (txth.channels > 1 && txth.codec_mode == 0) {
if (!txth.interleave) goto fail; if (!txth.interleave) goto fail;
@ -339,7 +341,7 @@ VGMSTREAM * init_vgmstream_txth(STREAMFILE *streamFile) {
} }
/* get coefs */ /* get coefs */
for (i=0;i<vgmstream->channels;i++) { for (i = 0; i < vgmstream->channels; i++) {
int16_t (*read_16bit)(off_t , STREAMFILE*) = txth.coef_big_endian ? read_16bitBE : read_16bitLE; int16_t (*read_16bit)(off_t , STREAMFILE*) = txth.coef_big_endian ? read_16bitBE : read_16bitLE;
/* normal/split coefs */ /* normal/split coefs */
@ -360,6 +362,7 @@ VGMSTREAM * init_vgmstream_txth(STREAMFILE *streamFile) {
} }
break; break;
#ifdef VGM_USE_MPEG #ifdef VGM_USE_MPEG
case coding_MPEG_layer3: case coding_MPEG_layer3:
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
@ -608,6 +611,7 @@ static int parse_keyval(STREAMFILE * streamFile_, txth_header * txth, const char
else if (0==strcmp(val,"DVI_IMA")) txth->codec = DVI_IMA; else if (0==strcmp(val,"DVI_IMA")) txth->codec = DVI_IMA;
else if (0==strcmp(val,"MPEG")) txth->codec = MPEG; else if (0==strcmp(val,"MPEG")) txth->codec = MPEG;
else if (0==strcmp(val,"IMA")) txth->codec = IMA; else if (0==strcmp(val,"IMA")) txth->codec = IMA;
else if (0==strcmp(val,"YAMAHA")) txth->codec = AICA;
else if (0==strcmp(val,"AICA")) txth->codec = AICA; else if (0==strcmp(val,"AICA")) txth->codec = AICA;
else if (0==strcmp(val,"MSADPCM")) txth->codec = MSADPCM; else if (0==strcmp(val,"MSADPCM")) txth->codec = MSADPCM;
else if (0==strcmp(val,"NGC_DSP")) txth->codec = NGC_DSP; else if (0==strcmp(val,"NGC_DSP")) txth->codec = NGC_DSP;
@ -628,6 +632,21 @@ static int parse_keyval(STREAMFILE * streamFile_, txth_header * txth, const char
else if (0==strcmp(val,"PCM4_U")) txth->codec = PCM4_U; else if (0==strcmp(val,"PCM4_U")) txth->codec = PCM4_U;
else if (0==strcmp(val,"OKI16")) txth->codec = OKI16; else if (0==strcmp(val,"OKI16")) txth->codec = OKI16;
else goto fail; else goto fail;
/* set common interleaves to simplify usage
* (do it here to in case it's overwritten later, possibly with 0 on purpose) */
if (txth->interleave == 0) {
switch(txth->codec) {
case PSX: txth->interleave = 0x10; break;
case PSX_bf: txth->interleave = 0x10; break;
case NGC_DSP: txth->interleave = 0x08; break;
case PCM16LE: txth->interleave = 0x02; break;
case PCM16BE: txth->interleave = 0x02; break;
case PCM8: txth->interleave = 0x01; break;
case PCM8_U: txth->interleave = 0x01; break;
default: break;
}
}
} }
else if (0==strcmp(key,"codec_mode")) { else if (0==strcmp(key,"codec_mode")) {
if (!parse_num(txth->streamHead,txth,val, &txth->codec_mode)) goto fail; if (!parse_num(txth->streamHead,txth,val, &txth->codec_mode)) goto fail;