diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-08-28 19:12:27 +0300 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:46 +0200 |
| commit | fd52cb65f43d262493724899c7b0fb49971f745d (patch) | |
| tree | ae6b38171d67b26ad05aaf107fb48ab8e63ab96e /sub/sd_ass.c | |
| parent | 62ccf6c5cccdf1a34a4b85f91615f0f8305b5279 (diff) | |
| download | mpv-fd52cb65f43d262493724899c7b0fb49971f745d.tar.bz2 mpv-fd52cb65f43d262493724899c7b0fb49971f745d.tar.xz | |
subs, vo: do sub bitmap change detection by comparing IDs
vo_vdpau and vo_gl cache the last subtitle bitmaps uploaded to video
card in case they stay the same over multiple frames. Detecting
whether the bitmaps have changed and should be re-uploaded was
somewhat fragile. Change the VO API to provide a bitmap ID which can
be compared with what the VO has to determine whether a new upload of
the bitmaps is needed.
Conflicts:
libvo/vo_gl.c
Note: the changes for vo_gl.c were not merged. Instead, eosd_packer is
modified to use the new way of detecting EOSD changes. This takes care
of vo_gl, vo_gl3 and vo_direct3d, which all render EOSD. They don't
need to be updated in turn.
Diffstat (limited to 'sub/sd_ass.c')
| -rw-r--r-- | sub/sd_ass.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 72dee06018..67bbd4665e 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -140,8 +140,13 @@ static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd, ASS_Renderer *renderer = osd->ass_renderer; mp_ass_configure(renderer, opts, &osd->dim, osd->unscaled); ass_set_aspect_ratio(renderer, scale, 1); + int changed; res->imgs = ass_render_frame(renderer, ctx->ass_track, - osd->sub_pts * 1000 + .5, &res->changed); + osd->sub_pts * 1000 + .5, &changed); + if (changed == 2) + res->bitmap_id = ++res->bitmap_pos_id; + else if (changed) + res->bitmap_pos_id++; } static void reset(struct sh_sub *sh, struct osd_state *osd) |