Mercurial > audlegacy-plugins
changeset 1162:29519d604e8c trunk
[svn] - revise bitrate calculation with xing header. if number of bytes and number of frames are available in xing header, fast play time calculation yields almost appropriate duration upon a vbr file.
- now fileinfo dialog shows duration in MM:SS format.
| author | yaz |
|---|---|
| date | Mon, 04 Jun 2007 07:46:52 -0700 |
| parents | 1ba0d3500f3c |
| children | b5a61440bfe8 |
| files | ChangeLog src/madplug/decoder.c src/madplug/fileinfo.c |
| diffstat | 3 files changed, 40 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jun 03 16:54:43 2007 -0700 +++ b/ChangeLog Mon Jun 04 07:46:52 2007 -0700 @@ -1,3 +1,10 @@ +2007-06-03 23:54:43 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [2488] + Implicit declarations are bad, hmmkay? + trunk/src/lastfm/lastfm.c | 1 + + 1 file changed, 1 insertion(+) + + 2007-06-03 18:20:23 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [2486] - add a check for file existence to fileinfo dialog. closes #941.
--- a/src/madplug/decoder.c Sun Jun 03 16:54:43 2007 -0700 +++ b/src/madplug/decoder.c Mon Jun 04 07:46:52 2007 -0700 @@ -177,8 +177,8 @@ unsigned char buffer[BUFFER_SIZE]; struct mad_frame frame; /* to read xing data */ gboolean has_xing = FALSE; - int bitrate_frames = 0; - guint xing_bitrate = 0; + guint bitrate_frames = 0; + double xing_bitrate = 0.0; double accum_bitrate = 0.0; mad_stream_init(&stream); @@ -299,29 +299,26 @@ #endif /* DEBUG */ has_xing = TRUE; info->vbr = TRUE; /* otherwise xing header would have been 'Info' */ - if(info->tuple->length == -1) { - info->duration = mad_timer_zero; - mad_timer_multiply(&info->duration, info->xing.frames); - } - else { - info->duration.seconds = info->tuple->length / 1000; - info->duration.fraction = info->tuple->length % 1000; + +#ifdef DEBUG + g_message("xing: bytes = %ld frames = %ld", info->xing.bytes, info->xing.frames); +#endif + /* we have enough info to calculate bitrate and duration */ + if(info->xing.bytes && info->xing.frames) { + xing_bitrate = 8 * (double)info->xing.bytes * 38 / (double)info->xing.frames; //38fps in MPEG1. +#ifdef DEBUG + { + gint tmp = (gint)(info->xing.bytes * 8 / xing_bitrate); + g_message("xing: bitrate = %4.1f kbps", xing_bitrate / 1000); + g_message("xing: duration = %d:%02d", tmp / 60, tmp % 60); + } +#endif } - - g_message("xing: bytes = %ld frames = %ld", info->xing.bytes, info->xing.frames); - g_message("info->duration = %ld", info->duration.seconds); - g_message("mad_timer_count = %ld", mad_timer_count(info->duration, MAD_UNITS_SECONDS)); - xing_bitrate = - 8.0 * info->xing.bytes / - mad_timer_count(info->duration, MAD_UNITS_SECONDS); -#ifdef DEBUG - g_message("xing bitrate = %d", xing_bitrate); -#endif continue; } #ifdef DEBUG else { - g_message("xing header parsing failed"); + g_message("no usable xing header"); continue; } @@ -359,9 +356,17 @@ g_message("info->frames = %d", info->frames); #endif if(info->tuple->length == -1) { - info->duration.seconds /= N_AVERAGE_FRAMES; - info->duration.fraction /= N_AVERAGE_FRAMES; - mad_timer_multiply(&info->duration, info->frames); + if(xing_bitrate > 0.0) { + /* calc duration with xing info */ + double tmp = 8 * (double)info->xing.bytes * 1000 / xing_bitrate; + info->duration.seconds = (guint)(tmp / 1000); + info->duration.fraction = (guint)(tmp - info->duration.seconds * 1000); + } + else { + info->duration.seconds /= N_AVERAGE_FRAMES; + info->duration.fraction /= N_AVERAGE_FRAMES; + mad_timer_multiply(&info->duration, info->frames); + } } else { info->duration.seconds = info->tuple->length / 1000; @@ -388,7 +393,7 @@ info->frames = info->xing.frames; if (info->vbr && xing_bitrate != 0) { - info->bitrate = xing_bitrate; + info->bitrate = (guint)xing_bitrate; } else if (info->vbr && xing_bitrate == 0 && bitrate_frames != 0) { info->bitrate = accum_bitrate / bitrate_frames;
--- a/src/madplug/fileinfo.c Sun Jun 03 16:54:43 2007 -0700 +++ b/src/madplug/fileinfo.c Mon Jun 04 07:46:52 2007 -0700 @@ -643,8 +643,10 @@ gtk_label_set_text(GTK_LABEL(mpeg_frames), ""); } gtk_label_set_text(GTK_LABEL(mpeg_flags), mode_str[info.mode]); - snprintf(message, 127, "%ld seconds", - mad_timer_count(info.duration, MAD_UNITS_SECONDS)); + { + guint sec = mad_timer_count(info.duration, MAD_UNITS_SECONDS); + snprintf(message, 127, "%d:%02d (%d seconds)", sec /60 ,sec % 60, sec); + } gtk_label_set_text(GTK_LABEL(mpeg_duration), message); if (info.replaygain_album_str != NULL) {