RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: fix --blend-subtitles handling 

The intention was that if --blend-subtitles is enabled, the frame should
always be re-rendered instead of using e.g. a cached scaled frame. The
reason is that subtitles can change anyway, e.g. if you pause and change
subtitle size and such.

On the other hand, if the frame is marked as repeated, it should always
use the cached copy. Actually "simplify" this and drop the cache only if
playback is paused (which frame->still indicates indirectly).

Also see PR #3773.
This commit is contained in:
wm4 2016-11-07 22:49:24 +01:00
parent de72cb2c33
commit 6a06e6002b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
video/out/opengl/video.c
View File

@ -2802,8 +2802,8 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo)
bool is_new = frame->frame_id != p->image.id;
// Redrawing a frame might update subtitles.
if (!frame->repeat && p->opts.blend_subs)
is_new = false;
if (frame->still && p->opts.blend_subs)
is_new = true;
if (is_new || !p->output_fbo_valid) {
p->output_fbo_valid = false;