diff options
| author | Alexander Strange <astrange@ithinksw.com> | 2010-10-10 02:17:26 +0000 |
|---|---|---|
| committer | Alexander Strange <astrange@ithinksw.com> | 2010-10-10 02:17:26 +0000 |
| commit | 0ff4f0c0fc31974e315b657eb64494c37d178025 (patch) | |
| tree | 4e9f474404880bd842a47711ad94969aa1d64c12 /ffmpeg.c | |
| parent | 1e6f8d53fc8153da17ed2e6f2a0bde5a1b8d3419 (diff) | |
| download | ffmpeg-0ff4f0c0fc31974e315b657eb64494c37d178025.tar.gz | |
ffmpeg: Use guess_correct_pts() to set decoded picture timestamps
Originally committed as revision 25431 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -312,6 +312,7 @@ typedef struct AVInputStream { int64_t next_pts; /* synthetic pts for cases where pkt.pts is not defined */ int64_t pts; /* current pts */ + PtsCorrectionContext pts_ctx; int is_start; /* is 1 at the start and after a discontinuity */ int showed_multi_packet_warning; int is_past_recording_time; @@ -1542,6 +1543,7 @@ static int output_packet(AVInputStream *ist, int ist_index, void *buffer_to_free; static unsigned int samples_size= 0; AVSubtitle subtitle, *subtitle_to_free; + int64_t pkt_pts = AV_NOPTS_VALUE; #if CONFIG_AVFILTER int frame_available; #endif @@ -1564,6 +1566,8 @@ static int output_packet(AVInputStream *ist, int ist_index, 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->pts != AV_NOPTS_VALUE) + pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q); //while we have more to decode or while the decoder did output something on EOF while (avpkt.size > 0 || (!pkt && ist->next_pts != ist->pts)) { @@ -1616,6 +1620,8 @@ static int output_packet(AVInputStream *ist, int ist_index, decoded_data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2; /* XXX: allocate picture correctly */ avcodec_get_frame_defaults(&picture); + ist->st->codec->reordered_opaque = pkt_pts; + pkt_pts = AV_NOPTS_VALUE; ret = avcodec_decode_video2(ist->st->codec, &picture, &got_picture, &avpkt); @@ -1626,6 +1632,7 @@ static int output_packet(AVInputStream *ist, int ist_index, /* no picture yet */ goto discard_packet; } + ist->next_pts = ist->pts = guess_correct_pts(&ist->pts_ctx, picture.reordered_opaque, ist->pts); 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 * @@ -2414,6 +2421,7 @@ static int transcode(AVFormatContext **output_files, st= ist->st; ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0; ist->next_pts = AV_NOPTS_VALUE; + init_pts_correction(&ist->pts_ctx); ist->is_start = 1; } |