comparison src/madplug/decoder.c @ 959:b2fbf53360cf trunk

[svn] bug fix for #897 - make mp3 header parsing continue even if xing header is located first. - if xing header does not provide enough information to calculate average bitrate, scan_file() now calculate it from frames.

958:30e515b6e651

    int tagsize = 0;
    unsigned char buffer[BUFFER_SIZE];
    struct mad_frame frame;     /* to read xing data */
    gboolean has_xing = FALSE;
    int bitrate_frames = 0;

    mad_stream_init(&stream);
    mad_header_init(&header);
    mad_frame_init(&frame);
    xing_init(&info->xing);

                            mad_timer_multiply(&info->duration, info->frames);
                        else {
                            info->duration.seconds = info->tuple->length / 1000;
                            info->duration.fraction = info->tuple->length % 1000;
                        }
                        info->bitrate =
                            8.0 * info->xing.bytes /
                            mad_timer_count(info->duration,
                                            MAD_UNITS_SECONDS);
                        break;
                    }
                }

            }
            else {

        }
        if (stream.error != MAD_ERROR_BUFLEN)
            break;
    }

    if (info->vbr && !has_xing)
        info->bitrate = info->bitrate / bitrate_frames;

    mad_frame_finish(&frame);
    mad_header_finish(&header);
    mad_stream_finish(&stream);
    xing_finish(&info->xing);

#ifdef DEBUG
    g_message("e: scan_file");
#endif                          /* DEBUG */
    return (info->frames != 0 || info->remote == TRUE);
}

959:b2fbf53360cf

    int tagsize = 0;
    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;

    mad_stream_init(&stream);
    mad_header_init(&header);
    mad_frame_init(&frame);
    xing_init(&info->xing);

                            mad_timer_multiply(&info->duration, info->frames);
                        else {
                            info->duration.seconds = info->tuple->length / 1000;
                            info->duration.fraction = info->tuple->length % 1000;
                        }
                        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;
                    }
                }

            }
            else {

        }
        if (stream.error != MAD_ERROR_BUFLEN)
            break;
    }

    if (info->vbr && xing_bitrate == 0) {
        info->bitrate = info->bitrate / bitrate_frames;
#ifdef DEBUG
        g_message("info->bitrate = %d", info->bitrate);
#endif
    }

    mad_frame_finish(&frame);
    mad_header_finish(&header);
    mad_stream_finish(&stream);
    xing_finish(&info->xing);

#ifdef DEBUG
    g_message("scan_file: info->frames = %d", info->frames);
    g_message("e: scan_file");
#endif                          /* DEBUG */
    return (info->frames != 0 || info->remote == TRUE);
}