From: nu774 Date: Wed, 30 Oct 2013 05:27:28 +0000 (+0900) Subject: use tell() to obtain data chunk offset X-Git-Tag: v0.4.2~1 X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=3de0e22dcc176fb7f34be00d3406235870ae7db4;p=fdkaac.git use tell() to obtain data chunk offset --- diff --git a/src/caf_reader.c b/src/caf_reader.c index ede919a..40162b4 100644 --- a/src/caf_reader.c +++ b/src/caf_reader.c @@ -193,12 +193,10 @@ int caf_parse(caf_reader_t *reader, int64_t *data_length) } else if (fcc == M4AF_FOURCC('d','a','t','a')) { TRY_IO(pcm_skip(&reader->io, 4)); /* mEditCount */ *data_length = (chunk_size == ~0ULL) ? chunk_size : chunk_size - 4; - reader->data_offset += 12; + reader->data_offset = pcm_tell(&reader->io); break; } else TRY_IO(pcm_skip(&reader->io, chunk_size)); - - reader->data_offset += (chunk_size + 8); } ENSURE(reader->sample_format.channels_per_frame); ENSURE(fcc == M4AF_FOURCC('d','a','t','a')); diff --git a/src/main.c b/src/main.c index c3a9cca..ee07e35 100644 --- a/src/main.c +++ b/src/main.c @@ -675,7 +675,7 @@ int parse_raw_spec(const char *spec, pcm_sample_description_t *desc) static pcm_io_vtbl_t pcm_io_vtbl = { read_callback, seek_callback, tell_callback }; -static pcm_io_vtbl_t pcm_io_vtbl_noseek = { read_callback, 0, 0 }; +static pcm_io_vtbl_t pcm_io_vtbl_noseek = { read_callback, 0, tell_callback }; static pcm_reader_t *open_input(aacenc_param_ex_t *params) diff --git a/src/wav_reader.c b/src/wav_reader.c index e69cba7..bb0e93e 100644 --- a/src/wav_reader.c +++ b/src/wav_reader.c @@ -93,7 +93,6 @@ int riff_ds64(wav_reader_t *reader, int64_t *length) 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; } @@ -163,7 +162,6 @@ int wav_parse(wav_reader_t *reader, int64_t *data_length) 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); @@ -174,12 +172,11 @@ int wav_parse(wav_reader_t *reader, int64_t *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;