/** \file mp3dec.c paraslash's mp3 decoder */
#include "para.h"
-
#include "list.h"
+#include "sched.h"
#include "filter.h"
#include "error.h"
#include <mad.h>
#define MP3_OUTBUF_SIZE 128 * 1024
/** \cond a helper macro */
-#define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
+#define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
(f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
/** \endcond */
{
int i, ret;
struct private_mp3dec_data *pmd = fn->private_data;
- size_t copy = MIN(len, 4096);
+ size_t copy = PARA_MIN(len, 4096);
if (fn->loaded > fn->bufsize * 4 / 5)
return 0;
mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
pmd->stream.error = 0;
next_frame:
+ ret = mad_header_decode(&pmd->frame.header, &pmd->stream);
+ if (ret < 0)
+ goto out;
+ fn->fc->samplerate = pmd->frame.header.samplerate;
+ fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
ret = mad_frame_decode(&pmd->frame, &pmd->stream);
if (ret) {
if (MAD_RECOVERABLE(pmd->stream.error) || pmd->stream.error == MAD_ERROR_BUFLEN)
goto out;
- PARA_ERROR_LOG("fatal: ret = %d, loaded = %d\n", ret, fn->loaded);
+ PARA_ERROR_LOG("fatal: ret = %d, loaded = %zd\n", ret, fn->loaded);
return -E_MAD_FRAME_DECODE;
}
mad_synth_frame(&pmd->synth, &pmd->frame);
- fn->fci->samplerate = pmd->frame.header.samplerate;
- fn->fci->channels = MAD_NCHANNELS(&pmd->frame.header);
for (i = 0; i < pmd->synth.pcm.length; i++) {
/* output format: unsigned 16 bit little endian */
}
if (fn->loaded != fn->bufsize) /* output buffer not full */
continue;
- PARA_ERROR_LOG("output buffer full: %d\n", fn->loaded);
+ PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
return -E_MP3DEC_OVERRUN;
}
if (fn->loaded <= fn->bufsize * 4 / 5)
out:
if (pmd->stream.next_frame) { /* we still have some data */
size_t off = pmd->stream.bufend - pmd->stream.next_frame;
- PARA_DEBUG_LOG("converted %d, %d input bytes, %d output bytes\n",
- len - off, off, fn->loaded);
+// PARA_INFO_LOG("off: %zd, rate: %u, returning %zd\n", off,
+// fn->fc->samplerate, copy - off);
return copy - off;
}
return copy;
fn->bufsize = MP3_OUTBUF_SIZE;
fn->buf = para_calloc(fn->bufsize);
}
+
/**
* the init function of the mp3dec filter
*