diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-03-27 16:27:54 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-03-27 16:27:54 +0100 |
| commit | 6a0f3535d169b0f3829eb05708c3ca789f8ccbea (patch) | |
| tree | 5e9a831194e46a36aeb5fd777bb3b88235bbbd43 /plugins/mpgmad | |
| parent | 2ad5c3934b401b764bbbcf55cd994308c4bd2756 (diff) | |
added workaround for bad xing/lame header
Diffstat (limited to 'plugins/mpgmad')
| -rw-r--r-- | plugins/mpgmad/mpgmad.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/mpgmad/mpgmad.c b/plugins/mpgmad/mpgmad.c index df68ba12..cb271883 100644 --- a/plugins/mpgmad/mpgmad.c +++ b/plugins/mpgmad/mpgmad.c @@ -396,8 +396,12 @@ cmp3_scan_stream (buffer_t *buffer, int sample) { } uint32_t nframes = extract_i32 (buf); buffer->duration = (float)nframes * (float)samples_per_frame / (float)samplerate; + trace ("xing totalsamples: %d, nframes: %d, samples_per_frame: %d\n", nframes*samples_per_frame, nframes, samples_per_frame); + if (nframes <= 0 || samples_per_frame <= 0) { + trace ("bad xing header\n"); + continue; + } buffer->totalsamples = nframes * samples_per_frame; - trace ("xing totalsamples: %d\n", buffer->totalsamples); buffer->samplerate = samplerate; } if (flags & BYTES_FLAG) { @@ -451,10 +455,10 @@ cmp3_scan_stream (buffer_t *buffer, int sample) { //deadbeef->fseek (buffer->file, 4, SEEK_CUR); buffer->startdelay = startdelay; buffer->enddelay = enddelay; + trace ("lame totalsamples: %d\n", buffer->totalsamples); } if (sample <= 0 && (flags&FRAMES_FLAG)) { buffer->totalsamples -= buffer->enddelay; - trace ("lame totalsamples: %d\n", buffer->totalsamples); deadbeef->fseek (buffer->file, framepos+packetlength-4, SEEK_SET); return 0; } @@ -986,7 +990,7 @@ cmp3_seek_sample (DB_fileinfo_t *_info, int sample) { trace ("seek failed!\n"); return -1; } - trace ("seek is impossible (avg_samples_per_frame=%d, avg_packetlength=%d)!\n", buffer.avg_samples_per_frame, buffer.avg_packetlength); + trace ("seek is impossible (avg_samples_per_frame=%d, avg_packetlength=%d)!\n", info->buffer.avg_samples_per_frame, info->buffer.avg_packetlength); return 0; } |