First draft of the libosl patch series.

[paraslash.git] / wav_filter.c

diff --git a/wav_filter.c b/wav_filter.c
index d30b018de4f6f1a8554e1619ba7e97486d7c7b3e..1c0da1811847e958cdde408ba277edce20701c42 100644 (file)
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -7,6 +7,7 @@
 /** \file wav_filter.c A filter that inserts a wave header. */
 
 #include "para.h"
+#include "error.h"
 
 #include "list.h"
 #include "sched.h"
@@ -31,22 +32,21 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
        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);
        write_u32(headbuf + 4, size - 8);
        memcpy(headbuf + 8, "WAVE", 4);
        memcpy(headbuf + 12, "fmt ", 4);
-       write_u32(headbuf + 16, 16);
-       write_u16(headbuf + 20, 1);     /* format */
+       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);
-       write_u16(headbuf + 34, BITS);
-       memcpy(headbuf + 36, "data", 4);
-       write_u32(headbuf + 40, size - 44);
+       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)
@@ -57,6 +57,10 @@ static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
        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);
                fn->loaded = WAV_HEADER_LEN;
                *bof = 0;