[vlc-commits] [Git][videolan/vlc][master] es_out: remove unused es_cat array

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
500b8e2a by Thomas Guillem at 2025-01-30T14:32:56+00:00
es_out: remove unused es_cat array

Forgot to remove this leftover from 709610a2a3aa7fbbd745e90f6c7273d2b25becb3

EsOutGetFromID() was made obsolete in a88c34e608bd204375fac02ec515e8f39867666e

- - - - -


1 changed file:

- src/input/es_out.c


Changes:

=====================================
src/input/es_out.c
=====================================
@@ -694,8 +694,6 @@ static vlc_tick_t EsOutGetWakeup(es_out_sys_t *p_sys)
     return input_clock_GetWakeup( p_sys->p_pgrm->p_input_clock );
 }
 
-static es_out_id_t es_cat[DATA_ES];
-
 static bool EsOutDecodersIsEmpty(es_out_sys_t *p_sys)
 {
     es_out_id_t *es;
@@ -3234,28 +3232,21 @@ static int EsOutVaControlLocked(es_out_sys_t *p_sys, input_source_t *source,
     case ES_OUT_SET_ES:
     case ES_OUT_RESTART_ES:
     {
-#define IGNORE_ES DATA_ES
         es_out_id_t *es = va_arg( args, es_out_id_t * ), *other;
 
         enum es_format_category_e i_cat;
         if( es == NULL )
             i_cat = UNKNOWN_ES;
-        else if( es == es_cat + AUDIO_ES )
-            i_cat = AUDIO_ES;
-        else if( es == es_cat + VIDEO_ES )
-            i_cat = VIDEO_ES;
-        else if( es == es_cat + SPU_ES )
-            i_cat = SPU_ES;
         else
         {
             if (es->b_terminated)
                 return VLC_EGENERIC;
-            i_cat = IGNORE_ES;
+            i_cat = es->fmt.i_cat;
         }
 
         foreach_es_then_es_slaves(other)
         {
-            if (i_cat == IGNORE_ES && es == other)
+            if (es == other)
             {
                 if (i_query == ES_OUT_RESTART_ES && es->p_dec != NULL)
                 {
@@ -3320,18 +3311,6 @@ static int EsOutVaControlLocked(es_out_sys_t *p_sys, input_source_t *source,
             /*p_sys->i_default_audio_id = -1;*/
             p_sys->sub.i_demux_id = -1;
         }
-        else if( es == es_cat + AUDIO_ES )
-        {
-            /*p_sys->i_default_video_id = -1;*/
-        }
-        else if( es == es_cat + VIDEO_ES )
-        {
-            /*p_sys->i_default_audio_id = -1;*/
-        }
-        else if( es == es_cat + SPU_ES )
-        {
-            p_sys->sub.i_demux_id = -1;
-        }
         else
         {
             /*if( es->fmt.i_cat == VIDEO_ES )



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/500b8e2afb2980b0bcecc0895171a1eb1e4d5788

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


VideoLAN code repository instance