projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Obtain afs status items directly from afs.
[paraslash.git]
/
mp3dec_filter.c
diff --git
a/mp3dec_filter.c
b/mp3dec_filter.c
index e9d84c1baf366ef4390082bca5e8f27c289e7008..92da4a5cbb9514d9279b3b39daa68ce783f2d585 100644
(file)
--- a/
mp3dec_filter.c
+++ b/
mp3dec_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-10,6
+10,7
@@
#include "mp3dec_filter.cmdline.h"
#include "list.h"
#include "sched.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 "filter.h"
#include "error.h"
#include <mad.h>
@@
-33,7
+34,7
@@
static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
{
int i, ret;
struct private_mp3dec_data *pmd = fn->private_data;
{
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 + 16384 > fn->bufsize)
return 0;
if (fn->loaded + 16384 > fn->bufsize)
return 0;
@@
-83,8
+84,8
@@
next_frame:
out:
if (pmd->stream.next_frame) { /* we still have some data */
size_t off = pmd->stream.bufend - pmd->stream.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;
return copy - off;
}
return copy;
@@
-150,8
+151,15
@@
err:
*/
void mp3dec_filter_init(struct filter *f)
{
*/
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->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
+ };
}
}