* block: added

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 44e3d1534996ff45c56a0f29bb94838801d7a2ee..3eee4294d7bbd3733d2df33998dcbc756dfff992 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -60,6 +60,8 @@ struct decoder_owner_sys_t
 {
     vlc_bool_t      b_own_thread;
 
+    int64_t         i_preroll_end;
+
     input_thread_t  *p_input;
 
     aout_instance_t *p_aout;
@@ -193,6 +195,9 @@ void input_DecoderDelete( decoder_t *p_dec )
     }
     else
     {
+        /* Flush */
+        input_DecoderDecode( p_dec, NULL );
+
         module_Unneed( p_dec, p_dec->p_module );
     }
 
@@ -235,9 +240,9 @@ void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
     }
     else
     {
-        if( p_dec->b_error || p_block->i_buffer <= 0 )
+        if( p_dec->b_error || (p_block && p_block->i_buffer <= 0) )
         {
-            block_Release( p_block );
+            if( p_block ) block_Release( p_block );
         }
         else
         {
@@ -273,6 +278,11 @@ vlc_bool_t input_DecoderEmpty( decoder_t * p_dec )
     return VLC_TRUE;
 }
 
+void input_DecoderPreroll( decoder_t *p_dec, int64_t i_preroll_end )
+{
+    p_dec->p_owner->i_preroll_end = i_preroll_end;
+}
+
 #if 0
 /**
  * Create a NULL packet for padding in case of a data loss
@@ -389,6 +399,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
         return NULL;
     }
     p_dec->p_owner->b_own_thread = VLC_TRUE;
+    p_dec->p_owner->i_preroll_end = -1;
     p_dec->p_owner->p_input = p_input;
     p_dec->p_owner->p_aout = NULL;
     p_dec->p_owner->p_aout_input = NULL;
@@ -503,9 +514,9 @@ static int DecoderThread( decoder_t * p_dec )
  */
 static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
 {
-    int i_rate = p_block->i_rate;
+    int i_rate = p_block ? p_block->i_rate : 1000;
 
-    if( p_block->i_buffer <= 0 )
+    if( p_block && p_block->i_buffer <= 0 )
     {
         block_Release( p_block );
         return VLC_SUCCESS;
@@ -515,7 +526,8 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
     {
         block_t *p_sout_block;
 
-        while( (p_sout_block = p_dec->pf_packetize( p_dec, &p_block )) )
+        while( ( p_sout_block =
+                     p_dec->pf_packetize( p_dec, p_block ? &p_block : 0 ) ) )
         {
             if( !p_dec->p_owner->p_sout_input )
             {
@@ -588,6 +600,15 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
             while( (p_packetized_block =
                     p_packetizer->pf_packetize( p_packetizer, &p_block )) )
             {
+                if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
+                {
+                    p_dec->fmt_in.i_extra = p_packetizer->fmt_out.i_extra;
+                    p_dec->fmt_in.p_extra = malloc( p_dec->fmt_in.i_extra );
+                    memcpy( p_dec->fmt_in.p_extra,
+                            p_packetizer->fmt_out.p_extra,
+                            p_dec->fmt_in.i_extra );
+                }
+
                 while( p_packetized_block )
                 {
                     block_t *p_next = p_packetized_block->p_next;
@@ -597,9 +618,21 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec,
                                                        &p_packetized_block )) )
                     {
-                        aout_DecPlay( p_dec->p_owner->p_aout,
-                                      p_dec->p_owner->p_aout_input,
-                                      p_aout_buf );
+                        /* FIXME the best would be to handle the case start_date < preroll < end_date
+                         * but that's not easy with non raw audio stream */
+                        if( p_dec->p_owner->i_preroll_end > 0 &&
+                            p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
+                        {
+                            aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
+                                                  p_dec->p_owner->p_aout_input, p_aout_buf );
+                        }
+                        else
+                        {
+                            p_dec->p_owner->i_preroll_end = -1;
+                            aout_DecPlay( p_dec->p_owner->p_aout,
+                                          p_dec->p_owner->p_aout_input,
+                                          p_aout_buf );
+                        }
                     }
 
                     p_packetized_block = p_next;
@@ -608,8 +641,19 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         }
         else while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
         {
-            aout_DecPlay( p_dec->p_owner->p_aout,
-                          p_dec->p_owner->p_aout_input, p_aout_buf );
+            if( p_dec->p_owner->i_preroll_end > 0 &&
+                p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
+            {
+                aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
+                                      p_dec->p_owner->p_aout_input, p_aout_buf );
+            }
+            else
+            {
+                p_dec->p_owner->i_preroll_end = -1;
+                aout_DecPlay( p_dec->p_owner->p_aout,
+                              p_dec->p_owner->p_aout_input,
+                              p_aout_buf );
+            }
         }
     }
     else if( p_dec->fmt_in.i_cat == VIDEO_ES )
@@ -633,9 +677,18 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
                     while( (p_pic = p_dec->pf_decode_video( p_dec,
                                                        &p_packetized_block )) )
                     {
-                        vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
-                                          p_pic->date );
-                        vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+                        if( p_dec->p_owner->i_preroll_end > 0 &&
+                            p_pic->date < p_dec->p_owner->i_preroll_end )
+                        {
+                            vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
+                        }
+                        else
+                        {
+                            p_dec->p_owner->i_preroll_end = -1;
+                            vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
+                                              p_pic->date );
+                            vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+                        }
                     }
 
                     p_packetized_block = p_next;
@@ -644,8 +697,17 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         }
         else while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
         {
-            vout_DatePicture( p_dec->p_owner->p_vout, p_pic, p_pic->date );
-            vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+            if( p_dec->p_owner->i_preroll_end > 0 &&
+                p_pic->date < p_dec->p_owner->i_preroll_end )
+            {
+                vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
+            }
+            else
+            {
+                p_dec->p_owner->i_preroll_end = -1;
+                vout_DatePicture( p_dec->p_owner->p_vout, p_pic, p_pic->date );
+                vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+            }
         }
     }
     else if( p_dec->fmt_in.i_cat == SPU_ES )
@@ -654,10 +716,19 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
         subpicture_t *p_spu;
         while( (p_spu = p_dec->pf_decode_sub( p_dec, &p_block ) ) )
         {
+            if( p_dec->p_owner->i_preroll_end > 0 &&
+                p_spu->i_start < p_dec->p_owner->i_preroll_end &&
+                ( p_spu->i_stop <= 0 || p_spu->i_stop <= p_dec->p_owner->i_preroll_end ) )
+            {
+                spu_DestroySubpicture( p_dec->p_owner->p_vout->p_spu, p_spu );
+                continue;
+            }
+
+            p_dec->p_owner->i_preroll_end = -1;
             p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
             if( p_vout )
             {
-                vout_DisplaySubPicture( p_vout, p_spu );
+                spu_DisplaySubpicture( p_vout->p_spu, p_spu );
                 vlc_object_release( p_vout );
             }
         }
@@ -724,7 +795,8 @@ static void DeleteDecoder( decoder_t * p_dec )
         p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
         if( p_vout )
         {
-            vout_ClearOSDChannel( p_vout, p_dec->p_owner->i_spu_channel );
+            spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+                         p_dec->p_owner->i_spu_channel );
             vlc_object_release( p_vout );
         }
     }
@@ -828,6 +900,13 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
             p_dec->b_error = VLC_TRUE;
             return NULL;
         }
+
+        if( p_sys->video.i_rmask )
+            p_sys->p_vout->render.i_rmask = p_sys->video.i_rmask;
+        if( p_sys->video.i_gmask )
+            p_sys->p_vout->render.i_gmask = p_sys->video.i_gmask;
+        if( p_sys->video.i_bmask )
+            p_sys->p_vout->render.i_bmask = p_sys->video.i_bmask;
     }
 
     /* Get a new picture */
@@ -899,7 +978,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
 {
     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
     vout_thread_t *p_vout = NULL;
-    subpicture_t *p_spu;
+    subpicture_t *p_subpic;
     int i_attempts = 30;
 
     while( i_attempts-- )
@@ -920,20 +999,23 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
 
     if( p_sys->p_spu_vout != p_vout )
     {
-        p_sys->i_spu_channel =
-            vout_RegisterOSDChannel( p_vout );
+        spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
+                     &p_sys->i_spu_channel );
         p_sys->p_spu_vout = p_vout;
     }
 
-    p_spu = vout_CreateSubPicture( p_vout, p_sys->i_spu_channel,
-                                   MEMORY_SUBPICTURE );
+    p_subpic = spu_CreateSubpicture( p_vout->p_spu );
+    if( p_subpic )
+    {
+        p_subpic->i_channel = p_sys->i_spu_channel;
+    }
 
     vlc_object_release( p_vout );
 
-    return p_spu;
+    return p_subpic;
 }
 
-static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_spu )
+static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
 {
-    vout_DestroySubPicture( p_dec->p_owner->p_vout, p_spu );
+    spu_DestroySubpicture( p_dec->p_owner->p_vout->p_spu, p_subpic );
 }