Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-31 04:13:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify get_vgmstream_average_bitrate a bit

Browse Source 
removed get_vgmstream_average_bitrate_channel_streamfile since it
doesn't really matter if codec_data streamfiles are retested multiple
times (just like vgmstream streamfiles are)
This commit is contained in:
bnnm 2018-09-09 16:28:39 +02:00
parent 6bee2a6209
commit fd7d6f513d
1 changed files with 31 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/vgmstream.c
View File

@ -2485,79 +2485,42 @@ fail:
return; return;
} }
/* average bitrate helper */ /* average bitrate helper to get STREAMFILE for a channel, since some codecs may use their own */
static int get_vgmstream_average_bitrate_channel_count(VGMSTREAM * vgmstream) static STREAMFILE * get_vgmstream_average_bitrate_channel_streamfile(VGMSTREAM * vgmstream, int channel) {
{
//AAX, AIX, ACM?
if (vgmstream->layout_type==layout_layered) {
layered_layout_data *data = (layered_layout_data *) vgmstream->layout_data;
return (data) ? data->layer_count : 0;
}
#ifdef VGM_USE_VORBIS
if (vgmstream->coding_type==coding_OGG_VORBIS) {
ogg_vorbis_codec_data *data = (ogg_vorbis_codec_data *) vgmstream->codec_data;
return (data) ? 1 : 0;
}
#endif
if (vgmstream->coding_type==coding_CRI_HCA) {
hca_codec_data *data = (hca_codec_data *) vgmstream->codec_data;
return (data) ? 1 : 0;
}
#ifdef VGM_USE_FFMPEG
if (vgmstream->coding_type==coding_FFmpeg) {
ffmpeg_codec_data *data = (ffmpeg_codec_data *) vgmstream->codec_data;
return (data) ? 1 : 0;
}
#endif
#if defined(VGM_USE_MP4V2) && defined(VGM_USE_FDKAAC)
if (vgmstream->coding_type==coding_MP4_AAC) {
mp4_aac_codec_data *data = (mp4_aac_codec_data *) vgmstream->codec_data;
return (data) ? 1 : 0;
}
#endif
return vgmstream->channels;
}
/* average bitrate helper */
static STREAMFILE * get_vgmstream_average_bitrate_channel_streamfile(VGMSTREAM * vgmstream, int channel)
{
//AAX, AIX?
if (vgmstream->coding_type==coding_NWA) { if (vgmstream->coding_type==coding_NWA) {
nwa_codec_data *data = (nwa_codec_data *) vgmstream->codec_data; nwa_codec_data *data = vgmstream->codec_data;
if (data && data->nwa) return (data && data->nwa) ? data->nwa->file : NULL;
return data->nwa->file;
} }
if (vgmstream->coding_type==coding_ACM) { if (vgmstream->coding_type==coding_ACM) {
acm_codec_data *data = (acm_codec_data *) vgmstream->codec_data; acm_codec_data *data = vgmstream->codec_data;
if (data && data->handle) return (data && data->handle) ? data->streamfile : NULL;
return data->streamfile;
} }
#ifdef VGM_USE_VORBIS #ifdef VGM_USE_VORBIS
if (vgmstream->coding_type==coding_OGG_VORBIS) { if (vgmstream->coding_type==coding_OGG_VORBIS) {
ogg_vorbis_codec_data *data = (ogg_vorbis_codec_data *) vgmstream->codec_data; ogg_vorbis_codec_data *data = vgmstream->codec_data;
return data->ov_streamfile.streamfile; return data ? data->ov_streamfile.streamfile : NULL;
} }
#endif #endif
if (vgmstream->coding_type==coding_CRI_HCA) { if (vgmstream->coding_type==coding_CRI_HCA) {
hca_codec_data *data = (hca_codec_data *) vgmstream->codec_data; hca_codec_data *data = vgmstream->codec_data;
return data->streamfile; return data ? data->streamfile : NULL;
} }
#ifdef VGM_USE_FFMPEG #ifdef VGM_USE_FFMPEG
if (vgmstream->coding_type==coding_FFmpeg) { if (vgmstream->coding_type==coding_FFmpeg) {
ffmpeg_codec_data *data = (ffmpeg_codec_data *) vgmstream->codec_data; ffmpeg_codec_data *data = vgmstream->codec_data;
return data->streamfile; return data ? data->streamfile : NULL;
} }
#endif #endif
#if defined(VGM_USE_MP4V2) && defined(VGM_USE_FDKAAC) #if defined(VGM_USE_MP4V2) && defined(VGM_USE_FDKAAC)
if (vgmstream->coding_type==coding_MP4_AAC) { if (vgmstream->coding_type==coding_MP4_AAC) {
mp4_aac_codec_data *data = (mp4_aac_codec_data *) vgmstream->codec_data; mp4_aac_codec_data *data = vgmstream->codec_data;
return data->if_file.streamfile; return data ? data->if_file.streamfile : NULL;
} }
#endif #endif
return vgmstream->ch[channel].streamfile; return vgmstream->ch[channel].streamfile;
} }
@ -2577,10 +2540,9 @@ int get_vgmstream_average_bitrate(VGMSTREAM * vgmstream) {
int bitrate = 0; int bitrate = 0;
int sample_rate = vgmstream->sample_rate; int sample_rate = vgmstream->sample_rate;
int length_samples = vgmstream->num_samples; int length_samples = vgmstream->num_samples;
int channels; int channels = vgmstream->channels;
STREAMFILE * streamFile;
if (!sample_rate || !length_samples) if (!sample_rate || !length_samples || !channels)
return 0; return 0;
/* subsongs need to report this to properly calculate */ /* subsongs need to report this to properly calculate */
@ -2599,33 +2561,24 @@ int get_vgmstream_average_bitrate(VGMSTREAM * vgmstream) {
return get_vgmstream_average_bitrate(data->layers[0]); return get_vgmstream_average_bitrate(data->layers[0]);
} }
/* compares files by absolute paths, so bitrate doesn't multiply when the same STREAMFILE is reopened per channel */
for (i = 0; i < channels; i++) {
STREAMFILE * currentFile = get_vgmstream_average_bitrate_channel_streamfile(vgmstream, i);
if (!currentFile) continue;
get_streamfile_name(currentFile, path_current, sizeof(path_current));
channels = get_vgmstream_average_bitrate_channel_count(vgmstream); for (j = 0; j < i; j++) {
if (!channels) return 0;
if (channels >= 1) {
streamFile = get_vgmstream_average_bitrate_channel_streamfile(vgmstream, 0);
if (streamFile) {
bitrate += get_vgmstream_average_bitrate_from_streamfile(streamFile, sample_rate, length_samples);
}
}
/* Compares files by absolute paths, so bitrate doesn't multiply when the same STREAMFILE is reopened per channel */
for (i = 1; i < channels; ++i) {
streamFile = get_vgmstream_average_bitrate_channel_streamfile(vgmstream, i);
if (!streamFile)
continue;
streamFile->get_name(streamFile, path_current, sizeof(path_current));
for (j = 0; j < i; ++j) {
STREAMFILE * compareFile = get_vgmstream_average_bitrate_channel_streamfile(vgmstream, j); STREAMFILE * compareFile = get_vgmstream_average_bitrate_channel_streamfile(vgmstream, j);
if (!compareFile) if (!compareFile) continue;
continue; get_streamfile_name(compareFile, path_compare, sizeof(path_compare));
streamFile->get_name(compareFile, path_compare, sizeof(path_compare));
if (!strcmp(path_current, path_compare)) if (strcmp(path_current, path_compare) != 0)
break; break;
} }
if (j == i)
bitrate += get_vgmstream_average_bitrate_from_streamfile(streamFile, sample_rate, length_samples); if (j == i) { /* current STREAMFILE hasn't appeared in a previous channel */
bitrate += get_vgmstream_average_bitrate_from_streamfile(currentFile, sample_rate, length_samples);
}
} }
return bitrate; return bitrate;