/* parse format description */
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codecpar->sample_rate = av_int2double(avio_rb64(pb));
+ st->codecpar->sample_rate = av_clipd(av_int2double(avio_rb64(pb)), 0, INT_MAX);
st->codecpar->codec_tag = avio_rl32(pb);
flags = avio_rb32(pb);
caf->bytes_per_packet = avio_rb32(pb);
st->codecpar->channels = avio_rb32(pb);
st->codecpar->bits_per_coded_sample = avio_rb32(pb);
+ if (caf->bytes_per_packet < 0 || caf->frames_per_packet < 0 || st->codecpar->channels < 0)
+ return AVERROR_INVALIDDATA;
+
/* calculate bit rate for constant size packets */
if (caf->frames_per_packet > 0 && caf->bytes_per_packet > 0) {
st->codecpar->bit_rate = (uint64_t)st->codecpar->sample_rate * (uint64_t)caf->bytes_per_packet * 8
CafContext *caf = s->priv_data;
int64_t pos = 0, ccount, num_packets;
int i;
+ int ret;
ccount = avio_tell(pb);
st->nb_frames += avio_rb32(pb); /* priming frames */
st->nb_frames += avio_rb32(pb); /* remainder frames */
- st->duration = 0;
- for (i = 0; i < num_packets; i++) {
- av_add_index_entry(s->streams[0], pos, st->duration, 0, 0, AVINDEX_KEYFRAME);
- pos += caf->bytes_per_packet ? caf->bytes_per_packet : ff_mp4_read_descr_len(pb);
- st->duration += caf->frames_per_packet ? caf->frames_per_packet : ff_mp4_read_descr_len(pb);
+ if (caf->bytes_per_packet > 0 && caf->frames_per_packet > 0) {
+ st->duration = caf->frames_per_packet * num_packets;
+ pos = caf-> bytes_per_packet * num_packets;
+ } else {
+ st->duration = 0;
+ for (i = 0; i < num_packets; i++) {
+ if (avio_feof(pb))
+ return AVERROR_INVALIDDATA;
+ ret = av_add_index_entry(s->streams[0], pos, st->duration, 0, 0, AVINDEX_KEYFRAME);
+ if (ret < 0)
+ return ret;
+ pos += caf->bytes_per_packet ? caf->bytes_per_packet : ff_mp4_read_descr_len(pb);
+ st->duration += caf->frames_per_packet ? caf->frames_per_packet : ff_mp4_read_descr_len(pb);
+ }
}
if (avio_tell(pb) - ccount > size) {
.read_header = read_header,
.read_packet = read_packet,
.read_seek = read_seek,
- .codec_tag = (const AVCodecTag* const []){ ff_codec_caf_tags, 0 },
+ .codec_tag = ff_caf_codec_tags_list,
};