#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#include "wav_reader.h"
+#include "pcm_reader.h"
#define RIFF_FOURCC(a,b,c,d) ((a)|((b)<<8)|((c)<<16)|((d)<<24))
-#define ENSURE(expr) \
- do { \
- if (!(expr)) goto FAIL;\
- } while (0)
-
-struct wav_reader_t {
+typedef struct wav_reader_t {
pcm_reader_vtbl_t *vtbl;
pcm_sample_description_t sample_format;
int64_t length;
int32_t data_offset;
int ignore_length;
pcm_io_context_t io;
-};
+} wav_reader_t;
static const uint8_t WAV_GUID_PCM[] = {
1, 0, 0, 0, 0, 0, 0x10, 0, 0x80, 0, 0, 0xaa, 0, 0x38, 0x9b, 0x71
TRY_IO(pcm_scanl(&reader->io, "QQQL",
&riff_size, length, &sample_count, &table_size) != 4);
TRY_IO(pcm_skip(&reader->io, (chunk_size - 27) & ~1));
- reader->data_offset += (chunk_size + 9) & ~1;
FAIL:
return -1;
}
container == RIFF_FOURCC('R','F','6','4'));
TRY_IO(pcm_read32le(&reader->io, &fcc));
ENSURE(fcc == RIFF_FOURCC('W','A','V','E'));
- reader->data_offset = 12;
if (container == RIFF_FOURCC('R','F','6','4'))
riff_ds64(reader, data_length);
} else if (fcc == RIFF_FOURCC('d','a','t','a')) {
if (container == RIFF_FOURCC('R','I','F','F'))
*data_length = chunk_size;
- reader->data_offset += 8;
+ reader->data_offset = pcm_tell(&reader->io);
break;
} else {
TRY_IO(pcm_skip(&reader->io, (chunk_size + 1) & ~1));
}
- reader->data_offset += (chunk_size + 9) & ~1;
}
if (fcc == RIFF_FOURCC('d','a','t','a'))
return 0;