From 3886572a83bf868b51d840071e27f40fc94fbd6b Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sat, 6 Jul 2013 20:47:12 +0200 Subject: [PATCH 1/2] ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE Signed-off-by: Marton Balint --- ffplay.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ffplay.c b/ffplay.c index e66886e7cc..b8783da0a2 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2297,10 +2297,11 @@ static int audio_decode_frame(VideoState *is) audio_clock0 = is->audio_clock; /* update the audio clock with the pts */ - if (is->frame->pts != AV_NOPTS_VALUE) { + if (is->frame->pts != AV_NOPTS_VALUE) is->audio_clock = is->frame->pts * av_q2d(tb) + (double) is->frame->nb_samples / is->frame->sample_rate; - is->audio_clock_serial = is->audio_pkt_temp_serial; - } + else + is->audio_clock = NAN; + is->audio_clock_serial = is->audio_pkt_temp_serial; #ifdef DEBUG { static double last_clock; @@ -2374,8 +2375,10 @@ static void sdl_audio_callback(void *opaque, Uint8 *stream, int len) bytes_per_sec = is->audio_tgt.freq * is->audio_tgt.channels * av_get_bytes_per_sample(is->audio_tgt.fmt); is->audio_write_buf_size = is->audio_buf_size - is->audio_buf_index; /* Let's assume the audio driver that is used by SDL has two periods. */ - set_clock_at(&is->audclk, is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec, is->audio_clock_serial, audio_callback_time / 1000000.0); - sync_clock_to_slave(&is->extclk, &is->audclk); + if (!isnan(is->audio_clock)) { + set_clock_at(&is->audclk, is->audio_clock - (double)(2 * is->audio_hw_buf_size + is->audio_write_buf_size) / bytes_per_sec, is->audio_clock_serial, audio_callback_time / 1000000.0); + sync_clock_to_slave(&is->extclk, &is->audclk); + } } static int audio_open(void *opaque, int64_t wanted_channel_layout, int wanted_nb_channels, int wanted_sample_rate, struct AudioParams *audio_hw_params) From f07cb53ab95172f7c15e14b004c4ebcb04aad44c Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sun, 7 Jul 2013 02:54:22 +0200 Subject: [PATCH 2/2] ffplay: assume 0 stream start time if start time is unset in duration check Fixes ticket #2103 and #2743. Signed-off-by: Marton Balint --- ffplay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index b8783da0a2..dfe99e9c73 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2685,6 +2685,7 @@ static int read_thread(void *arg) int st_index[AVMEDIA_TYPE_NB]; AVPacket pkt1, *pkt = &pkt1; int eof = 0; + int64_t stream_start_time; int pkt_in_play_range = 0; AVDictionaryEntry *t; AVDictionary **opts; @@ -2926,8 +2927,9 @@ static int read_thread(void *arg) continue; } /* check if packet is in play range specified by user, then queue, otherwise discard */ + stream_start_time = ic->streams[pkt->stream_index]->start_time; pkt_in_play_range = duration == AV_NOPTS_VALUE || - (pkt->pts - ic->streams[pkt->stream_index]->start_time) * + (pkt->pts - (stream_start_time != AV_NOPTS_VALUE ? stream_start_time : 0)) * av_q2d(ic->streams[pkt->stream_index]->time_base) - (double)(start_time != AV_NOPTS_VALUE ? start_time : 0) / 1000000 <= ((double)duration / 1000000);