vo_xv, vo_x11: simplify OSD redrawing

In order to support OSD redrawing for vo_xv and vo_x11, draw_bmp.c
included an awkward "backup" mechanism to copy and restore image
regions that have been changed by OSD/subtitles.

Replace this by a much simpler mechanism: keep a reference to the
original image, and use that to restore the Xv/X framebuffers.

In the worst case, this may increase cache pressure and memory usage,
even if no OSD or subtitles are rendered. In practice, it seems to be
always faster.

1 files changed, 0 insertions, 5 deletions

diff --git a/sub/sub.h b/sub/sub.h
index 38b7b29f34..c7f8a8b022 100644
--- a/sub/sub.h
+++ b/sub/sub.h
@@ -227,11 +227,6 @@ void osd_draw_on_image_p(struct osd_state *osd, struct mp_osd_res res,
                          double video_pts, int draw_flags,
                          struct mp_image_pool *pool, struct mp_image *dest);
 
-struct mp_draw_sub_backup;
-void osd_draw_on_image_bk(struct osd_state *osd, struct mp_osd_res res,
-                          double video_pts, int draw_flags,
-                          struct mp_draw_sub_backup *bk, struct mp_image *dest);
-
 struct mp_rect;
 bool sub_bitmaps_bb(struct sub_bitmaps *imgs, struct mp_rect *out_bb);