Mercurial > libavformat.hg
changeset 5816:c587ece53810 libavformat
oggdec: Move PTS/DTS calculation to a function
| author | conrad |
|---|---|
| date | Thu, 11 Mar 2010 07:17:53 +0000 |
| parents | 9e5e8c64ab54 |
| children | eb9c746c3584 |
| files | oggdec.c |
| diffstat | 1 files changed, 31 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/oggdec.c Thu Mar 11 07:17:49 2010 +0000 +++ b/oggdec.c Thu Mar 11 07:17:53 2010 +0000 @@ -493,6 +493,36 @@ return 0; } +static int64_t ogg_calc_pts(AVFormatContext *s, int idx, int64_t *dts) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + int64_t pts = AV_NOPTS_VALUE; + + if (dts) + *dts = AV_NOPTS_VALUE; + + if (os->lastpts != AV_NOPTS_VALUE) { + pts = os->lastpts; + os->lastpts = AV_NOPTS_VALUE; + } + if (os->lastdts != AV_NOPTS_VALUE) { + if (dts) + *dts = os->lastdts; + os->lastdts = AV_NOPTS_VALUE; + } + if (os->page_end) { + if (os->granule != -1LL) { + if (os->codec && os->codec->granule_is_start) + pts = ogg_gptopts(s, idx, os->granule, dts); + else + os->lastpts = ogg_gptopts(s, idx, os->granule, &os->lastdts); + os->granule = -1LL; + } else + av_log(s, AV_LOG_WARNING, "Packet is missing granule\n"); + } + return pts; +} static int ogg_read_packet (AVFormatContext * s, AVPacket * pkt) @@ -518,25 +548,7 @@ pkt->stream_index = idx; memcpy (pkt->data, os->buf + pstart, psize); - if (os->lastpts != AV_NOPTS_VALUE) { - pkt->pts = os->lastpts; - os->lastpts = AV_NOPTS_VALUE; - } - if (os->lastdts != AV_NOPTS_VALUE) { - pkt->dts = os->lastdts; - os->lastdts = AV_NOPTS_VALUE; - } - if (os->page_end) { - if (os->granule != -1LL) { - if (os->codec && os->codec->granule_is_start) - pkt->pts = ogg_gptopts(s, idx, os->granule, &pkt->dts); - else - os->lastpts = ogg_gptopts(s, idx, os->granule, &os->lastdts); - os->granule = -1LL; - } else - av_log(s, AV_LOG_WARNING, "Packet is missing granule\n"); - } - + pkt->pts = ogg_calc_pts(s, idx, &pkt->dts); pkt->flags = os->pflags; pkt->duration = os->pduration; pkt->pos = fpos;