Add btr support to the oggdec filter.

[paraslash.git] / mp3dec_filter.c

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index aceee9ae686666583f5b6a3bfbbc515cbc4c6328..9eed6393c53f58b9bd8fa7e295a14553b7b4f6af 100644 (file)
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -8,12 +8,14 @@
 
 #include <mad.h>
 #include <regex.h>
 
 #include <mad.h>
 #include <regex.h>

+#include <stdbool.h>

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

+#include "buffer_tree.h"

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


@@ -22,6 +24,15 @@
 #define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
        (f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
 
 #define MAD_TO_SHORT(f) (f) >= MAD_F_ONE? SHRT_MAX :\
        (f) <= -MAD_F_ONE? -SHRT_MAX : (signed short) ((f) >> (MAD_F_FRACBITS - 15))
 

+/** State of the decoding process. */
+enum mp3dec_flags {
+       /** Bad main_data_begin pointer encounterd. */
+       MP3DEC_FLAG_BAD_DATA = 1,
+       /** Some output has already been produced. */
+       MP3DEC_FLAG_DECODE_STARTED = 2,
+       MP3DEC_FLAG_NEED_MORE = 4,
+};
+

 /** Data specific to the mp3dec filter. */
 struct private_mp3dec_data {
        /** Information on the current mp3 stream. */
 /** Data specific to the mp3dec filter. */
 struct private_mp3dec_data {
        /** Information on the current mp3 stream. */


@@ -30,8 +41,77 @@ struct private_mp3dec_data {
        struct mad_frame frame;
        /** Contains the PCM output. */
        struct mad_synth synth;
        struct mad_frame frame;
        /** Contains the PCM output. */
        struct mad_synth synth;

+       /** See \ref mp3dec_flags. */
+       unsigned flags;
+       /** Defer decoding until this time. */
+       struct timeval stream_start_barrier;
+       /** Wait until this many input bytes are available. */
+       size_t input_len_barrier;
+       /** The number of channels of the current stream. */
+       unsigned int channels;
+       /** Current sample rate in Hz. */
+       unsigned int samplerate;

 };
 
 };
 

+static int need_bad_data_delay(struct private_mp3dec_data *pmd,
+               size_t bytes_available)
+{
+       if (!(pmd->flags & MP3DEC_FLAG_BAD_DATA))
+               return 0;
+       if (pmd->flags & MP3DEC_FLAG_DECODE_STARTED)
+               return 0;
+       if (bytes_available >= pmd->input_len_barrier)
+               return 0;
+       if (tv_diff(now, &pmd->stream_start_barrier, NULL) > 0)
+               return 0;
+       return 1;
+}
+
+/*
+ * Returns negative on serious errors, zero if the error should be ignored and
+ * positive on bad data pointer errors at stream start.
+ */
+static int handle_decode_error(struct private_mp3dec_data *pmd, size_t len)
+{
+       const struct timeval delay = {0, 60 * 1000};
+       if (!MAD_RECOVERABLE(pmd->stream.error)
+                       && pmd->stream.error != MAD_ERROR_BUFLEN) {
+               PARA_ERROR_LOG("%s\n", mad_stream_errorstr(&pmd->stream));
+               return -E_MAD_FRAME_DECODE;
+       }
+       PARA_DEBUG_LOG("%s\n", mad_stream_errorstr(&pmd->stream));
+       if (pmd->stream.error != MAD_ERROR_BADDATAPTR)
+               return 0;
+       if (pmd->flags & MP3DEC_FLAG_DECODE_STARTED)
+               return 0;
+       /*
+        * Bad data pointer at stream start. Defer decoding until the amount of
+        * data we are about to skip is available again, but wait at most 60ms.
+        */
+       pmd->flags |= MP3DEC_FLAG_BAD_DATA;
+       pmd->input_len_barrier = len;
+       tv_add(now, &delay, &pmd->stream_start_barrier);
+       return 1;
+}
+
+/** 640K ought to be enough for everybody ;) */
+#define MP3DEC_MAX_PENDING (640 * 1024)
+
+static void mp3dec_pre_select(struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       size_t iqs = btr_get_input_queue_size(fn->btrn);
+       struct private_mp3dec_data *pmd = fn->private_data;
+
+       t->error = 0;
+       if (iqs <= pmd->input_len_barrier)
+               return;
+       if (btr_bytes_pending(fn->btrn) > MP3DEC_MAX_PENDING)
+               return; /* FIXME, should use reasonable bound on timeout */
+       s->timeout.tv_sec = 0;
+       s->timeout.tv_usec = 1;
+}
+

 static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
        int i, ret;
 static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
        int i, ret;


@@ -40,6 +120,8 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 
        if (fn->loaded + 16384 > fn->bufsize)
                return 0;
 
        if (fn->loaded + 16384 > fn->bufsize)
                return 0;

+       if (need_bad_data_delay(pmd, len))
+               return 0;

        mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
        pmd->stream.error = 0;
 next_frame:
        mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
        pmd->stream.error = 0;
 next_frame:


@@ -54,18 +136,18 @@ next_frame:
        fn->fc->samplerate = pmd->frame.header.samplerate;
        fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header);
        ret = mad_frame_decode(&pmd->frame, &pmd->stream);
        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) {
-                       PARA_DEBUG_LOG("frame decode: %s\n",
-                               mad_stream_errorstr(&pmd->stream));
+       if (ret != 0) {
+               ret = handle_decode_error(pmd, len);
+               if (ret < 0)
+                       return ret;
+               if (ret == 0)

                        goto out;
                        goto out;

-               }
-               PARA_ERROR_LOG("frame decode: %s\n",
-                       mad_stream_errorstr(&pmd->stream));
-               return -E_MAD_FRAME_DECODE;
+               ret = copy - (pmd->stream.bufend - pmd->stream.next_frame);
+               PARA_NOTICE_LOG("skipping %d input bytes\n", ret);
+               return ret;

        }
        mad_synth_frame(&pmd->synth, &pmd->frame);
        }
        mad_synth_frame(&pmd->synth, &pmd->frame);

+       pmd->flags |= MP3DEC_FLAG_DECODE_STARTED;

 
        for (i = 0; i < pmd->synth.pcm.length; i++) {
                int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
 
        for (i = 0; i < pmd->synth.pcm.length; i++) {
                int s = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);


@@ -93,6 +175,18 @@ out:
        return copy;
 }
 
        return copy;
 }
 

+static size_t used_mad_buffer_bytes(struct mad_stream *s, size_t max)
+{
+       size_t rv;
+
+       if (!s->next_frame)
+               return max;
+       /* we still have some data */
+       rv = s->next_frame - s->buffer;
+       assert(rv <= max);
+       return rv;
+}
+

 static void mp3dec_close(struct filter_node *fn)
 {
        struct private_mp3dec_data *pmd = fn->private_data;
 static void mp3dec_close(struct filter_node *fn)
 {
        struct private_mp3dec_data *pmd = fn->private_data;


@@ -107,6 +201,84 @@ static void mp3dec_close(struct filter_node *fn)
        fn->private_data = NULL;
 }
 
        fn->private_data = NULL;
 }
 

+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, used, len = btr_get_input_queue_size(btrn);
+       char *inbuffer, *outbuffer;
+
+       pmd->stream.error = 0;
+       t->error = 0;
+       if (btr_bytes_pending(btrn) > MP3DEC_MAX_PENDING)
+               return;
+       if (need_bad_data_delay(pmd, len))
+               return;
+       if (len <= pmd->input_len_barrier && btr_no_parent(btrn)) {
+               ret = -E_MP3DEC_EOF;
+               goto err;
+       }
+next_buffer:
+       len = btr_next_buffer(btrn, &inbuffer);
+       if (len == 0)
+               return;
+       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);
+               if (pmd->stream.error == MAD_ERROR_BUFLEN) {
+                       pmd->input_len_barrier = len - used;
+                       ret = btr_merge(btrn);
+                       if (ret != 2)
+                               return;
+               } else if (pmd->stream.error != MAD_ERROR_LOSTSYNC)
+                       PARA_DEBUG_LOG("header decode: %s\n",
+                               mad_stream_errorstr(&pmd->stream));
+               goto next_buffer;
+       }
+       pmd->input_len_barrier = 0;
+       pmd->samplerate = pmd->frame.header.samplerate;
+       pmd->channels = MAD_NCHANNELS(&pmd->frame.header);
+       ret = mad_frame_decode(&pmd->frame, &pmd->stream);
+       if (ret != 0) {
+               PARA_CRIT_LOG("frame decode: %d\n", ret);
+               used = used_mad_buffer_bytes(&pmd->stream, len);
+               ret = handle_decode_error(pmd, used);
+               btr_consume(btrn, used);
+               if (ret < 0)
+                       goto err;
+               if (ret == 0)
+                       goto next_buffer;
+               return;
+       }
+       mad_synth_frame(&pmd->synth, &pmd->frame);
+       pmd->flags |= MP3DEC_FLAG_DECODE_STARTED;
+
+       outbuffer = para_malloc(pmd->synth.pcm.length * 4);
+       loaded = 0;
+       for (i = 0; i < pmd->synth.pcm.length; i++) {
+               int sample = MAD_TO_SHORT(pmd->synth.pcm.samples[0][i]);
+               write_int16_host_endian(outbuffer + loaded, sample);
+               loaded += 2;
+               if (MAD_NCHANNELS(&pmd->frame.header) == 2) { /* stereo */
+                       sample = MAD_TO_SHORT(pmd->synth.pcm.samples[1][i]);
+                       write_int16_host_endian(outbuffer + loaded, sample);
+                       loaded += 2;
+               }
+       }
+       btr_add_output(outbuffer, loaded, btrn);
+       goto next_frame;
+err:
+       assert(ret < 0);
+       mp3dec_close(fn);
+       t->error = ret;
+       btr_del_node(btrn);
+}
+

 static void mp3dec_open(struct filter_node *fn)
 {
        struct private_mp3dec_data *pmd = para_calloc(sizeof(*pmd));
 static void mp3dec_open(struct filter_node *fn)
 {
        struct private_mp3dec_data *pmd = para_calloc(sizeof(*pmd));


@@ -144,6 +316,25 @@ err:
        return ret;
 }
 
        return ret;
 }
 

+static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
+{
+       struct filter_node *fn = btr_context(btrn);
+       struct private_mp3dec_data *pmd = fn->private_data;
+
+       if (!strcmp(cmd, "samplerate")) {
+               if (pmd->samplerate == 0)
+                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+               *result = make_message("%u", pmd->samplerate);
+               return 1;
+       }
+       if (!strcmp(cmd, "channels")) {
+               if (pmd->channels == 0)
+                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+               *result = make_message("%u", pmd->channels);
+               return 1;
+       }
+       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+}

 /**
  * The init function of the mp3dec filter.
  *
 /**
  * The init function of the mp3dec filter.
  *


@@ -160,6 +351,9 @@ void mp3dec_filter_init(struct filter *f)
        f->convert = mp3dec;
        f->close = mp3dec_close;
        f->parse_config = mp3dec_parse_config;
        f->convert = mp3dec;
        f->close = mp3dec_close;
        f->parse_config = mp3dec_parse_config;

+       f->pre_select = mp3dec_pre_select;
+       f->post_select = mp3dec_post_select;
+       f->execute = mp3dec_execute;

        f->help = (struct ggo_help) {
                .short_help = mp3dec_filter_args_info_help,
                .detailed_help = mp3dec_filter_args_info_detailed_help
        f->help = (struct ggo_help) {
                .short_help = mp3dec_filter_args_info_help,
                .detailed_help = mp3dec_filter_args_info_detailed_help