static void read_id3(AVFormatContext *s, uint64_t id3pos)
{
- ID3v2ExtraMeta *id3v2_extra_meta = NULL;
+ ID3v2ExtraMeta *id3v2_extra_meta;
if (avio_seek(s->pb, id3pos, SEEK_SET) < 0)
return;
ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0);
if (id3v2_extra_meta) {
- ff_id3v2_parse_apic(s, &id3v2_extra_meta);
- ff_id3v2_parse_chapters(s, &id3v2_extra_meta);
+ ff_id3v2_parse_apic(s, id3v2_extra_meta);
+ ff_id3v2_parse_chapters(s, id3v2_extra_meta);
}
ff_id3v2_free_extra_meta(&id3v2_extra_meta);
}
dsf->audio_size = avio_rl64(pb) / 8 * st->codecpar->channels;
st->codecpar->block_align = avio_rl32(pb);
- if (st->codecpar->block_align > INT_MAX / st->codecpar->channels) {
- avpriv_request_sample(s, "block_align overflow");
+ if (st->codecpar->block_align > INT_MAX / st->codecpar->channels || st->codecpar->block_align <= 0) {
+ avpriv_request_sample(s, "block_align invalid");
return AVERROR_INVALIDDATA;
}
st->codecpar->block_align *= st->codecpar->channels;
st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * 8LL;
+ avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
avio_skip(pb, 4);
/* data chunk */
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
int64_t pos = avio_tell(pb);
+ int ret;
if (pos >= dsf->data_end)
return AVERROR_EOF;
- pkt->stream_index = 0;
if (dsf->data_size > dsf->audio_size) {
int last_packet = pos == (dsf->data_end - st->codecpar->block_align);
if (packet_size <= 0 || skip_size <= 0)
return AVERROR_INVALIDDATA;
- if (av_new_packet(pkt, packet_size) < 0)
- return AVERROR(ENOMEM);
+ if ((ret = av_new_packet(pkt, packet_size)) < 0)
+ return ret;
dst = pkt->data;
for (ch = 0; ch < st->codecpar->channels; ch++) {
ret = avio_read(pb, dst, packet_size / st->codecpar->channels);
avio_skip(pb, skip_size / st->codecpar->channels);
}
+ pkt->pos = pos;
+ pkt->stream_index = 0;
+ pkt->pts = (pos - s->internal->data_offset) / st->codecpar->channels;
+ pkt->duration = packet_size / st->codecpar->channels;
return 0;
}
}
- return av_get_packet(pb, pkt, FFMIN(dsf->data_end - pos, st->codecpar->block_align));
+ ret = av_get_packet(pb, pkt, FFMIN(dsf->data_end - pos, st->codecpar->block_align));
+ if (ret < 0)
+ return ret;
+
+ pkt->stream_index = 0;
+ pkt->pts = (pos - s->internal->data_offset) / st->codecpar->channels;
+ pkt->duration = st->codecpar->block_align / st->codecpar->channels;
+
+ return 0;
}
AVInputFormat ff_dsf_demuxer = {