Commit c369ddb7 authored by Marton Balint's avatar Marton Balint Committed by Michael Niedermayer

ffplay: pass frame durations clearly to video video_refresh

Previously the target clock of the next frame was calculated by using video_clock
which is modified from another thread...
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3a1df52e
...@@ -98,6 +98,7 @@ typedef struct PacketQueue { ...@@ -98,6 +98,7 @@ typedef struct PacketQueue {
typedef struct VideoPicture { typedef struct VideoPicture {
double pts; ///<presentation time stamp for this picture double pts; ///<presentation time stamp for this picture
double target_clock; ///<av_gettime() time at which this should be displayed ideally double target_clock; ///<av_gettime() time at which this should be displayed ideally
double duration; ///<expected duration of the frame
int64_t pos; ///<byte position in file int64_t pos; ///<byte position in file
SDL_Overlay *bmp; SDL_Overlay *bmp;
int width, height; /* source height & width */ int width, height; /* source height & width */
...@@ -1136,7 +1137,7 @@ retry: ...@@ -1136,7 +1137,7 @@ retry:
assert(nextvp->target_clock >= vp->target_clock); assert(nextvp->target_clock >= vp->target_clock);
next_target= nextvp->target_clock; next_target= nextvp->target_clock;
}else{ }else{
next_target= vp->target_clock + is->video_clock - vp->pts; //FIXME pass durations cleanly next_target= vp->target_clock + vp->duration;
} }
if((framedrop>0 || (framedrop && is->audio_st)) && time > next_target){ if((framedrop>0 || (framedrop && is->audio_st)) && time > next_target){
is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR; is->skip_frames *= 1.0 + FRAME_SKIP_FACTOR;
...@@ -1341,6 +1342,8 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_ ...@@ -1341,6 +1342,8 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_
vp = &is->pictq[is->pictq_windex]; vp = &is->pictq[is->pictq_windex];
vp->duration = frame_delay;
/* alloc or resize hardware picture buffer */ /* alloc or resize hardware picture buffer */
if (!vp->bmp || if (!vp->bmp ||
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment