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

Fix describe_vgmstream with layered_layout + FFmpeg

Browse Source
This commit is contained in:
bnnm 2018-08-25 12:22:40 +02:00
parent 8cf27cc15e
commit d8758f0cb5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vgmstream.c
View File

@ -2249,7 +2249,13 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
#ifdef VGM_USE_FFMPEG #ifdef VGM_USE_FFMPEG
case coding_FFmpeg: { case coding_FFmpeg: {
ffmpeg_codec_data *data = (ffmpeg_codec_data *)vgmstream->codec_data; ffmpeg_codec_data *data = (ffmpeg_codec_data *)vgmstream->codec_data;
if (vgmstream->codec_data) { if (!data && vgmstream->layout_data) {
layered_layout_data* layout_data = vgmstream->layout_data;
if (layout_data->layers[0]->coding_type == coding_FFmpeg)
data = layout_data->layers[0]->codec_data;
}
if (data) {
if (data->codec && data->codec->long_name) { if (data->codec && data->codec->long_name) {
snprintf(temp,TEMPSIZE,"%s",data->codec->long_name); snprintf(temp,TEMPSIZE,"%s",data->codec->long_name);
} else if (data->codec && data->codec->name) { } else if (data->codec && data->codec->name) {
@ -2289,7 +2295,7 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
"\n"); "\n");
concatn(length,desc,temp); concatn(length,desc,temp);
if (vgmstream->layout_type == layout_interleave) { if (vgmstream->layout_type == layout_interleave && vgmstream->channels > 1) {
snprintf(temp,TEMPSIZE, snprintf(temp,TEMPSIZE,
"interleave: %#x bytes\n", "interleave: %#x bytes\n",
(int32_t)vgmstream->interleave_block_size); (int32_t)vgmstream->interleave_block_size);
@ -2303,7 +2309,7 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
} }
} }
/* codecs with blocks + headers (there are more, this is a start) */ /* codecs with configurable frame size */
if (vgmstream->layout_type == layout_none && vgmstream->interleave_block_size > 0) { if (vgmstream->layout_type == layout_none && vgmstream->interleave_block_size > 0) {
switch (vgmstream->coding_type) { switch (vgmstream->coding_type) {
case coding_MSADPCM: case coding_MSADPCM:
@ -2312,8 +2318,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
case coding_MC3: case coding_MC3:
case coding_WWISE_IMA: case coding_WWISE_IMA:
case coding_REF_IMA: case coding_REF_IMA:
case coding_PSX_cfg:
snprintf(temp,TEMPSIZE, snprintf(temp,TEMPSIZE,
"block size: %#x bytes\n", "frame size: %#x bytes\n",
(int32_t)vgmstream->interleave_block_size); (int32_t)vgmstream->interleave_block_size);
concatn(length,desc,temp); concatn(length,desc,temp);
break; break;