virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ffplay: consider estimated time of filter in early frame drop

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2011-10-19 01:08:41 +02:00
parent 223cba6e3a
commit 8f17a8efd6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffplay.c
View File

@ -198,6 +198,8 @@ typedef struct VideoState {
double frame_last_pts; double frame_last_pts;
double frame_last_duration; double frame_last_duration;
double frame_last_dropped_pts; double frame_last_dropped_pts;
double frame_last_returned_time;
double frame_last_filter_delay;
int64_t frame_last_dropped_pos; int64_t frame_last_dropped_pos;
double video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame double video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame
int video_stream; 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; double ptsdiff = dpts - is->frame_last_pts;
if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD && if (fabs(clockdiff) < AV_NOSYNC_THRESHOLD &&
ptsdiff > 0 && ptsdiff < 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_pos = pkt->pos;
is->frame_last_dropped_pts = dpts; is->frame_last_dropped_pts = dpts;
ret = 0; ret = 0;
@ -1508,6 +1510,9 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
SDL_UnlockMutex(is->pictq_mutex); SDL_UnlockMutex(is->pictq_mutex);
} }
if (ret)
is->frame_last_returned_time = av_gettime() / 1000000.0;
return ret; return ret;
} }
return 0; return 0;
@ -1832,6 +1837,10 @@ static int video_thread(void *arg)
if (ret < 0) goto the_end; 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 CONFIG_AVFILTER
if (!picref) if (!picref)
continue; continue;