/*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <mad.h>
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "mp3dec_filter.cmdline.h"
return 0;
}
-static size_t used_mad_buffer_bytes(struct mad_stream *s, size_t max)
+static void mp3dec_consume(struct btr_node *btrn, struct mad_stream *s,
+ size_t max)
{
- size_t rv;
+ size_t used;
if (!s->next_frame)
- return max;
- /* we still have some data */
- rv = s->next_frame - s->buffer;
- assert(rv <= max);
- return rv;
+ used = max;
+ else { /* we still have some data */
+ used = s->next_frame - s->buffer;
+ assert(used <= max);
+ }
+ btr_consume(btrn, used);
}
static void mp3dec_close(struct filter_node *fn)
fn->private_data = NULL;
}
+#define MP3DEC_MAX_FRAME 8192
+
static void mp3dec_post_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
int i, ret;
struct private_mp3dec_data *pmd = fn->private_data;
struct btr_node *btrn = fn->btrn;
- size_t loaded = 0, used, len, iqs;
+ size_t loaded = 0, len, iqs;
char *inbuffer, *outbuffer;
next_buffer:
* other buffer tree nodes a chance to run. This is necessary to avoid
* buffer underruns on slow machines.
*/
- len = PARA_MIN(len, (size_t)8192);
+ len = PARA_MIN(len, (size_t)MP3DEC_MAX_FRAME);
mad_stream_buffer(&pmd->stream, (unsigned char *)inbuffer, len);
next_frame:
ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
if (ret < 0) {
- used = used_mad_buffer_bytes(&pmd->stream, len);
- btr_consume(btrn, used);
+ mp3dec_consume(btrn, &pmd->stream, len);
if (pmd->stream.error == MAD_ERROR_BUFLEN) {
if (len == iqs && btr_no_parent(btrn)) {
ret = -E_MP3DEC_EOF;
goto err;
}
fn->min_iqs += 100;
+ ret = -E_MP3DEC_CORRUPT;
+ if (fn->min_iqs > MP3DEC_MAX_FRAME)
+ goto err;
}
if (loaded == 0)
goto next_buffer;
return;
}
- fn->min_iqs = 0;
pmd->sample_rate = pmd->frame.header.samplerate;
pmd->channels = MAD_NCHANNELS(&pmd->frame.header);
decode:
ret = handle_decode_error(pmd);
if (ret < 0)
goto err;
- mad_stream_sync(&pmd->stream);
- if (pmd->stream.error == MAD_ERROR_BUFLEN)
+ ret = mad_stream_sync(&pmd->stream);
+ if (pmd->stream.error == MAD_ERROR_BUFLEN) {
+ ret = -E_MP3DEC_EOF;
+ if (len == iqs && btr_no_parent(btrn))
+ goto err;
+ fn->min_iqs += 100;
+ ret = -E_MP3DEC_CORRUPT;
+ if (fn->min_iqs > MP3DEC_MAX_FRAME)
+ goto err;
+ mp3dec_consume(btrn, &pmd->stream, len);
return;
+ }
if (pmd->stream.error != MAD_ERROR_BADDATAPTR)
goto decode;
- used = used_mad_buffer_bytes(&pmd->stream, len);
- btr_consume(btrn, used);
+ mp3dec_consume(btrn, &pmd->stream, len);
return;
}
+ fn->min_iqs = 0;
mad_synth_frame(&pmd->synth, &pmd->frame);
outbuffer = para_malloc(pmd->synth.pcm.length * 2 * pmd->channels);
loaded = 0;