Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: add change timestamp and screen size to struct sub_bitmap_list

Browse Source 
Should be somewhat helpful. (All VOs are full of code trying to
compensate for this, more or less, and this will allow simplifying
some code later. Maybe.)

The screen size is mostly for robustness checks.
This commit is contained in:
wm4
2020-05-09 17:54:33 +02:00
parent b727600d1f
commit b3a9058c0d
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sub/osd.c
View File

@@ -136,6 +136,7 @@ struct osd_state *osd_create(struct mpv_global *global)
.type = n,
.text = talloc_strdup(obj, ""),
.progbar_state = {.type = -1},
.vo_change_id = 1,
};
osd->objs[n] = obj;
}
@@ -293,6 +294,11 @@ static struct sub_bitmaps *render_object(struct osd_state *osd,
res = osd_object_get_bitmaps(osd, obj, format);
}
if (obj->vo_had_output != !!res) {
obj->vo_had_output = !!res;
obj->vo_change_id += 1;
}
if (res) {
obj->vo_change_id += res->change_id;
@@ -314,6 +320,9 @@ struct sub_bitmap_list *osd_render(struct osd_state *osd, struct mp_osd_res res,
pthread_mutex_lock(&osd->lock);
struct sub_bitmap_list *list = talloc_zero(NULL, struct sub_bitmap_list);
list->change_id = 1;
list->w = res.w;
list->h = res.h;
if (osd->force_video_pts != MP_NOPTS_VALUE)
video_pts = osd->force_video_pts;
@@ -352,6 +361,8 @@ struct sub_bitmap_list *osd_render(struct osd_state *osd, struct mp_osd_res res,
}
}
list->change_id += obj->vo_change_id;
talloc_free(imgs);
}