More work on variable frame size (getting rid of FRAMESIZE() )

[opus.git] / tools / wav_io.c

diff --git a/tools/wav_io.c b/tools/wav_io.c
index a6a9e4b..4f2ab06 100644 (file)
--- a/tools/wav_io.c
+++ b/tools/wav_io.c
@@ -40,13 +40,13 @@
 #include "wav_io.h"
 
 
-int read_wav_header(FILE *file, int *rate, int *channels, int *format, celt_int32_t *size)
+int read_wav_header(FILE *file, int *rate, int *channels, int *format, celt_int32 *size)
 {
    char ch[5];
-   celt_int32_t itmp;
-   celt_int16_t stmp;
-   celt_int32_t bpersec;
-   celt_int16_t balign;
+   celt_int32 itmp;
+   celt_int16 stmp;
+   celt_int32 bpersec;
+   celt_int16 balign;
    int skip_bytes;
    int i;
 
@@ -118,11 +118,6 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, celt_int3
    fread(&itmp, 4, 1, file);
    itmp = le_int(itmp);
    *rate = itmp;
-   if (*rate != 8000 && *rate != 16000 && *rate != 11025 && *rate != 22050 && *rate != 32000 && *rate != 44100 && *rate != 48000)
-   {
-      fprintf (stderr, "Only 8 kHz (narrowband) and 16 kHz (wideband) supported (plus 11.025 kHz and 22.05 kHz, but your mileage may vary)\n");
-      return -1;
-   }
 
    fread(&itmp, 4, 1, file);
    bpersec = le_int(itmp);
@@ -190,8 +185,8 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, celt_int3
 void write_wav_header(FILE *file, int rate, int channels, int format, int size)
 {
    char ch[5];
-   celt_int32_t itmp;
-   celt_int16_t stmp;
+   celt_int32 itmp;
+   celt_int16 stmp;
 
    ch[4]=0;