Move wav detection code to a separate file.
[paraslash.git] / write.c
diff --git a/write.c b/write.c
index 9762c40..453824a 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
 #include "fd.h"
 #include "error.h"
 #include "version.h"
+#include "check_wav.h"
 
 INIT_WRITE_ERRLISTS;
 
-enum check_wav_state {
-       CWS_NEED_HEADER,
-       CWS_HAVE_HEADER,
-       CWS_NO_HEADER,
-};
-
-/* Information extracted from the wav header. */
-struct check_wav_task {
-       int state;
-       /** Number of channels. */
-       unsigned channels;
-       unsigned sample_format;
-       /** Sample rate specified in wav header given by \a buf. */
-       unsigned sample_rate;
-       /** The task structure used by the scheduler. */
-       struct task task;
-       struct btr_node *btrn;
-       size_t min_iqs;
-};
-
 static struct write_args_info conf;
 
 static struct stdin_task sit;
 
-/** Length of a standard wav header. */
-#define WAV_HEADER_LEN 44
-
-static void check_wav_pre_select(struct sched *s, struct task *t)
-{
-       struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
-       int ret;
-
-       ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL);
-       if (ret != 0)
-               sched_min_delay(s);
-}
-
-#define HANDLE_EXEC(_cmd) \
-       if (!strcmp(cmd, #_cmd)) { \
-               if (!conf._cmd ## _given && cwt->state == CWS_NEED_HEADER) \
-                       return -E_BTR_NAVAIL; \
-               *result = make_message("%d", cwt->state == CWS_NO_HEADER || conf._cmd ## _given? \
-                       conf._cmd ## _arg : cwt->_cmd); \
-               return 1; \
-       } \
-
-
-static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
-{
-       struct check_wav_task *cwt = btr_context(btrn);
-
-       HANDLE_EXEC(sample_rate);
-       HANDLE_EXEC(channels);
-       HANDLE_EXEC(sample_format);
-       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
-}
-
-static void check_wav_post_select(__a_unused struct sched *s, struct task *t)
-{
-       struct check_wav_task *cwt = container_of(t, struct check_wav_task, task);
-       struct btr_node *btrn = cwt->btrn;
-       unsigned char *a;
-       size_t sz;
-       int ret;
-       uint16_t bps; /* bits per sample */
-       const char *sample_formats[] = {SAMPLE_FORMATS};
-
-       t->error = 0;
-       ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL);
-       if (ret <= 0)
-               goto out;
-       if (cwt->state != CWS_NEED_HEADER)
-               goto pushdown;
-       btr_merge(btrn, cwt->min_iqs);
-       sz = btr_next_buffer(btrn, (char **)&a);
-       if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */
-               goto pushdown;
-       cwt->min_iqs = 0;
-       /*
-        * The default byte ordering assumed for WAVE data files is
-        * little-endian. Files written using the big-endian byte ordering
-        * scheme have the identifier RIFX instead of RIFF.
-        */
-       if (a[0] != 'R' || a[1] != 'I' || a[2] != 'F' ||
-                       (a[3] != 'F' && a[3] != 'X')) {
-               PARA_NOTICE_LOG("wav header not found\n");
-               cwt->state = CWS_NO_HEADER;
-               sprintf(t->status, "check wav: no header");
-               goto out;
-       }
-       PARA_INFO_LOG("found wav header\n");
-       cwt->state = CWS_HAVE_HEADER;
-       sprintf(t->status, "check wav: have header");
-       cwt->channels = (unsigned) a[22];
-       cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
-       bps = a[34] + ((unsigned)a[35] << 8);
-       if (bps != 8 && bps != 16) {
-               PARA_WARNING_LOG("%u bps not supported, assuming 16\n", bps);
-               bps = 16;
-       }
-       /*
-        * 8-bit samples are stored as unsigned bytes, ranging from 0 to 255.
-        * 16-bit samples are stored as 2's-complement signed integers, ranging
-        * from -32768 to 32767.
-        */
-       if (bps == 8)
-               cwt->sample_format = SF_U8;
-       else
-               cwt->sample_format = (a[3] == 'F')? SF_S16_LE : SF_S16_BE;
-       PARA_NOTICE_LOG("%dHz, %s, %s\n", cwt->sample_rate,
-               cwt->channels == 1? "mono" : "stereo",
-               sample_formats[cwt->sample_format]);
-       btr_consume(btrn, WAV_HEADER_LEN);
-pushdown:
-       btr_pushdown(btrn);
-out:
-       t->error = ret;
-       if (ret < 0)
-               btr_remove_node(btrn);
-}
-
 static int loglevel;
 INIT_STDERR_LOGGING(loglevel)
 
@@ -185,65 +68,44 @@ __noreturn static void print_help_and_die(void)
  *
  * \return Standard.
  */
-static int setup_writer_node(const char *arg, struct btr_node *parent,
-               struct writer_node *wn)
+static void setup_writer_node(const char *arg, struct btr_node *parent,
+               struct writer_node *wn, struct sched *s)
 {
-       if (arg)
-               wn->conf = check_writer_arg(arg, &wn->writer_num);
-       else {
-               wn->writer_num = DEFAULT_WRITER;
-               wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
-       }
-       if (!wn->conf)
-               return -E_WRITE_COMMON_SYNTAX;
-       register_writer_node(wn, parent);
-       return 1;
+       wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
+       register_writer_node(wn, parent, s);
 }
 
-static int main_btr(struct sched *s)
+static int setup_and_schedule(void)
 {
        int i, ret;
-       struct check_wav_task _cwt, *cwt = &_cwt;
+       struct check_wav_task *cwt;
+       struct btr_node *cwt_btrn;
        struct writer_node *wns;
+       static struct sched s;
+       struct wav_params wp;
 
        loglevel = get_loglevel_by_name(conf.loglevel_arg);
        sit.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "stdin"));
        stdin_set_defaults(&sit);
-       register_task(&sit.task);
-
-       cwt->state = CWS_NEED_HEADER;
-       cwt->min_iqs = WAV_HEADER_LEN;
-       cwt->btrn = btr_new_node(&(struct btr_node_description)
-               EMBRACE(.name = "check_wav", .parent = sit.btrn,
-               .handler = check_wav_exec, .context = cwt));
-       sprintf(cwt->task.status, "check_wav");
-       cwt->task.pre_select = check_wav_pre_select;
-       cwt->task.post_select = check_wav_post_select;
-       cwt->task.error = 0;
-       register_task(&cwt->task);
+       register_task(&s, &sit.task);
 
-       ret = -E_WRITE_SYNTAX;
+       COPY_WAV_PARMS(&wp, &conf);
+       cwt = check_wav_init(&s, sit.btrn, &wp, &cwt_btrn);
        if (!conf.writer_given) {
-               i = 0;
                wns = para_calloc(sizeof(*wns));
-               ret = setup_writer_node(NULL, cwt->btrn, wns);
-               if (ret < 0)
-                       goto out;
+               setup_writer_node(NULL, cwt_btrn, wns, &s);
                i = 1;
        } else {
                wns = para_calloc(conf.writer_given * sizeof(*wns));
-               for (i = 0; i < conf.writer_given; i++) {
-                       ret = setup_writer_node(conf.writer_arg[i],
-                               cwt->btrn, wns + i);
-                       if (ret < 0)
-                               goto out;
-               }
+               for (i = 0; i < conf.writer_given; i++)
+                       setup_writer_node(conf.writer_arg[i], cwt_btrn,
+                               wns + i, &s);
        }
 
-       s->default_timeout.tv_sec = 10;
-       s->default_timeout.tv_usec = 50000;
-       ret = schedule(s);
+       s.default_timeout.tv_sec = 10;
+       s.default_timeout.tv_usec = 50000;
+       ret = schedule(&s);
        if (ret >= 0) {
                int j;
                for (j = 0; j < i; j++) {
@@ -258,18 +120,17 @@ static int main_btr(struct sched *s)
                        }
                }
        }
-out:
        for (i--; i >= 0; i--) {
                struct writer_node *wn = wns + i;
                struct writer *w = writers + wn->writer_num;
 
                w->close(wn);
-               btr_free_node(wn->btrn);
+               btr_remove_node(&wn->btrn);
                w->free_config(wn->conf);
                free(wn->conf);
        }
        free(wns);
-       btr_free_node(cwt->btrn);
+       check_wav_shutdown(cwt);
        return ret;
 }
 
@@ -286,8 +147,7 @@ out:
  */
 int main(int argc, char *argv[])
 {
-       int ret = -E_WRITE_SYNTAX;
-       static struct sched s;
+       int ret;
 
        writer_init();
        write_cmdline_parser(argc, argv, &conf);
@@ -295,7 +155,7 @@ int main(int argc, char *argv[])
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
 
-       ret = main_btr(&s);
+       ret = setup_and_schedule();
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                exit(EXIT_FAILURE);