Add btr support to the oggdec filter.

[paraslash.git] / wav_filter.c

diff --git a/wav_filter.c b/wav_filter.c
index 242cb4bb0d1529ae3d8756083e04be04bf16d008..91d87e7ae03d6086c0db7e152b389eba3f6dbee7 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,17 +1,23 @@
 /*
 /*

- * 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 wav_filter.c A filter that inserts a wave header. */
 
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file wav_filter.c A filter that inserts a wave header. */
 

-#include "para.h"
+#include <regex.h>
+#include <stdbool.h>

 
 

+#include "para.h"
+#include "error.h"

 #include "list.h"
 #include "sched.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"
+#include "buffer_tree.h"

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

+#include "portable_io.h"

 
 /** size of the output buffer */
 #define WAV_OUTBUF_SIZE 81920
 
 /** size of the output buffer */
 #define WAV_OUTBUF_SIZE 81920


@@ -20,50 +26,29 @@
 /** always write 16 bit header */
 #define BITS 16
 
 /** always write 16 bit header */
 #define BITS 16
 

-/**
- * write a 32 bit unsigned value to a buffer
- *
- * \param buf the buffer to write to
- * \param x the value to write
- */
-#define WRITE_U32(buf, x) (buf)[0] = (unsigned char)((x) & 0xff);\
-       (buf)[1] = (unsigned char)(((x) >> 8) & 0xff);\
-       (buf)[2] = (unsigned char)(((x) >> 16) & 0xff);\
-       (buf)[3] = (unsigned char)(((x) >> 24) & 0xff);
-
-/**
- * write a 16 bit unsigned value to a buffer
- *
- * \param buf the buffer to write to
- * \param x the value to write
- */
-#define WRITE_U16(buf, x) (buf)[0] = (unsigned char)((x) & 0xff);
-

 static void make_wav_header(unsigned int channels, unsigned int samplerate,
 static void make_wav_header(unsigned int channels, unsigned int samplerate,

-               struct filter_node *fn)
+               char *headbuf)

 {
 
 {
 

-       char *headbuf = fn->buf;

        unsigned int size = 0x7fffffff;
        int bytespersec = channels * samplerate * BITS / 8;
        int align = channels * BITS / 8;
 
        unsigned int size = 0x7fffffff;
        int bytespersec = channels * samplerate * BITS / 8;
        int align = channels * BITS / 8;
 

-       assert(channels);

        PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate);
        memset(headbuf, 0, WAV_HEADER_LEN);
        memcpy(headbuf, "RIFF", 4);
        PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate);
        memset(headbuf, 0, WAV_HEADER_LEN);
        memcpy(headbuf, "RIFF", 4);

-       WRITE_U32(headbuf + 4, size - 8);
+       write_u32(headbuf + 4, size - 8);

        memcpy(headbuf + 8, "WAVE", 4);
        memcpy(headbuf + 12, "fmt ", 4);
        memcpy(headbuf + 8, "WAVE", 4);
        memcpy(headbuf + 12, "fmt ", 4);

-       WRITE_U32(headbuf + 16, 16);
-       WRITE_U16(headbuf + 20, 1);     /* format */
-       WRITE_U16(headbuf + 22, channels);
-       WRITE_U32(headbuf + 24, samplerate);
-       WRITE_U32(headbuf + 28, bytespersec);
-       WRITE_U16(headbuf + 32, align);
-       WRITE_U16(headbuf + 34, BITS);
-       memcpy(headbuf + 36, "data", 4);
-       WRITE_U32(headbuf + 40, size - 44);
+       write_u32(headbuf + 16, 16); /* 16 + extra format bytes (zero) */
+       write_u16(headbuf + 20, 1);     /* format (1 == PCM/uncompressed) */
+       write_u16(headbuf + 22, channels);
+       write_u32(headbuf + 24, samplerate);
+       write_u32(headbuf + 28, bytespersec);
+       write_u16(headbuf + 32, align); /* number of bytes per sample slice */
+       write_u16(headbuf + 34, BITS); /* significant bits per sample */
+       memcpy(headbuf + 36, "data", 4); /* chunk ID */
+       write_u32(headbuf + 40, size - 44); /* chunk size */

 }
 
 static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
 }
 
 static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)


@@ -74,7 +59,11 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
        if (*bof) {
                if (!len)
                        return 0;
        if (*bof) {
                if (!len)
                        return 0;

-               make_wav_header(fn->fc->channels, fn->fc->samplerate, fn);
+               if (!fn->fc->channels || !fn->fc->samplerate) {
+                       PARA_ERROR_LOG("%s\n", para_strerror(E_WAV_BAD_FC));
+                       return -E_WAV_BAD_FC;
+               }
+               make_wav_header(fn->fc->channels, fn->fc->samplerate, fn->buf);

                fn->loaded = WAV_HEADER_LEN;
                *bof = 0;
 //             return 0;
                fn->loaded = WAV_HEADER_LEN;
                *bof = 0;
 //             return 0;


@@ -108,6 +97,68 @@ static void wav_open(struct filter_node *fn)
                fn, fn->buf, fn->loaded);
 }
 
                fn, fn->buf, fn->loaded);
 }
 

+static void wav_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);
+
+       t->error = 0;
+       if (iqs == 0)
+               return;
+       s->timeout.tv_sec = 0;
+       s->timeout.tv_usec = 1;
+}
+
+static void wav_post_select(__a_unused struct sched *s, struct task *t)
+{
+       struct filter_node *fn = container_of(t, struct filter_node, task);
+       struct btr_node *btrn = fn->btrn;
+       size_t iqs = btr_get_input_queue_size(btrn);
+       int ret;
+       char *header, *buf;
+       int32_t rate, ch;
+
+
+       t->error = 0;
+       if (iqs == 0) {
+               ret = -E_WAV_EOF;
+               if (btr_no_parent(btrn))
+                       goto err;
+               return;
+       }
+       ret = btr_exec_up(btrn, "samplerate", &buf);
+       if (ret < 0) {
+               ret = -E_WAV_BAD_FC;
+               goto err;
+       }
+       ret = para_atoi32(buf, &rate);
+       free(buf);
+       if (ret < 0)
+               goto err;
+       ret = btr_exec_up(btrn, "channels", &buf);
+       if (ret < 0) {
+               ret = -E_WAV_BAD_FC;
+               goto err;
+       }
+       ret = para_atoi32(buf, &ch);
+       free(buf);
+       if (ret < 0)
+               goto err;
+       header = para_malloc(WAV_HEADER_LEN);
+       make_wav_header(ch, rate, header);
+       btr_add_output(header, WAV_HEADER_LEN, btrn);
+       ret = -E_WAV_SUCCESS;
+err:
+       t->error = ret;
+       wav_close(fn);
+       if (ret == -E_WAV_SUCCESS)
+               btr_splice_out_node(btrn);
+       else {
+               btr_del_node(btrn);
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       }
+}
+

 /**
  * the init function of the wav filter
  *
 /**
  * the init function of the wav filter
  *


@@ -118,4 +169,6 @@ void wav_filter_init(struct filter *f)
        f->convert = wav_convert;
        f->close = wav_close;
        f->open = wav_open;
        f->convert = wav_convert;
        f->close = wav_close;
        f->open = wav_open;

+       f->pre_select = wav_pre_select;
+       f->post_select = wav_post_select;

 }
 }