audlegacy-plugins: src/madplug/decoder.c comparison

comparison src/madplug/decoder.c @ 980:6ba4a4bfd127 trunk

[svn] - fix overflow when calculates bitrate with non-fast scan on a huge sized file. - make file info dialog always do non-fast scan. user can easily add TLEN tag of correct play time length to a VBR encoded file which does not go along with fast scan. - tweak debug output.

author	yaz
date	Thu, 26 Apr 2007 02:06:12 -0700
parents	b2fbf53360cf
children	e46b98155d5d

comparison

equal deleted inserted replaced

-:e31c4566feb6
+:6ba4a4bfd127
 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;
+double accum_bitrate = 0.0;
 mad_stream_init(&stream);
+mad_stream_options(&stream, 0); // check CRC
 mad_header_init(&header);
 mad_frame_init(&frame);
 xing_init(&info->xing);
 info->bitrate = 0;
 len = input_get_data(info, buffer + remainder,
 BUFFER_SIZE - remainder);
 if (len <= 0) {
 #ifdef DEBUG
-g_message("scan_file: len <= 0! len = %d", len);
+g_message("scan_file: len <= 0 len = %d", len);
 #endif
 break;
 }
 mad_stream_buffer(&stream, buffer, len + remainder);
 }
 info->frames++;
 #ifdef DEBUG
 #ifdef DEBUG_INTENSIVELY
-g_message("duration = %lu",
+g_message("header bitrate = %ld", header.bitrate);
+g_message("duration = %ul",
 mad_timer_count(header.duration,
 MAD_UNITS_MILLISECONDS));
 g_message("size = %d", stream.next_frame - stream.this_frame);
 #endif
 #endif
 #ifdef DEBUG
 g_message("xing frame decode failed");
 #endif
 goto no_xing;
 }
-if (xing_parse
+if (xing_parse(&info->xing, stream.anc_ptr, stream.anc_bitlen) == 0) {
-(&info->xing, stream.anc_ptr,
+#ifdef DEBUG
-stream.anc_bitlen) == 0) {
+g_message("xing header found ");
-#ifdef DEBUG
-g_message("found xing header");
 #endif                          /* DEBUG */
 has_xing = TRUE;
 info->vbr = TRUE;   /* otherwise xing header would have been 'Info' */
 info->frames = info->xing.frames;
 if(info->tuple->length == -1)
 mad_timer_multiply(&info->duration, info->frames);
 else {
 info->duration.seconds = info->tuple->length / 1000;
 info->duration.fraction = info->tuple->length % 1000;
 }
+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_timer_count(info->duration, MAD_UNITS_SECONDS);
-MAD_UNITS_SECONDS);
+#ifdef DEBUG
-#ifdef DEBUG
+g_message("xing bitrate = %d", xing_bitrate);
-g_message("xing: bitrate = %d", xing_bitrate);
 #endif
 continue;
 }
-}
+#ifdef DEBUG
+else {
+g_message("xing header parsing failed");
+continue;
+}
+#endif
+} /* xing */
 }
 else {
-/* perhaps we have a VRB file */
+/* perhaps we have a VBR file */
 if (info->bitrate != header.bitrate)
 info->vbr = TRUE;
 if (info->vbr) {
-info->bitrate += header.bitrate;
+accum_bitrate += (double)header.bitrate;
 bitrate_frames++;
 }
 /* check for changin layer/samplerate/channels */
 if (info->mpeg_layer != header.layer)
 g_warning("layer varies!!");
 }
 no_xing:
 if (fast && info->frames >= N_AVERAGE_FRAMES) {
 float frame_size = ((double) data_used) / N_AVERAGE_FRAMES;
 #ifdef DEBUG
-g_message("info->frames = %d info->size = %d tagsize = %d frame_size = %lf",
+g_message("bitrate = %ld samplerate = %d", header.bitrate, header.samplerate);
-info->frames, info->size, tagsize, frame_size);
+g_message("data_used = %d info->frames = %d info->size = %d tagsize = %d frame_size = %lf",
+data_used, info->frames, info->size, tagsize, frame_size);
 #endif
 if(info->size != 0)
 info->frames = (info->size - tagsize) / frame_size;
 #ifdef DEBUG
 g_message("info->frames = %d", info->frames);
 data_used, tagsize, frame_size);
 g_message("frames = %d, frequency = %d, channels = %d",
 info->frames, info->freq, info->channels);
 long millis = mad_timer_count(info->duration,
 MAD_UNITS_MILLISECONDS);
-g_message("duration = %lu:%lu", millis / 1000 / 60,
+g_message("duration = %ld:%02ld", millis / 1000 / 60, (millis / 1000) % 60);
-(millis / 1000) % 60);
 #endif                          /* DEBUG */
 break;
 }
-}
+} /* while */
 if (stream.error != MAD_ERROR_BUFLEN)
 break;
 }
-if (info->vbr && xing_bitrate == 0) {
+if (info->vbr && xing_bitrate != 0) {
-info->bitrate = info->bitrate / bitrate_frames;
+info->bitrate = xing_bitrate;
-#ifdef DEBUG
+}
-g_message("info->bitrate = %d", info->bitrate);
+else if (info->vbr && xing_bitrate == 0 && bitrate_frames != 0) {
-#endif
+info->bitrate = accum_bitrate / bitrate_frames;
 }
 mad_frame_finish(&frame);
 mad_header_finish(&header);
 mad_stream_finish(&stream);
 g_message("e: scan_file");
 #endif                          /* DEBUG */
 return (info->frames != 0 || info->remote == TRUE);
 }
-// sanity check for audio open parameters
+/* sanity check for audio open parameters */
 static gboolean check_audio_param(struct mad_info_t *info)
 {
 if(info->fmt < FMT_U8 || info->fmt > FMT_S16_NE)
 return FALSE;
 if(info->freq < 0) // not sure about maximum frequency. --yaz

Mercurial > audlegacy-plugins

comparison src/madplug/decoder.c @ 980:6ba4a4bfd127 trunk