github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

vo: add a unique frame_id to vo_frame 

We think that this allows simpler logic than using the redraw and repeat
fields. Not used yet.
This commit is contained in:
wm4 2016-09-22 20:16:44 +02:00
parent c296b6204f
commit 9179e8ed21
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
video/out/vo.c
View File

@ -154,6 +154,7 @@ struct vo_internal {
bool rendering; // true if an image is being rendered
struct vo_frame *frame_queued; // should be drawn next
int req_frames; // VO's requested value of num_frames
uint64_t current_frame_id;
double display_fps;
int opt_framedrop;
@ -597,6 +598,7 @@ static void forget_frames(struct vo *vo)
in->delayed_count = 0;
talloc_free(in->frame_queued);
in->frame_queued = NULL;
in->current_frame_id += VO_MAX_REQ_FRAMES + 1;
// don't unref current_frame; we always want to be able to redraw it
if (in->current_frame) {
in->current_frame->num_vsyncs = 0; // but reset future repeats
@ -699,6 +701,7 @@ void vo_queue_frame(struct vo *vo, struct vo_frame *frame)
assert(vo->config_ok && !in->frame_queued &&
(!in->current_frame || in->current_frame->num_vsyncs < 1));
in->hasframe = true;
frame->frame_id = ++(in->current_frame_id);
in->frame_queued = frame;
in->wakeup_pts = frame->display_synced
? 0 : frame->pts + MPMAX(frame->duration, 0);

6
video/out/vo.h
View File

@ -211,6 +211,12 @@ struct vo_frame {
// VO if frames are dropped.
int num_frames;
struct mp_image *frames[VO_MAX_REQ_FRAMES];
// ID for frames[0] (== current). If current==NULL, the number is
// meaningless. Otherwise, it's an unique ID for the frame. The ID for
// a frame is guaranteed not to change (instant redraws will use the same
// ID). frames[n] has the ID frame_id+n, with the guarantee that frame
// drops or reconfigs will keep the guarantee.
uint64_t frame_id;
};
struct vo_driver {