vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Dec 9 12:18:25 2018 +0200| [dc1527267886c4d8c9f19459e8b4018025464c10] | committer: Rémi Denis-Courmont
vout: factor display prepare So far, if picture is DR, then SPU is either DR (!do_dr_spu) or it was blent early (subpic == NULL). As such, the late blend & prepare logic in the non-DR case works just fine for the DR case. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dc1527267886c4d8c9f19459e8b4018025464c10 --- src/video_output/video_output.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index d4688cf885..591b648a03 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1197,14 +1197,11 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced) return VLC_EGENERIC; } - if (sys->display.use_dr) { - vout_display_Prepare(vd, todisplay, subpic, todisplay->date); - } else { - if (!do_dr_spu && sys->spu_blend != NULL && subpic != NULL) - picture_BlendSubpicture(todisplay, sys->spu_blend, subpic); - vout_display_Prepare(vd, todisplay, do_dr_spu ? subpic : NULL, - todisplay->date); - } + if (!do_dr_spu && sys->spu_blend != NULL && subpic != NULL) + picture_BlendSubpicture(todisplay, sys->spu_blend, subpic); + + vout_display_Prepare(vd, todisplay, do_dr_spu ? subpic : NULL, + todisplay->date); vout_chrono_Stop(&sys->render); #if 0 _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
