highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffplay: allow frame dropping if we redisplay an already displayed frame

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2013-02-16 14:24:34 +01:00
parent 36dc476f83
commit 38f649662c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@@ -1307,8 +1307,9 @@ static void video_refresh(void *opaque, double *remaining_time)
} }
if (is->video_st) { if (is->video_st) {
int redisplay = 0;
if (is->force_refresh) if (is->force_refresh)
pictq_prev_picture(is); redisplay = pictq_prev_picture(is);
retry: retry:
if (is->pictq_size == 0) { if (is->pictq_size == 0) {
SDL_LockMutex(is->pictq_mutex); SDL_LockMutex(is->pictq_mutex);
@@ -1325,6 +1326,7 @@ retry:
if (vp->serial != is->videoq.serial) { if (vp->serial != is->videoq.serial) {
pictq_next_picture(is); pictq_next_picture(is);
redisplay = 0;
goto retry; goto retry;
} }
@@ -1355,9 +1357,11 @@ retry:
if (is->pictq_size > 1) { if (is->pictq_size > 1) {
VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE]; VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
duration = nextvp->pts - vp->pts; duration = nextvp->pts - vp->pts;
if(!is->step && (framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) && time > is->frame_timer + duration){ if(!is->step && (redisplay || framedrop>0 || (framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) && time > is->frame_timer + duration){
is->frame_drops_late++; if (!redisplay)
is->frame_drops_late++;
pictq_next_picture(is); pictq_next_picture(is);
redisplay = 0;
goto retry; goto retry;
} }
} }