diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-11 23:50:35 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-09-11 23:50:35 +0200 |
| commit | 64908f70e4362d140e288c9ee227249ef5228510 (patch) | |
| tree | 4e887fa3340b857fc3c2f0c37535a7ebb208a38b | |
| parent | 6f6b1d0ddb26a95d5d210ed4566f141b83d774c1 (diff) | |
| download | ffmpeg-64908f70e4362d140e288c9ee227249ef5228510.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>
(cherry picked from commit 7f39352a1b661771cf471986059027acd8e0e31f)
Fixes ticket #3943.
| -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 5a8031471f..6e6adcdb66 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -112,6 +112,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) { |