summaryrefslogtreecommitdiffstats
path: root/sub/osd_state.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-18 12:33:14 +0100
committerwm4 <wm4@nowhere>2015-03-18 13:15:20 +0100
commit51befc9debef818cbf071aebf8861457ac095f8d (patch)
tree140152a3b5db9655c5b869d83a7d0c6212c91a6a /sub/osd_state.h
parent15478ca31c48d46b576264299803ab43fdeb1d04 (diff)
downloadmpv-51befc9debef818cbf071aebf8861457ac095f8d.tar.bz2
mpv-51befc9debef818cbf071aebf8861457ac095f8d.tar.xz
osd: simplify an aspect of change detection handling
There was a somewhat obscure optimization in the OSD and subtitle rendering path: if only the position of the sub-images changed, and not the actual image data, uploading of the image data could be skipped. In theory, this could speed up things like scrolling subtitles. But it turns out that even in the rare cases subtitles have such scrolls or axis-aligned movement, modern libass rarely signals this kind of change. Possibly this is because of sub-pixel handling and such, which break this. As such, it's a worthless optimization and just introduces additional complexity and subtle bugs (especially in cases libass does the opposite: incorrectly signaling a position change only, which happened before). Remove this optimization, and rename bitmap_pos_id to change_id.
Diffstat (limited to 'sub/osd_state.h')
-rw-r--r--sub/osd_state.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sub/osd_state.h b/sub/osd_state.h
index 01546d7c6f..73bfcdd7d3 100644
--- a/sub/osd_state.h
+++ b/sub/osd_state.h
@@ -36,8 +36,7 @@ struct osd_object {
struct sub_bitmaps cached;
// VO cache state
- int vo_bitmap_id;
- int vo_bitmap_pos_id;
+ int vo_change_id;
struct mp_osd_res vo_res;
// Internally used by osd_libass.c