/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file mp3dec_filter.c Paraslash's mp3 decoder. */
#include "para.h"
+#include "mp3dec_filter.cmdline.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "filter.h"
#include "error.h"
#include <mad.h>
#include "string.h"
-/** The output buffer size. */
-#define MP3_OUTBUF_SIZE (128 * 1024)
-
/** Convert a sample value from libmad to a signed short. */
#define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
(f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
{
int i, ret;
struct private_mp3dec_data *pmd = fn->private_data;
- size_t copy = PARA_MIN(len, 4096);
+ size_t copy = PARA_MIN(len, (size_t)4096);
- if (fn->loaded > fn->bufsize * 4 / 5)
+ if (fn->loaded + 16384 > fn->bufsize)
return 0;
mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
pmd->stream.error = 0;
PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
return -E_MP3DEC_OVERRUN;
}
- if (fn->loaded <= fn->bufsize * 4 / 5)
+ if (fn->loaded + 16384 <= fn->bufsize)
goto next_frame;
out:
if (pmd->stream.next_frame) { /* we still have some data */
size_t off = pmd->stream.bufend - pmd->stream.next_frame;
-// PARA_INFO_LOG("off: %zd, rate: %u, returning %zd\n", off,
-// fn->fc->samplerate, copy - off);
+ if (fn->loaded + 16384 <= fn->bufsize && off > 2048)
+ goto next_frame;
return copy - off;
}
return copy;
static void mp3dec_open(struct filter_node *fn)
{
struct private_mp3dec_data *pmd = para_calloc(sizeof(*pmd));
+ struct mp3dec_filter_args_info *mp3_conf = fn->conf;
fn->private_data = pmd;
mad_stream_init(&pmd->stream);
mad_frame_init(&pmd->frame);
mad_synth_init(&pmd->synth);
fn->loaded = 0;
- fn->bufsize = MP3_OUTBUF_SIZE;
+ fn->bufsize = mp3_conf->bufsize_arg * 1024;
fn->buf = para_calloc(fn->bufsize);
+ if (mp3_conf->ignore_crc_given)
+ mad_stream_options(&pmd->stream, MAD_OPTION_IGNORECRC);
+}
+
+static int mp3dec_parse_config(int argc, char **argv, void **config)
+{
+ int ret;
+ struct mp3dec_filter_args_info *mp3_conf;
+
+ mp3_conf = para_calloc(sizeof(*mp3_conf));
+ ret = -E_MP3DEC_SYNTAX;
+ if (mp3dec_cmdline_parser(argc, argv, mp3_conf))
+ goto err;
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ if (mp3_conf->bufsize_arg < 32)
+ goto err;
+ if (mp3_conf->bufsize_arg >= INT_MAX / 1024)
+ goto err;
+ *config = mp3_conf;
+ return 1;
+err:
+ free(mp3_conf);
+ return ret;
}
/**
*/
void mp3dec_filter_init(struct filter *f)
{
+ struct mp3dec_filter_args_info dummy;
+
+ mp3dec_cmdline_parser_init(&dummy);
f->open = mp3dec_open;
f->convert = mp3dec;
f->close = mp3dec_close;
+ f->parse_config = mp3dec_parse_config;
+ f->help = (struct ggo_help) {
+ .short_help = mp3dec_filter_args_info_help,
+ .detailed_help = mp3dec_filter_args_info_detailed_help
+ };
}