[vlc-commits] [Git][videolan/vlc][master] 4 commits: libvlccore: add missing vlc_fifo_Held

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d7fa8345 by Steve Lhomme at 2025-11-28T10:17:12+00:00
libvlccore: add missing vlc_fifo_Held

Missing from 322ea200acbca4cf8e11bdc277b442898b77c749

- - - - -
46c628ff by Steve Lhomme at 2025-11-28T10:17:12+00:00
stream_output: simplify test to find the earliest dts to mux

- - - - -
0b3716b0 by Steve Lhomme at 2025-11-28T10:17:12+00:00
mux: mp4: fix unused variable warning

- - - - -
bc676d12 by Steve Lhomme at 2025-11-28T10:17:12+00:00
mux: ts: remove unused variable

- - - - -


4 changed files:

- modules/mux/mp4/mp4.c
- modules/mux/mpeg/ts.c
- src/libvlccore.sym
- src/stream_output/stream_output.c


Changes:

=====================================
modules/mux/mp4/mp4.c
=====================================
@@ -227,6 +227,7 @@ static int MuxStream(sout_mux_t *p_mux, sout_input_t *p_input, mp4_stream_t *p_s
 
 static int stream_cmp(const void *a, const void *b, void *priv)
 {
+    VLC_UNUSED(priv);
     const mp4_stream_t *p_a = *((const mp4_stream_t **)a);
     const mp4_stream_t *p_b = *((const mp4_stream_t **)b);
     static const uint8_t order[ES_CATEGORY_COUNT] = {


=====================================
modules/mux/mpeg/ts.c
=====================================
@@ -452,7 +452,7 @@ static int AddStream( sout_mux_t *, sout_input_t * );
 static void DelStream( sout_mux_t *, sout_input_t * );
 static int Mux      ( sout_mux_t * );
 
-static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo );
+static block_t *FixPES( block_fifo_t *p_fifo );
 static block_t *Add_ADTS( block_t *, const es_format_t * );
 static int TSSchedule   ( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts,
                           vlc_tick_t i_pcr_length, vlc_tick_t i_pcr_dts );
@@ -1245,7 +1245,7 @@ static int MuxStreams( sout_mux_t *p_mux )
                 p_data = Pack_Opus( p_data );
         }
         else
-            p_data = FixPES( p_mux, p_input->p_fifo );
+            p_data = FixPES( p_input->p_fifo );
 
         SetBlockDuration( p_input, p_data );
 
@@ -1556,9 +1556,8 @@ static int Mux( sout_mux_t *p_mux )
 }
 
 #define STD_PES_PAYLOAD 170
-static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo )
+static block_t *FixPES( block_fifo_t *p_fifo )
 {
-    VLC_UNUSED(p_mux);
     block_t *p_data;
     size_t i_size;
 


=====================================
src/libvlccore.sym
=====================================
@@ -741,6 +741,7 @@ vlc_fifo_DequeueUnlocked
 vlc_fifo_DequeueAllUnlocked
 vlc_fifo_GetCount
 vlc_fifo_GetBytes
+vlc_fifo_Held
 vlc_queue_Init
 vlc_queue_EnqueueUnlocked
 vlc_queue_DequeueUnlocked


=====================================
src/stream_output/stream_output.c
=====================================
@@ -507,7 +507,7 @@ void sout_MuxFlush( sout_mux_t *p_mux, sout_input_t *p_input )
  *****************************************************************************/
 int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, vlc_tick_t *pi_dts )
 {
-    vlc_tick_t i_dts = 0;
+    vlc_tick_t i_dts = VLC_TICK_MAX;
     int     i_stream = -1;
 
     assert( i_blocks > 0 );
@@ -529,7 +529,7 @@ int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, vlc_tick_t *pi_dts
         }
 
         p_data = block_FifoShow( p_input->p_fifo );
-        if( i_stream < 0 || p_data->i_dts < i_dts )
+        if( p_data->i_dts < i_dts )
         {
             i_stream = i;
             i_dts    = p_data->i_dts;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f6fd3272db7ca3ec0d57bcefe665b7927ae101bc...bc676d12933885b8ca7e4a27c4bc86c0978ae169

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f6fd3272db7ca3ec0d57bcefe665b7927ae101bc...bc676d12933885b8ca7e4a27c4bc86c0978ae169
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance