diff options
| author | Marton Balint <cus@passwd.hu> | 2011-10-19 01:08:41 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2011-10-24 22:44:47 +0200 |
| commit | 8f17a8efd6488be6976739927e5a1d80adcce37f (patch) | |
| tree | d2d158ce592bfca72de713fc174ff336ae2204a6 /ffplay.c | |
| parent | 223cba6e3aa864fc89a5e4ad1b8597dc4486a213 (diff) | |
| download | ffmpeg-8f17a8efd6488be6976739927e5a1d80adcce37f.tar.gz | |
ffplay: consider estimated time of filter in early frame drop
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -198,6 +198,8 @@ typedef struct VideoState { double frame_last_pts; double frame_last_duration; double frame_last_dropped_pts; + double frame_last_returned_time; + double frame_last_filter_delay; int64_t frame_last_dropped_pos; double video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame int video_stream; @@ -1499,7 +1501,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke double ptsdiff = dpts - is->frame_last_pts; if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD && ptsdiff > 0 && ptsdiff < AV_NOSYNC_THRESHOLD && - clockdiff + ptsdiff < 0) { //TODO: Substract approxiamte time of filter + clockdiff + ptsdiff - is->frame_last_filter_delay < 0) { is->frame_last_dropped_pos = pkt->pos; is->frame_last_dropped_pts = dpts; ret = 0; @@ -1508,6 +1510,9 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke SDL_UnlockMutex(is->pictq_mutex); } + if (ret) + is->frame_last_returned_time = av_gettime() / 1000000.0; + return ret; } return 0; @@ -1832,6 +1837,10 @@ static int video_thread(void *arg) if (ret < 0) goto the_end; + is->frame_last_filter_delay = av_gettime() / 1000000.0 - is->frame_last_returned_time; + if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0) + is->frame_last_filter_delay = 0; + #if CONFIG_AVFILTER if (!picref) continue; |