Mercurial > libavformat.hg

changeset 1922:59d394f558b8 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a delay variable to hold the timestamp buffer size set cur_dts correctly for delay>1
author michael
date Fri, 16 Mar 2007 22:59:45 +0000
parents 3d0b99c7edcc
children 83a496207fb5
files utils.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Fri Mar 16 22:31:57 2007 +0000
+++ b/utils.c	Fri Mar 16 22:59:45 2007 +0000
@@ -578,7 +578,7 @@
 static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
                                AVCodecParserContext *pc, AVPacket *pkt)
 {
-    int num, den, presentation_delayed;
+    int num, den, presentation_delayed, delay;
     /* handle wrapping */
     if(st->cur_dts != AV_NOPTS_VALUE){
         if(pkt->pts != AV_NOPTS_VALUE)
@@ -598,11 +598,12 @@
         pkt->flags |= PKT_FLAG_KEY;
 
     /* do we have a video B frame ? */
+    delay= st->codec->has_b_frames;
     presentation_delayed = 0;
     if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
         /* XXX: need has_b_frame, but cannot get it if the codec is
            not initialized */
-        if (st->codec->has_b_frames &&
+        if (delay &&
             pc && pc->pict_type != FF_B_TYPE)
             presentation_delayed = 1;
         /* this may be redundant, but it shouldnt hurt */
@@ -611,8 +612,7 @@
     }
 
     if(st->cur_dts == AV_NOPTS_VALUE){
-        if(presentation_delayed) st->cur_dts = -pkt->duration;
-        else                     st->cur_dts = 0;
+        st->cur_dts = -delay * pkt->duration;
     }
 
 //    av_log(NULL, AV_LOG_DEBUG, "IN delayed:%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64" st:%d pc:%p\n", presentation_delayed, pkt->pts, pkt->dts, st->cur_dts, pkt->stream_index, pc);