input_item: post individual subitems later when posting the whole tree

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index eb304b2a48c59e1671406c58be40ac466a68e291..a8bd0e4e2860092b3f9a9d24f042fecf37711273 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -624,6 +624,19 @@ size_t input_DecoderGetFifoSize( decoder_t *p_dec )
     return block_FifoSize( p_owner->p_fifo );
 }
 
+void input_DecoderGetObjects( decoder_t *p_dec,
+                              vout_thread_t **pp_vout, aout_instance_t **pp_aout )
+{
+    decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+    vlc_mutex_lock( &p_owner->lock );
+    if( pp_vout )
+        *pp_vout = p_owner->p_vout ? vlc_object_hold( p_owner->p_vout ) : NULL;
+    if( pp_aout )
+        *pp_aout = p_owner->p_aout ? vlc_object_hold( p_owner->p_aout ) : NULL;
+    vlc_mutex_unlock( &p_owner->lock );
+}
+
 /*****************************************************************************
  * Internal functions
  *****************************************************************************/
@@ -784,7 +797,6 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
             if( !p_dec->p_owner->p_packetizer->p_module )
             {
                 es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
-                vlc_object_detach( p_dec->p_owner->p_packetizer );
                 vlc_object_release( p_dec->p_owner->p_packetizer );
             }
         }
@@ -1506,7 +1518,7 @@ static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic,
     vout_thread_t *p_vout = p_owner->p_spu_vout;
 
     /* */
-    if( p_subpic->i_start <= VLC_TS_INVALID )
+    if( p_subpic->i_start <= VLC_TS_INVALID && !b_telx )
     {
         msg_Warn( p_dec, "non-dated spu buffer received" );
         subpicture_Delete( p_subpic );
@@ -2096,7 +2108,6 @@ static void DeleteDecoder( decoder_t * p_dec )
         es_format_Clean( &p_owner->p_packetizer->fmt_out );
         if( p_owner->p_packetizer->p_description )
             vlc_meta_Delete( p_owner->p_packetizer->p_description );
-        vlc_object_detach( p_owner->p_packetizer );
         vlc_object_release( p_owner->p_packetizer );
     }
 
@@ -2104,7 +2115,6 @@ static void DeleteDecoder( decoder_t * p_dec )
     vlc_cond_destroy( &p_owner->wait_request );
     vlc_mutex_destroy( &p_owner->lock );
 
-    vlc_object_detach( p_dec );
     vlc_object_release( p_dec );
 
     free( p_owner );