X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fomadec.c;h=b08005538ccefbe9d987cdb14a7afd0b4d51c266;hb=7474ea74952b4d1be3bcd07efca5bd6c44b36b7a;hp=42954130bc933cf5b7a8d19e7262a5a94e9fc595;hpb=8f79cd4764f7cdf3c5b5252e39ee0a6725f2eb94;p=ffmpeg diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 42954130bc9..b08005538cc 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -47,6 +47,7 @@ #include "internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/des.h" +#include "libavutil/mathematics.h" #include "oma.h" #include "pcm.h" #include "id3v2.h" @@ -412,9 +413,12 @@ static int oma_read_header(AVFormatContext *s) static int oma_read_packet(AVFormatContext *s, AVPacket *pkt) { - OMAContext *oc = s->priv_data; - int packet_size = s->streams[0]->codec->block_align; - int ret = av_get_packet(s->pb, pkt, packet_size); + OMAContext *oc = s->priv_data; + AVStream *st = s->streams[0]; + int packet_size = st->codec->block_align; + int byte_rate = st->codec->bit_rate >> 3; + int64_t pos = avio_tell(s->pb); + int ret = av_get_packet(s->pb, pkt, packet_size); if (ret < packet_size) pkt->flags |= AV_PKT_FLAG_CORRUPT; @@ -426,6 +430,12 @@ static int oma_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = 0; + if (pos > 0) { + pkt->pts = + pkt->dts = av_rescale(pos, st->time_base.den, + byte_rate * (int64_t)st->time_base.num); + } + if (oc->encrypted) { /* previous unencrypted block saved in IV for * the next packet (CBC mode) */