#define AIFF 0
#define AIFF_C_VERSION1 0xA2805140
+typedef struct {
+ int64_t data_end;
+} AIFFInputContext;
+
static enum CodecID aiff_codec_get_id(int bps)
{
if (bps <= 8)
unsigned version = AIFF_C_VERSION1;
ByteIOContext *pb = s->pb;
AVStream * st;
+ AIFFInputContext *aiff = s->priv_data;
/* check FORM header */
filesize = get_tag(pb, &tag);
get_meta(s, "comment" , size);
break;
case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */
+ aiff->data_end = url_ftell(pb) + size;
offset = get_be32(pb); /* Offset of sound data */
get_be32(pb); /* BlockSize... don't care */
offset += url_ftell(pb); /* Compute absolute data offset */
AVPacket *pkt)
{
AVStream *st = s->streams[0];
+ AIFFInputContext *aiff = s->priv_data;
+ int64_t max_size;
int res;
+ /* calculate size of remaining data */
+ max_size = aiff->data_end - url_ftell(s->pb);
+ if (max_size <= 0)
+ return AVERROR_EOF;
+
/* Now for that packet */
- res = av_get_packet(s->pb, pkt, (MAX_SIZE / st->codec->block_align) * st->codec->block_align);
+ max_size = FFMIN(max_size, (MAX_SIZE / st->codec->block_align) * st->codec->block_align);
+ res = av_get_packet(s->pb, pkt, max_size);
if (res < 0)
return res;
AVInputFormat aiff_demuxer = {
"aiff",
NULL_IF_CONFIG_SMALL("Audio IFF"),
- 0,
+ sizeof(AIFFInputContext),
aiff_probe,
aiff_read_header,
aiff_read_packet,