diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 04:38:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-11 05:00:50 +0100 |
| commit | 7f39352a1b661771cf471986059027acd8e0e31f (patch) | |
| tree | 2d115267ace903c3844d3044762a24bfc8aaf546 /libavformat/oggparseopus.c | |
| parent | 39d11d599cd292485fe991cd22e10d7a1738b3bc (diff) | |
| download | ffmpeg-7f39352a1b661771cf471986059027acd8e0e31f.tar.gz | |
avformat/oggparseopus: calculate pts/dts for initial packets after seeking
based on code from oggparsevorbis
Fixes Ticket3124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseopus.c')
| -rw-r--r-- | libavformat/oggparseopus.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 96aeb382cf..edcb7b4529 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -113,6 +113,36 @@ static int opus_packet(AVFormatContext *avf, int idx) if (!os->psize) return AVERROR_INVALIDDATA; + if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) { + int seg, d; + int duration; + uint8_t *last_pkt = os->buf + os->pstart; + uint8_t *next_pkt = last_pkt; + + duration = 0; + seg = os->segp; + d = opus_duration(last_pkt, os->psize); + if (d < 0) { + os->pflags |= AV_PKT_FLAG_CORRUPT; + return 0; + } + duration += d; + last_pkt = next_pkt = next_pkt + os->psize; + for (; seg < os->nsegs; seg++) { + if (os->segments[seg] < 255) { + int d = opus_duration(last_pkt, os->segments[seg]); + if (d < 0) { + duration = os->granule; + break; + } + duration += d; + last_pkt = next_pkt + os->segments[seg]; + } + next_pkt += os->segments[seg]; + } + os->lastpts = + os->lastdts = os->granule - duration; + } os->pduration = opus_duration(packet, os->psize); if (os->lastpts != AV_NOPTS_VALUE) { |