Split up DecoderDecode function.

No functionnal changes.

src/input/decoder.c

@@ -53,7 +53,7 @@ static decoder_t *CreateDecoder( input_thread_t *, es_format_t *, int, sout_inst
 static void       DeleteDecoder( decoder_t * );
 
 static void      *DecoderThread( vlc_object_t * );
-static int        DecoderDecode( decoder_t * p_dec, block_t *p_block );
+static int        DecoderProcess( decoder_t * p_dec, block_t *p_block );
 static void       DecoderOutputChangePause( decoder_t *p_dec, bool b_paused, mtime_t i_date );
 
 /* Buffers allocation callbacks for the decoders */
@@ -109,14 +109,18 @@ struct decoder_owner_sys_t
     vout_thread_t   *p_vout;
 
     /* -- Theses variables need locking on read *and* write -- */
+    /* */
     /* Pause */
     bool b_paused;
     mtime_t i_pause_date;
 
     /* CC */
-    bool b_cc_supported;
-    bool pb_cc_present[4];
-    decoder_t *pp_cc[4];
+    struct
+    {
+        bool b_supported;
+        bool pb_present[4];
+        decoder_t *pp_decoder[4];
+    } cc;
 
     /* Delay */
     mtime_t i_ts_delay;
@@ -304,7 +308,7 @@ void input_DecoderDelete( decoder_t *p_dec )
     }
 
     /* */
-    if( p_dec->p_owner->b_cc_supported )
+    if( p_dec->p_owner->cc.b_supported )
     {
         int i;
         for( i = 0; i < 4; i++ )
@@ -359,7 +363,7 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
         }
         else
         {
-            DecoderDecode( p_dec, p_block );
+            DecoderProcess( p_dec, p_block );
         }
     }
 }
@@ -381,7 +385,7 @@ void input_DecoderIsCcPresent( decoder_t *p_dec, bool pb_present[4] )
 
     vlc_mutex_lock( &p_owner->lock );
     for( i = 0; i < 4; i++ )
-        pb_present[i] =  p_owner->pb_cc_present[i];
+        pb_present[i] =  p_owner->cc.pb_present[i];
     vlc_mutex_unlock( &p_owner->lock );
 }
 int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
@@ -390,7 +394,7 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
 
     //msg_Warn( p_dec, "input_DecoderSetCcState: %d @%d", b_decode, i_channel );
 
-    if( i_channel < 0 || i_channel >= 4 || !p_owner->pb_cc_present[i_channel] )
+    if( i_channel < 0 || i_channel >= 4 || !p_owner->cc.pb_present[i_channel] )
         return VLC_EGENERIC;
 
     if( b_decode )
@@ -423,7 +427,7 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
         p_cc->p_owner->p_clock = p_owner->p_clock;
 
         vlc_mutex_lock( &p_owner->lock );
-        p_owner->pp_cc[i_channel] = p_cc;
+        p_owner->cc.pp_decoder[i_channel] = p_cc;
         vlc_mutex_unlock( &p_owner->lock );
     }
     else
@@ -431,8 +435,8 @@ int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
         decoder_t *p_cc;
 
         vlc_mutex_lock( &p_owner->lock );
-        p_cc = p_owner->pp_cc[i_channel];
-        p_owner->pp_cc[i_channel] = NULL;
+        p_cc = p_owner->cc.pp_decoder[i_channel];
+        p_owner->cc.pp_decoder[i_channel] = NULL;
         vlc_mutex_unlock( &p_owner->lock );
 
         if( p_cc )
@@ -450,11 +454,11 @@ int input_DecoderGetCcState( decoder_t *p_dec, bool *pb_decode, int i_channel )
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
 
     *pb_decode = false;
-    if( i_channel < 0 || i_channel >= 4 || !p_owner->pb_cc_present[i_channel] )
+    if( i_channel < 0 || i_channel >= 4 || !p_owner->cc.pb_present[i_channel] )
         return VLC_EGENERIC;
 
     vlc_mutex_lock( &p_owner->lock );
-    *pb_decode = p_owner->pp_cc[i_channel] != NULL;
+    *pb_decode = p_owner->cc.pp_decoder[i_channel] != NULL;
     vlc_mutex_unlock( &p_owner->lock );
     return VLC_EGENERIC;
 }
@@ -632,13 +636,13 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
         }
     }
     /* */
-    p_owner->b_cc_supported = false;
+    p_owner->cc.b_supported = false;
     if( i_object_type == VLC_OBJECT_DECODER )
     {
         if( p_owner->p_packetizer && p_owner->p_packetizer->pf_get_cc )
-            p_owner->b_cc_supported = true;
+            p_owner->cc.b_supported = true;
         if( p_dec->pf_get_cc )
-            p_owner->b_cc_supported = true;
+            p_owner->cc.b_supported = true;
     }
 
     vlc_mutex_init( &p_owner->lock );
@@ -647,8 +651,8 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
     p_owner->i_pause_date = 0;
     for( i = 0; i < 4; i++ )
     {
-        p_owner->pb_cc_present[i] = false;
-        p_owner->pp_cc[i] = NULL;
+        p_owner->cc.pb_present[i] = false;
+        p_owner->cc.pp_decoder[i] = NULL;
     }
     p_owner->i_ts_delay = 0;
     return p_dec;
@@ -672,11 +676,11 @@ static void *DecoderThread( vlc_object_t *p_this )
     {
         if( ( p_block = block_FifoGet( p_owner->p_fifo ) ) == NULL )
         {
-            p_dec->b_error = 1;
+            p_dec->b_error = true;
             break;
         }
 
-        if( DecoderDecode( p_dec, p_block ) != VLC_SUCCESS )
+        if( DecoderProcess( p_dec, p_block ) != VLC_SUCCESS )
             break;
     }
 
@@ -802,12 +806,12 @@ static void DecoderAoutBufferFixTs( aout_buffer_t *p_buffer, int *pi_rate,
     if( !p_buffer->start_date && !p_buffer->end_date )
         *pi_rate = input_clock_GetRate( p_clock );
 
-    if( p_buffer->start_date )
+    if( p_buffer->start_date > 0 )
         p_buffer->start_date =
             input_clock_GetTS( p_clock, pi_rate,
                                i_ts_delay, p_buffer->start_date + i_es_delay );
 
-    if( p_buffer->end_date )
+    if( p_buffer->end_date > 0 )
         p_buffer->end_date =
             input_clock_GetTS( p_clock, pi_rate,
                                i_ts_delay, p_buffer->end_date + i_es_delay );
@@ -820,7 +824,7 @@ static void DecoderVoutBufferFixTs( picture_t *p_picture, int *pi_rate,
     if( !p_clock )
         return;
 
-    if( p_picture->date )
+    if( p_picture->date > 0 )
         p_picture->date =
             input_clock_GetTS( p_clock, pi_rate,
                                i_ts_delay, p_picture->date + i_es_delay );
@@ -836,12 +840,12 @@ static void DecoderSpuBufferFixTs( subpicture_t *p_subpic,
     if( !p_clock )
         return;
 
-    if( p_subpic->i_start )
+    if( p_subpic->i_start > 0 )
         p_subpic->i_start =
             input_clock_GetTS( p_clock, NULL,
                                i_ts_delay, p_subpic->i_start + i_es_delay );
 
-    if( p_subpic->i_stop )
+    if( p_subpic->i_stop > 0 )
         p_subpic->i_stop =
             input_clock_GetTS( p_clock, NULL,
                                i_ts_delay, p_subpic->i_stop + i_es_delay );
@@ -966,7 +970,7 @@ static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
     assert( p_dec_cc->pf_get_cc != NULL );
 
     /* Do not try retreiving CC if not wanted (sout) or cannot be retreived */
-    if( !p_owner->b_cc_supported )
+    if( !p_owner->cc.b_supported )
         return;
 
     p_cc = p_dec_cc->pf_get_cc( p_dec_cc, pb_present );
@@ -976,20 +980,20 @@ static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
     vlc_mutex_lock( &p_owner->lock );
     for( i = 0, i_cc_decoder = 0; i < 4; i++ )
     {
-        p_owner->pb_cc_present[i] |= pb_present[i];
-        if( p_owner->pp_cc[i] )
+        p_owner->cc.pb_present[i] |= pb_present[i];
+        if( p_owner->cc.pp_decoder[i] )
             i_cc_decoder++;
     }
 
     for( i = 0; i < 4; i++ )
     {
-        if( !p_owner->pp_cc[i] )
+        if( !p_owner->cc.pp_decoder[i] )
             continue;
 
         if( i_cc_decoder > 1 )
-            DecoderDecode( p_owner->pp_cc[i], block_Duplicate( p_cc ) );
+            DecoderProcess( p_owner->cc.pp_decoder[i], block_Duplicate( p_cc ) );
         else
-            DecoderDecode( p_owner->pp_cc[i], p_cc );
+            DecoderProcess( p_owner->cc.pp_decoder[i], p_cc );
         i_cc_decoder--;
     }
     vlc_mutex_unlock( &p_owner->lock );
@@ -1242,27 +1246,12 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
     }
 }
 
-/**
- * Decode a block
- *
- * \param p_dec the decoder object
- * \param p_block the block to decode
- * \return VLC_SUCCESS or an error code
+/* This function process a block for sout
  */
-static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
+static void DecoderProcessSout( decoder_t *p_dec, block_t *p_block )
 {
     decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner;
     const bool b_telx = p_dec->fmt_in.i_codec == VLC_FOURCC('t','e','l','x');
-
-    if( p_block && p_block->i_buffer <= 0 )
-    {
-        block_Release( p_block );
-        return VLC_SUCCESS;
-    }
-
-#ifdef ENABLE_SOUT
-    if( p_dec->i_object_type == VLC_OBJECT_PACKETIZER )
-    {
     block_t *p_sout_block;
 
     while( ( p_sout_block =
@@ -1337,11 +1326,14 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
             p_owner->p_input->p->b_out_pace_control = true;
         }
     }
-    }
-    else
-#endif
-    if( p_dec->fmt_in.i_cat == AUDIO_ES )
-    {
+}
+
+/* This function process a video block
+ */
+static void DecoderProcessVideo( decoder_t *p_dec, block_t *p_block )
+{
+    decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner;
+
     if( p_block )
         DecoderUpdatePreroll( &p_owner->i_preroll_end, p_block );
 
@@ -1358,13 +1350,15 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                 es_format_Clean( &p_dec->fmt_in );
                 es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
             }
+            if( p_packetizer->pf_get_cc )
+                DecoderGetCc( p_dec, p_packetizer );
 
             while( p_packetized_block )
             {
                 block_t *p_next = p_packetized_block->p_next;
                 p_packetized_block->p_next = NULL;
 
-                    DecoderDecodeAudio( p_dec, p_packetized_block );
+                DecoderDecodeVideo( p_dec, p_packetized_block );
 
                 p_packetized_block = p_next;
             }
@@ -1372,11 +1366,15 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
     }
     else if( p_block )
     {
-            DecoderDecodeAudio( p_dec, p_block );
-        }
+        DecoderDecodeVideo( p_dec, p_block );
     }
-    else if( p_dec->fmt_in.i_cat == VIDEO_ES )
-    {
+}
+
+/* This function process a audio block
+ */
+static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block )
+{
+    decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner;
     if( p_block )
         DecoderUpdatePreroll( &p_owner->i_preroll_end, p_block );
 
@@ -1393,15 +1391,13 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                 es_format_Clean( &p_dec->fmt_in );
                 es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
             }
-                if( p_packetizer->pf_get_cc )
-                    DecoderGetCc( p_dec, p_packetizer );
 
             while( p_packetized_block )
             {
                 block_t *p_next = p_packetized_block->p_next;
                 p_packetized_block->p_next = NULL;
 
-                    DecoderDecodeVideo( p_dec, p_packetized_block );
+                DecoderDecodeAudio( p_dec, p_packetized_block );
 
                 p_packetized_block = p_next;
             }
@@ -1409,11 +1405,17 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
     }
     else if( p_block )
     {
-            DecoderDecodeVideo( p_dec, p_block );
-        }
+        DecoderDecodeAudio( p_dec, p_block );
     }
-    else if( p_dec->fmt_in.i_cat == SPU_ES )
-    {
+}
+
+/* This function process a subtitle block
+ */
+static void DecoderProcessSpu( decoder_t *p_dec, block_t *p_block )
+{
+    decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner;
+    const bool b_telx = p_dec->fmt_in.i_codec == VLC_FOURCC('t','e','l','x');
+
     input_thread_t *p_input = p_owner->p_input;
     vout_thread_t *p_vout;
     subpicture_t *p_spu;
@@ -1473,11 +1475,46 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         if( p_vout )
             vlc_object_release( p_vout );
     }
+}
+
+/**
+ * Decode a block
+ *
+ * \param p_dec the decoder object
+ * \param p_block the block to decode
+ * \return VLC_SUCCESS or an error code
+ */
+static int DecoderProcess( decoder_t *p_dec, block_t *p_block )
+{
+    if( p_block && p_block->i_buffer <= 0 )
+    {
+        block_Release( p_block );
+        return VLC_SUCCESS;
+    }
+
+#ifdef ENABLE_SOUT
+    if( p_dec->i_object_type == VLC_OBJECT_PACKETIZER )
+    {
+        DecoderProcessSout( p_dec, p_block );
+    }
+    else
+#endif
+    if( p_dec->fmt_in.i_cat == AUDIO_ES )
+    {
+        DecoderProcessAudio( p_dec, p_block );
+    }
+    else if( p_dec->fmt_in.i_cat == VIDEO_ES )
+    {
+        DecoderProcessVideo( p_dec, p_block );
+    }
+    else if( p_dec->fmt_in.i_cat == SPU_ES )
+    {
+        DecoderProcessSpu( p_dec, p_block );
     }
     else
     {
         msg_Err( p_dec, "unknown ES format" );
-        p_dec->b_error = 1;
+        p_dec->b_error = true;
     }
 
     return p_dec->b_error ? VLC_EGENERIC : VLC_SUCCESS;