Mercurial > libavformat.hg
changeset 2206:c049274b7bd4 libavformat
support files with COMM chunk after SSND, fix invalid_nocommon.aiff which is spec compliant
| author | bcoudurier |
|---|---|
| date | Mon, 25 Jun 2007 21:31:33 +0000 |
| parents | 28eb72f5208a |
| children | 87818c05d64d |
| files | aiff.c |
| diffstat | 1 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/aiff.c Mon Jun 25 20:34:20 2007 +0000 +++ b/aiff.c Mon Jun 25 21:31:33 2007 +0000 @@ -289,7 +289,8 @@ static int aiff_read_header(AVFormatContext *s, AVFormatParameters *ap) { - int size, filesize, offset; + int size, filesize; + offset_t offset = 0; uint32_t tag; unsigned version = AIFF_C_VERSION1; ByteIOContext *pb = &s->pb; @@ -327,6 +328,8 @@ st->nb_frames = get_aiff_header (pb, st->codec, size, version); if (st->nb_frames < 0) return st->nb_frames; + if (offset > 0) // COMM is after SSND + goto got_sound; break; case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */ @@ -352,7 +355,15 @@ case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */ get_be32(pb); /* Block align... don't care */ offset = get_be32(pb); /* Offset of sound data */ - goto got_sound; + offset += url_ftell(pb); /* Compute absolute data offset */ + if (st->codec->codec_id) /* Assume COMM already parsed */ + goto got_sound; + if (url_is_streamed(pb)) { + av_log(s, AV_LOG_ERROR, "file is not seekable\n"); + return -1; + } + url_fskip(pb, size - 8); + break; default: /* Jump */ if (size & 1) /* Always even aligned */ @@ -374,7 +385,7 @@ st->duration = st->nb_frames; /* Position the stream at the first block */ - url_fskip(pb, offset); + url_fseek(pb, offset, SEEK_SET); return 0; }