[FFmpeg-cvslog] r17674 - trunk/libavformat/utils.c
michael
subversion
Sun Mar 1 04:17:28 CET 2009
Author: michael
Date: Sun Mar 1 04:17:24 2009
New Revision: 17674
Log:
Disable MPEG1/2 style timestamp calculation for H264 it still randomizes
the timestamps because delay is not known for the first few frames.
Modified:
trunk/libavformat/utils.c
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c Sun Mar 1 04:13:04 2009 (r17673)
+++ trunk/libavformat/utils.c Sun Mar 1 04:17:24 2009 (r17674)
@@ -859,7 +859,8 @@ static void compute_pkt_fields(AVFormatC
// 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);
/* interpolate PTS and DTS if they are not present */
- if(delay==0 || (delay==1 && pc)){
+ //We skip H264 currently because delay and has_b_frames are not reliably set
+ if((delay==0 || (delay==1 && pc)) && st->codec->codec_id != CODEC_ID_H264){
if (presentation_delayed) {
/* DTS = decompression timestamp */
/* PTS = presentation timestamp */
@@ -907,7 +908,7 @@ static void compute_pkt_fields(AVFormatC
FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
if(pkt->dts == AV_NOPTS_VALUE)
pkt->dts= st->pts_buffer[0];
- if(delay>1){
+ if(st->codec->codec_id == CODEC_ID_H264){ //we skiped it above so we try here
update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet
}
if(pkt->dts > st->cur_dts)
More information about the ffmpeg-cvslog
mailing list