summaryrefslogtreecommitdiffstats
path: root/sub/draw_bmp.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-22 17:50:15 +0100
committerwm4 <wm4@nowhere>2013-01-13 20:04:12 +0100
commit3d6d549dac2aa06ecd07bb04902f55140661ace3 (patch)
tree80d548014a2363fe236ca061c87282a5c05ee8c2 /sub/draw_bmp.h
parent1c65428d6f70f05333ecc8284e3f235c679fff26 (diff)
downloadmpv-3d6d549dac2aa06ecd07bb04902f55140661ace3.tar.bz2
mpv-3d6d549dac2aa06ecd07bb04902f55140661ace3.tar.xz
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.
Diffstat (limited to 'sub/draw_bmp.h')
-rw-r--r--sub/draw_bmp.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/sub/draw_bmp.h b/sub/draw_bmp.h
index 2eae68b58c..489e91f666 100644
--- a/sub/draw_bmp.h
+++ b/sub/draw_bmp.h
@@ -12,14 +12,6 @@ void mp_draw_sub_bitmaps(struct mp_draw_sub_cache **cache, struct mp_image *dst,
extern const bool mp_draw_sub_formats[SUBBITMAP_COUNT];
-struct mp_draw_sub_backup;
-struct mp_draw_sub_backup *mp_draw_sub_backup_new(void);
-void mp_draw_sub_backup_add(struct mp_draw_sub_backup *backup,
- struct mp_image *img, struct sub_bitmaps *sbs);
-void mp_draw_sub_backup_reset(struct mp_draw_sub_backup *backup);
-bool mp_draw_sub_backup_restore(struct mp_draw_sub_backup *backup,
- struct mp_image *buffer);
-
#endif /* MPLAYER_DRAW_BMP_H */
// vim: ts=4 sw=4 et tw=80