Join and unload vout safely

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 172f5fca20afbbdfa989b47b07dfa7bb65042d68..0fe1be372ff74940b235d13784281b7c2e0ff49a 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -125,12 +125,16 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
 {
     if( !p_fmt )
     {
-        /* Reattach video output to the instance before bailing out */
+        /* Video output is no longer used.
+         * TODO: support for reusing video outputs with proper _thread-safe_
+         * reference handling. */
         if( p_vout )
         {
             spu_Attach( p_vout->p_spu, p_this, false );
-            vlc_object_detach( p_vout );
-            vlc_object_attach( p_vout, p_this->p_libvlc );
+            vlc_object_kill( p_vout );
+            vlc_thread_join( p_vout );
+            module_Unneed( p_vout, p_vout->p_module );
+            vlc_object_release( p_vout );
         }
         return NULL;
     }
@@ -140,24 +144,8 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
     {
         vlc_object_yield( p_vout );
     }
-    else
-    {
-        p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD );
 
-        if( !p_vout )
-        {
-            p_vout = vlc_object_find( p_this->p_libvlc,
-                                      VLC_OBJECT_VOUT, FIND_CHILD );
-            /* only first children of p_input for unused vout */
-            if( p_vout && p_vout->p_parent != VLC_OBJECT(p_this->p_libvlc) )
-            {
-                vlc_object_release( p_vout );
-                p_vout = NULL;
-            }
-            if( p_vout )
-                vlc_object_detach( p_vout );    /* Remove it from the GC */
-        }
-    }
+    /* TODO: find a suitable unused video output */
 
     /* If we now have a video output, check it has the right properties */
     if( p_vout )
@@ -278,9 +266,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     p_vout->render.i_chroma   = i_chroma;
     p_vout->render.i_aspect   = i_aspect;
 
-    p_vout->render.i_rmask    = 0;
-    p_vout->render.i_gmask    = 0;
-    p_vout->render.i_bmask    = 0;
+    p_vout->render.i_rmask    = p_fmt->i_rmask;
+    p_vout->render.i_gmask    = p_fmt->i_gmask;
+    p_vout->render.i_bmask    = p_fmt->i_bmask;
 
     p_vout->render.i_last_used_pic = -1;
     p_vout->render.b_allow_modify_pics = 1;
@@ -461,6 +449,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
         msg_Err( p_vout, "video output creation failed" );
 
         /* Make sure the thread is destroyed and data released */
+        vlc_object_kill( p_vout );
+        vlc_thread_join( p_vout );
+        module_Unneed( p_vout, p_vout->p_module );
         vlc_object_release( p_vout );
         return NULL;
     }
@@ -477,12 +468,6 @@ static void vout_Destructor( vlc_object_t * p_this )
     vlc_mutex_destroy( &p_vout->change_lock );
     vlc_mutex_destroy( &p_vout->vfilter_lock );
 
-    /* Release the module */
-    if( p_vout->p_module )
-    {
-        module_Unneed( p_vout, p_vout->p_module );
-    }
-
     free( p_vout->psz_filter_chain );
 
     config_ChainDestroy( p_vout->p_cfg );
@@ -604,6 +589,13 @@ static int InitThread( vout_thread_t *p_vout )
              p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den );
 
     /* Calculate shifts from system-updated masks */
+    MaskToShift( &p_vout->render.i_lrshift, &p_vout->output.i_rrshift,
+                 p_vout->render.i_rmask );
+    MaskToShift( &p_vout->render.i_lgshift, &p_vout->output.i_rgshift,
+                 p_vout->render.i_gmask );
+    MaskToShift( &p_vout->render.i_lbshift, &p_vout->output.i_rbshift,
+                 p_vout->render.i_bmask );
+
     MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
                  p_vout->output.i_rmask );
     MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift,
@@ -1234,6 +1226,19 @@ static picture_t *ChromaGetPicture( filter_t *p_filter )
     return p_pic;
 }
 
+static void ChromaCopyRgbInfo( es_format_t *p_fmt, picture_heap_t *p_heap )
+{
+    p_fmt->video.i_rmask = p_heap->i_rmask;
+    p_fmt->video.i_gmask = p_heap->i_gmask;
+    p_fmt->video.i_bmask = p_heap->i_bmask;
+    p_fmt->video.i_rrshift = p_heap->i_rrshift;
+    p_fmt->video.i_lrshift = p_heap->i_lrshift;
+    p_fmt->video.i_rgshift = p_heap->i_rgshift;
+    p_fmt->video.i_lgshift = p_heap->i_lgshift;
+    p_fmt->video.i_rbshift = p_heap->i_rbshift;
+    p_fmt->video.i_lbshift = p_heap->i_lbshift;
+}
+
 static int ChromaCreate( vout_thread_t *p_vout )
 {
     filter_t *p_chroma;
@@ -1246,16 +1251,9 @@ static int ChromaCreate( vout_thread_t *p_vout )
     /* TODO: Set the fmt_in and fmt_out stuff here */
     p_chroma->fmt_in.video = p_vout->fmt_render;
     p_chroma->fmt_out.video = p_vout->fmt_out;
+    ChromaCopyRgbInfo( &p_chroma->fmt_in, &p_vout->render );
+    ChromaCopyRgbInfo( &p_chroma->fmt_out, &p_vout->output );
 
-    p_chroma->fmt_out.video.i_rmask = p_vout->output.i_rmask;
-    p_chroma->fmt_out.video.i_gmask = p_vout->output.i_gmask;
-    p_chroma->fmt_out.video.i_bmask = p_vout->output.i_bmask;
-    p_chroma->fmt_out.video.i_rrshift = p_vout->output.i_rrshift;
-    p_chroma->fmt_out.video.i_lrshift = p_vout->output.i_lrshift;
-    p_chroma->fmt_out.video.i_rgshift = p_vout->output.i_rgshift;
-    p_chroma->fmt_out.video.i_lgshift = p_vout->output.i_lgshift;
-    p_chroma->fmt_out.video.i_rbshift = p_vout->output.i_rbshift;
-    p_chroma->fmt_out.video.i_lbshift = p_vout->output.i_lbshift;
     p_chroma->p_module = module_Need( p_chroma, "video filter2", NULL, 0 );
 
     if( p_chroma->p_module == NULL )