Add btr support for the wav filter.

diff --git a/error.h b/error.h
index 92039f647f9d87c8a052c73eb44e40d007152ccb..9d0283d1137749e623daf2429fa77bd14b8a0fc9 100644 (file)
--- a/error.h
+++ b/error.h
@@ -83,6 +83,8 @@ extern const char **para_errlist[];
 
 #define WAV_FILTER_ERRORS \
        PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
 
 #define WAV_FILTER_ERRORS \
        PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \

+       PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
+       PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \

 
 
 #define FEC_ERRORS \
 
 
 #define FEC_ERRORS \

diff --git a/wav_filter.c b/wav_filter.c
index eada2434d8be0dc08a1c7d9cacef8e386278d037..7a3c59bfbe9faec0354317bc6c6055ca975b7eeb 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -27,10 +27,9 @@
 #define BITS 16
 
 static void make_wav_header(unsigned int channels, unsigned int samplerate,
 #define BITS 16
 
 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;


@@ -64,7 +63,7 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
                        PARA_ERROR_LOG("%s\n", para_strerror(E_WAV_BAD_FC));
                        return -E_WAV_BAD_FC;
                }
                        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);
+               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;


@@ -98,6 +97,69 @@ 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);
+       btr_pushdown(btrn);
+       ret = -E_WAV_SUCCESS;
+err:
+       t->error = ret;
+       wav_close(fn);
+       if (ret == -E_WAV_SUCCESS)
+               ret = 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
  *


@@ -108,4 +170,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;

 }
 }