} while (0)
struct wav_reader_t {
+ pcm_reader_vtbl_t *vtbl;
pcm_sample_description_t sample_format;
int64_t length;
int64_t position;
+ int32_t data_offset;
int ignore_length;
int last_error;
wav_io_context_t io;
3, 0, 0, 0, 0, 0, 0x10, 0, 0x80, 0, 0, 0xaa, 0, 0x38, 0x9b, 0x71
};
-const pcm_sample_description_t *wav_get_format(wav_reader_t *reader)
+static const pcm_sample_description_t *wav_get_format(pcm_reader_t *reader)
{
- return &reader->sample_format;
+ return &((wav_reader_t *)reader)->sample_format;
}
-int64_t wav_get_length(wav_reader_t *reader)
+static int64_t wav_get_length(pcm_reader_t *reader)
{
- return reader->length;
+ return ((wav_reader_t *)reader)->length;
}
-int64_t wav_get_position(wav_reader_t *reader)
+static int64_t wav_get_position(pcm_reader_t *reader)
{
- return reader->position;
+ return ((wav_reader_t *)reader)->position;
}
-void wav_teardown(wav_reader_t **reader)
+static void wav_teardown(pcm_reader_t **reader)
{
free(*reader);
*reader = 0;
return 0;
}
-int wav_read_frames(wav_reader_t *reader, void *buffer, unsigned nframes)
+static
+int wav_read_frames(pcm_reader_t *preader, void *buffer, unsigned nframes)
{
int rc;
unsigned nbytes;
+ wav_reader_t *reader = (wav_reader_t *)preader;
if (!reader->ignore_length && nframes > reader->length - reader->position)
nframes = reader->length - reader->position;
fcc == RIFF_FOURCC('d','s','6','4') && chunk_size >= 28);
TRY_IO(riff_scan(reader, "QQQL",
&riff_size, length, &sample_count, &table_size) != 4);
- if (table_size == 0)
- return 0;
- reader->last_error = WAV_UNSUPPORTED_FORMAT;
+ TRY_IO(riff_skip(reader, (chunk_size - 27) & ~1));
+ reader->data_offset += (chunk_size + 9) & ~1;
FAIL:
return -1;
}
TRY_IO(riff_read32(reader, &fcc));
if (fcc != RIFF_FOURCC('W','A','V','E'))
goto FAIL;
+ reader->data_offset = 12;
+
if (container == RIFF_FOURCC('R','F','6','4'))
riff_ds64(reader, data_length);
while ((fcc = riff_next_chunk(reader, &chunk_size)) != 0) {
} 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;
break;
- } else
+ } else {
TRY_IO(riff_skip(reader, (chunk_size + 1) & ~1));
+ }
+ reader->data_offset += (chunk_size + 9) & ~1;
}
if (fcc == RIFF_FOURCC('d','a','t','a'))
return 0;
return -1;
}
-wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
+static pcm_reader_vtbl_t wav_vtable = {
+ wav_get_format,
+ wav_get_length,
+ wav_get_position,
+ wav_read_frames,
+ wav_teardown
+};
+
+pcm_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
int ignore_length)
{
- wav_reader_t *reader;
+ wav_reader_t *reader = 0;
int64_t data_length;
+ unsigned bpf;
if ((reader = calloc(1, sizeof(wav_reader_t))) == 0)
return 0;
free(reader);
return 0;
}
- if (ignore_length || !data_length ||
- data_length % reader->sample_format.bytes_per_frame != 0)
+ bpf = reader->sample_format.bytes_per_frame;
+ if (ignore_length || !data_length || data_length % bpf)
reader->length = INT64_MAX;
else
- reader->length = data_length / reader->sample_format.bytes_per_frame;
- return reader;
+ reader->length = data_length / bpf;
+
+ if (reader->length == INT64_MAX && reader->io.seek && reader->io.tell) {
+ if (reader->io.seek(reader->io_cookie, 0, SEEK_END) >= 0) {
+ int64_t size = reader->io.tell(reader->io_cookie);
+ if (size > 0)
+ reader->length = (size - reader->data_offset) / bpf;
+ reader->io.seek(reader->io_cookie, reader->data_offset, SEEK_SET);
+ }
+ }
+ reader->vtbl = &wav_vtable;
+ return (pcm_reader_t *)reader;
}
-wav_reader_t *raw_open(wav_io_context_t *io_ctx, void *io_cookie,
+pcm_reader_t *raw_open(wav_io_context_t *io_ctx, void *io_cookie,
const pcm_sample_description_t *desc)
{
wav_reader_t *reader = 0;
memcpy(&reader->sample_format, desc, sizeof(pcm_sample_description_t));
reader->io_cookie = io_cookie;
if (io_ctx->seek && io_ctx->tell) {
- TRY_IO(riff_seek(reader, 0, SEEK_END));
- reader->length = riff_tell(reader) / desc->bytes_per_frame;
- TRY_IO(riff_seek(reader, 0, SEEK_SET));
+ if (reader->io.seek(reader->io_cookie, 0, SEEK_END) >= 0) {
+ int64_t size = reader->io.tell(reader->io_cookie);
+ if (size > 0)
+ reader->length = size / desc->bytes_per_frame;
+ reader->io.seek(reader->io_cookie, reader->data_offset, SEEK_SET);
+ }
} else
reader->length = INT64_MAX;
- return reader;
-FAIL:
- if (reader)
- free(reader);
- return 0;
+ reader->vtbl = &wav_vtable;
+ return (pcm_reader_t *)reader;
}