[vlc-commits] [Git][videolan/vlc][master] vout: remove spu_blend_chroma

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
81385c97 by Steve Lhomme at 2023-08-15T11:00:53+00:00
vout: remove spu_blend_chroma

It's only written for checking if it changed. But if it changed
the spu_blend
must have been deleted anyway. So we only need to test spu_blend.

- - - - -


1 changed file:

- src/video_output/video_output.c


Changes:

=====================================
src/video_output/video_output.c
=====================================
@@ -102,7 +102,6 @@ typedef struct vout_thread_sys_t
 
     /* Subpicture unit */
     spu_t           *spu;
-    vlc_fourcc_t    spu_blend_chroma;
     vlc_blender_t   *spu_blend;
 
     /* Thread & synchronization */
@@ -1170,10 +1169,8 @@ static int PrerenderPicture(vout_thread_sys_t *sys, picture_t *filtered,
             sys->spu_blend->fmt_out.video.i_chroma != fmt_spu.i_chroma) {
             filter_DeleteBlend(sys->spu_blend);
             sys->spu_blend = NULL;
-            sys->spu_blend_chroma = 0;
         }
-        if (!sys->spu_blend && sys->spu_blend_chroma != fmt_spu.i_chroma) {
-            sys->spu_blend_chroma = fmt_spu.i_chroma;
+        if (!sys->spu_blend) {
             sys->spu_blend = filter_NewBlend(VLC_OBJECT(&sys->obj), &fmt_spu);
             if (!sys->spu_blend)
                 msg_Err(&sys->obj, "Failed to create blending filter, OSD/Subtitles will not work");
@@ -1746,7 +1743,6 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo
     sys->pause.is_on = false;
     sys->pause.date  = VLC_TICK_INVALID;
 
-    sys->spu_blend_chroma        = 0;
     sys->spu_blend               = NULL;
 
     video_format_Print(VLC_OBJECT(&vout->obj), "original format", &sys->original);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/81385c97e51c634f1f5028a51548f0796e2a60ff

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/81385c97e51c634f1f5028a51548f0796e2a60ff
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance