X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=e749160d3337e87dc7c908c023ea100c955590e4;hp=91d87e7ae03d6086c0db7e152b389eba3f6dbee7;hb=d4603bf234d23adb56b208efb90ce66772c4ef5b;hpb=dfecdabf4aa13e3587b7c73be0f051693dab4d20 diff --git a/wav_filter.c b/wav_filter.c index 91d87e7a..e749160d 100644 --- a/wav_filter.c +++ b/wav_filter.c @@ -1,40 +1,32 @@ -/* - * Copyright (C) 2005-2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file wav_filter.c A filter that inserts a wave header. */ #include -#include #include "para.h" #include "error.h" #include "list.h" #include "sched.h" -#include "ggo.h" #include "buffer_tree.h" #include "filter.h" #include "string.h" #include "portable_io.h" -/** size of the output buffer */ -#define WAV_OUTBUF_SIZE 81920 -/** a wav header is always 44 bytes */ +/** A wav header is always 44 bytes. */ #define WAV_HEADER_LEN 44 -/** always write 16 bit header */ +/** Always write 16 bit header. */ #define BITS 16 -static void make_wav_header(unsigned int channels, unsigned int samplerate, +static void make_wav_header(unsigned int channels, unsigned int sample_rate, char *headbuf) { unsigned int size = 0x7fffffff; - int bytespersec = channels * samplerate * BITS / 8; + int bytespersec = channels * sample_rate * BITS / 8; int align = channels * BITS / 8; - PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate); + PARA_DEBUG_LOG("writing wave header: %u channels, %u KHz\n", channels, sample_rate); memset(headbuf, 0, WAV_HEADER_LEN); memcpy(headbuf, "RIFF", 4); write_u32(headbuf + 4, size - 8); @@ -43,7 +35,7 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate, 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 + 24, sample_rate); 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 */ @@ -51,34 +43,8 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate, write_u32(headbuf + 40, size - 44); /* chunk size */ } -static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn) -{ - size_t copy; - int *bof = fn->private_data; - - if (*bof) { - if (!len) - return 0; - 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; - } - copy = PARA_MIN(len, fn->bufsize - fn->loaded); - memmove(fn->buf + fn->loaded, inbuf, copy); - fn->loaded += copy; -// PARA_DEBUG_LOG("len = %d, copy = %d\n", len, copy); - return copy; -} - static void wav_close(struct filter_node *fn) { - free(fn->buf); - fn->buf = NULL; free(fn->private_data); fn->private_data = NULL; } @@ -87,46 +53,37 @@ static void wav_open(struct filter_node *fn) { int *bof; - fn->bufsize = WAV_OUTBUF_SIZE; - fn->buf = para_malloc(fn->bufsize); fn->private_data = para_malloc(sizeof(int)); bof = fn->private_data; - fn->loaded = 0; *bof = 1; - PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n", - fn, fn->buf, fn->loaded); } -static void wav_pre_select(struct sched *s, struct task *t) +static void wav_pre_select(struct sched *s, void *context) { - struct filter_node *fn = container_of(t, struct filter_node, task); + struct filter_node *fn = context; 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; + sched_min_delay(s); } -static void wav_post_select(__a_unused struct sched *s, struct task *t) +static int wav_post_select(__a_unused struct sched *s, void *context) { - struct filter_node *fn = container_of(t, struct filter_node, task); + struct filter_node *fn = context; 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; + return 0; } - ret = btr_exec_up(btrn, "samplerate", &buf); + ret = btr_exec_up(btrn, "sample_rate", &buf); if (ret < 0) { ret = -E_WAV_BAD_FC; goto err; @@ -149,26 +106,18 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t) 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); + btr_splice_out_node(&fn->btrn); else { - btr_del_node(btrn); + btr_remove_node(&fn->btrn); PARA_ERROR_LOG("%s\n", para_strerror(-ret)); } + return ret; } -/** - * the init function of the wav filter - * - * \param f struct to initialize - */ -void wav_filter_init(struct filter *f) -{ - f->convert = wav_convert; - f->close = wav_close; - f->open = wav_open; - f->pre_select = wav_pre_select; - f->post_select = wav_post_select; -} +const struct filter lsg_filter_cmd_com_wav_user_data = { + .close = wav_close, + .open = wav_open, + .pre_select = wav_pre_select, + .post_select = wav_post_select, +};