Add documentation to struct rc4_context.

[paraslash.git] / mp3dec_filter.c

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index d3265d4ff84c2b804ec9fd421f7e4694b70cf9f1..aceee9ae686666583f5b6a3bfbbc515cbc4c6328 100644 (file)
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,18 +1,21 @@
 /*
 /*

- * 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. */
 
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file mp3dec_filter.c Paraslash's mp3 decoder. */
 

+#include <mad.h>
+#include <regex.h>
+

 #include "para.h"
 #include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "para.h"
 #include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"

 #include "filter.h"
 #include "error.h"
 #include "filter.h"
 #include "error.h"

-#include <mad.h>

 #include "string.h"
 
 /** Convert a sample value from libmad to a signed short. */
 #include "string.h"
 
 /** Convert a sample value from libmad to a signed short. */


@@ -33,9 +36,9 @@ 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 > 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;
                return 0;
        mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
        pmd->stream.error = 0;


@@ -78,13 +81,13 @@ next_frame:
                PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
                        return -E_MP3DEC_OVERRUN;
        }
                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;
                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;
                return copy - off;
        }
        return copy;


@@ -150,8 +153,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
+       };

 }
 }