Simplify the creation of subpicture with dynamic content.

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index a9594f1185191aa586f43b1b265aa306a6568121..088c1fd6caba1d4a1b5279695cc89a02ae7c946b 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -75,7 +75,7 @@ static void vout_del_buffer( decoder_t *, picture_t * );
 static void vout_link_picture( decoder_t *, picture_t * );
 static void vout_unlink_picture( decoder_t *, picture_t * );
 
-static subpicture_t *spu_new_buffer( decoder_t * );
+static subpicture_t *spu_new_buffer( decoder_t *, const subpicture_updater_t * );
 static void spu_del_buffer( decoder_t *, subpicture_t * );
 
 struct decoder_owner_sys_t
@@ -213,13 +213,15 @@ void decoder_DeleteAudioBuffer( decoder_t *p_decoder, aout_buffer_t *p_buffer )
     p_decoder->pf_aout_buffer_del( p_decoder, p_buffer );
 }
 
-subpicture_t *decoder_NewSubpicture( decoder_t *p_decoder )
+subpicture_t *decoder_NewSubpicture( decoder_t *p_decoder,
+                                     const subpicture_updater_t *p_dyn )
 {
-    subpicture_t *p_subpicture = p_decoder->pf_spu_buffer_new( p_decoder );
+    subpicture_t *p_subpicture = p_decoder->pf_spu_buffer_new( p_decoder, p_dyn );
     if( !p_subpicture )
         msg_Warn( p_decoder, "can't get output subpicture" );
     return p_subpicture;
 }
+
 void decoder_DeleteSubpicture( decoder_t *p_decoder, subpicture_t *p_subpicture )
 {
     p_decoder->pf_spu_buffer_del( p_decoder, p_subpicture );
@@ -1339,10 +1341,9 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
     {
         msg_Warn( p_vout, "non-dated video buffer received" );
         *pi_lost_sum += 1;
-        vout_DropPicture( p_vout, p_picture );
+        vout_ReleasePicture( p_vout, p_picture );
         return;
     }
-    vout_LinkPicture( p_vout, p_picture );
 
     /* */
     vlc_mutex_lock( &p_owner->lock );
@@ -1421,8 +1422,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
                 vout_Flush( p_vout, p_picture->date );
                 p_owner->i_last_rate = i_rate;
             }
-            vout_DisplayPicture( p_vout, p_picture );
-            vout_UnlinkPicture( p_vout, p_picture );
+            vout_PutPicture( p_vout, p_picture );
         }
         else
         {
@@ -1432,8 +1432,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
                 msg_Warn( p_vout, "non-dated video buffer received" );
 
             *pi_lost_sum += 1;
-            vout_UnlinkPicture( p_vout, p_picture );
-            vout_DropPicture( p_vout, p_picture );
+            vout_ReleasePicture( p_vout, p_picture );
         }
         int i_tmp_display;
         int i_tmp_lost;
@@ -1469,7 +1468,7 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
         if( p_dec->b_die )
         {
             /* It prevent freezing VLC in case of broken decoder */
-            vout_DropPicture( p_vout, p_pic );
+            vout_ReleasePicture( p_vout, p_pic );
             if( p_block )
                 block_Release( p_block );
             break;
@@ -1479,7 +1478,7 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
 
         if( p_owner->i_preroll_end > VLC_TS_INVALID && p_pic->date < p_owner->i_preroll_end )
         {
-            vout_DropPicture( p_vout, p_pic );
+            vout_ReleasePicture( p_vout, p_pic );
             continue;
         }
 
@@ -1687,8 +1686,7 @@ static void DecoderFlushBuffering( decoder_t *p_dec )
 
         if( p_owner->p_vout )
         {
-            vout_UnlinkPicture( p_owner->p_vout, p_picture );
-            vout_DropPicture( p_owner->p_vout, p_picture );
+            vout_ReleasePicture( p_owner->p_vout, p_picture );
         }
 
         if( !p_owner->buffer.p_picture )
@@ -2068,9 +2066,7 @@ static void DeleteDecoder( decoder_t * p_dec )
     {
         /* Hack to make sure all the the pictures are freed by the decoder
          * and that the vout is not paused anymore */
-        vout_FixLeaks( p_owner->p_vout, true );
-        if( p_owner->b_paused )
-            vout_ChangePause( p_owner->p_vout, false, mdate() );
+        vout_Reset( p_owner->p_vout );
 
         /* */
         input_resource_RequestVout( p_owner->p_input->p->p_resource, p_owner->p_vout, NULL, true );
@@ -2254,9 +2250,6 @@ static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
                           p_owner->p_aout_input, p_buffer );
 }
 
-
-int vout_CountPictureAvailable( vout_thread_t *p_vout );
-
 static picture_t *vout_new_buffer( decoder_t *p_dec )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
@@ -2355,22 +2348,12 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
      */
     for( ;; )
     {
-        picture_t *p_picture;
-
         if( p_dec->b_die || p_dec->b_error )
             return NULL;
 
-        /* The video filter chain required that there is always 1 free buffer
-         * that it will use as temporary one. It will release the temporary
-         * buffer once its work is done, so this check is safe even if we don't
-         * lock around both count() and create().
-         */
-        if( vout_CountPictureAvailable( p_owner->p_vout ) >= 2 )
-        {
-            p_picture = vout_CreatePicture( p_owner->p_vout, 0, 0, 0 );
-            if( p_picture )
-                return p_picture;
-        }
+        picture_t *p_picture = vout_GetPicture( p_owner->p_vout );
+        if( p_picture )
+            return p_picture;
 
         if( DecoderIsFlushing( p_dec ) )
             return NULL;
@@ -2379,7 +2362,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
         DecoderSignalBuffering( p_dec, true );
 
         /* Check the decoder doesn't leak pictures */
-        vout_FixLeaks( p_owner->p_vout, false );
+        vout_FixLeaks( p_owner->p_vout );
 
         /* FIXME add a vout_WaitPictureAvailable (timedwait) */
         msleep( VOUT_OUTMEM_SLEEP );
@@ -2388,20 +2371,21 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
 
 static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic )
 {
-    vout_DropPicture( p_dec->p_owner->p_vout, p_pic );
+    vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic );
 }
 
 static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic )
 {
-    vout_LinkPicture( p_dec->p_owner->p_vout, p_pic );
+    vout_HoldPicture( p_dec->p_owner->p_vout, p_pic );
 }
 
 static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
 {
-    vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
+    vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic );
 }
 
-static subpicture_t *spu_new_buffer( decoder_t *p_dec )
+static subpicture_t *spu_new_buffer( decoder_t *p_dec,
+                                     const subpicture_updater_t *p_updater )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
     vout_thread_t *p_vout = NULL;
@@ -2440,7 +2424,7 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec )
         p_owner->p_spu_vout = p_vout;
     }
 
-    p_subpic = subpicture_New();
+    p_subpic = subpicture_New( p_updater );
     if( p_subpic )
     {
         p_subpic->i_channel = p_owner->i_spu_channel;