[FFmpeg-devel] [PATCH] avformat/oggenc: fix page duration calculation when granule differs from timestamp

[James Almer]

Signed-off-by: James Almer <jamrial at gmail.com>
---

 libavformat/oggenc.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index f998af3..296028e 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -263,10 +263,10 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
         {
             AVStream *st = s->streams[page->stream_index];
 
-            int64_t start = av_rescale_q(page->start_granule, st->time_base,
-                                         AV_TIME_BASE_Q);
-            int64_t next  = av_rescale_q(page->granule, st->time_base,
-                                         AV_TIME_BASE_Q);
+            int64_t start = av_rescale_q(ogg_granule_to_timestamp(oggstream, page->start_granule),
+                                         st->time_base, AV_TIME_BASE_Q);
+            int64_t next  = av_rescale_q(ogg_granule_to_timestamp(oggstream, page->granule),
+                                         st->time_base, AV_TIME_BASE_Q);
 
             if (page->segments_count == 255) {
                 ogg_buffer_page(s, oggstream);
@@ -596,7 +596,7 @@ static int ogg_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
         granule = pkt->pts + pkt->duration;
 
     if (oggstream->page.start_granule == AV_NOPTS_VALUE)
-        oggstream->page.start_granule = pkt->pts;
+        oggstream->page.start_granule = granule;
 
     ret = ogg_buffer_data(s, st, pkt->data, pkt->size, granule, 0);
     if (ret < 0)
-- 
2.9.0