diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-10 14:59:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-10 15:27:54 +0100 |
| commit | eb4fc6acfede7ced5737c5bf023f00bcf44041ab (patch) | |
| tree | d85e841b66c69e80d49d5eeb49b70765f540f258 /ffmpeg.c | |
| parent | 80f716cd457d9188b378fc9883f6d3b7fe735f4e (diff) | |
| download | ffmpeg-eb4fc6acfede7ced5737c5bf023f00bcf44041ab.tar.gz | |
ffmpeg: update timestamping code to handle frame threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 22 |
1 files changed, 18 insertions, 4 deletions
@@ -1630,6 +1630,7 @@ static int output_packet(InputStream *ist, int ist_index, void *buffer_to_free = NULL; static unsigned int samples_size= 0; AVSubtitle subtitle, *subtitle_to_free; + int64_t pkt_dts = AV_NOPTS_VALUE; int64_t pkt_pts = AV_NOPTS_VALUE; #if CONFIG_AVFILTER int frame_available; @@ -1652,8 +1653,11 @@ static int output_packet(InputStream *ist, int ist_index, avpkt = *pkt; } - if(pkt->dts != AV_NOPTS_VALUE) - ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + if(pkt->dts != AV_NOPTS_VALUE){ + if(ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || !ist->decoding_needed) + ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + pkt_dts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + } if(pkt->pts != AV_NOPTS_VALUE) pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q); @@ -1710,8 +1714,15 @@ static int output_packet(InputStream *ist, int ist_index, if (!(decoded_frame = avcodec_alloc_frame())) return AVERROR(ENOMEM); avpkt.pts = pkt_pts; - avpkt.dts = ist->pts; + avpkt.dts = pkt_dts; pkt_pts = AV_NOPTS_VALUE; + if(pkt_dts != AV_NOPTS_VALUE && ist->st->codec->time_base.num != 0) { + int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame; + pkt_dts += ((int64_t)AV_TIME_BASE * + ist->st->codec->time_base.num * ticks) / + ist->st->codec->time_base.den; + }else + pkt_dts = AV_NOPTS_VALUE; ret = avcodec_decode_video2(ist->st->codec, decoded_frame, &got_output, &avpkt); @@ -1723,7 +1734,10 @@ static int output_packet(InputStream *ist, int ist_index, av_freep(&decoded_frame); goto discard_packet; } - ist->next_pts = ist->pts = decoded_frame->best_effort_timestamp; + + if(decoded_frame->best_effort_timestamp != AV_NOPTS_VALUE) + ist->next_pts = ist->pts = decoded_frame->best_effort_timestamp; + if (ist->st->codec->time_base.num != 0) { int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame; ist->next_pts += ((int64_t)AV_TIME_BASE * |