Changeset 18516cc6727f3a03d91e7ba97a9697aa1aa437c6

Timestamp:

30/06/08 20:00:04 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1214848804 +0000

git-parent:

[d962b50eede7adbdc0a5fe9a37dc7c85f3293ae9]

git-author:

Laurent Aimar <fenrir@videolan.org> 1214848774 +0000

Message:

Clean up vout error path.
Correctly free spu and filter chain.
Do not free 2x vout pictures.
(At least, vlc -V x11 does not segfault any more on resize, it
just does not work)

Files:

• src/video_output/video_output.c (modified) (12 diffs)

src/video_output/video_output.c

@@ -66 +66 @@
-static void     RunThread         ( vout_thread_t * );
-static void     ErrorThread       ( vout_thread_t * );
+static void     CleanThread       ( vout_thread_t * );
-static void     EndThread         ( vout_thread_t * );
-
@@ -725 +726 @@
-    if( p_vout->b_error )
-    {
+        EndThread( p_vout );
-        vlc_mutex_unlock( &p_vout->change_lock );
-        return;
@@ -1036 +1038 @@
-            // FIXME pf_end
-            p_vout->b_error = 1;
+            break;
-        }
-
@@ -1048 +1051 @@
-            p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
-
+            assert( !p_vout->b_direct );
+
+            ChromaDestroy( p_vout );
+
+            vlc_mutex_lock( &p_vout->picture_lock );
+
-            p_vout->pf_end( p_vout );
+
-            for( i = 0; i < I_OUTPUTPICTURES; i++ )
-                 p_vout->p_picture[ i ].i_status = FREE_PICTURE;
-
-            I_OUTPUTPICTURES = 0;
+
-            if( p_vout->pf_init( p_vout ) )
-            {
@@ -1059 +1070 @@
-                p_vout->b_error = 1;
-            }
+
+            vlc_mutex_unlock( &p_vout->picture_lock );
-
-            /* Need to reinitialise the chroma plugin. Since we might need
@@ -1064 +1077 @@
-             * recreate the chroma plugin chain from scratch. */
-            /* dionoea */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        }
-
@@ -1094 +1105 @@
-
-            p_vout->b_error = InitThread( p_vout );
+            if( p_vout->b_error )
+                msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" );
-
-            vlc_mutex_unlock( &p_vout->picture_lock );
+
+            if( p_vout->b_error )
+                break;
-        }
-
@@ -1128 +1144 @@
-     */
-    if( p_vout->b_error )
-    {
-        ErrorThread( p_vout );
-    }
-
-    /* End of thread */
+    CleanThread( p_vout );
-    EndThread( p_vout );
-    vlc_mutex_unlock( &p_vout->change_lock );
@@ -1149 +1164 @@
-{
-    /* Wait until a `die' order */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1159 +1199 @@
- * EndThread: thread destruction
- *****************************************************************************
- after a sucessful
-initialization. It frees all resources
+.
+It frees all resources not
- * XXX You have to enter it with change_lock taken.
- *****************************************************************************/
-static void EndThread( vout_thread_t *p_vout )
-{
-    int     i_index;                                        /* index in heap */
-
-#ifdef STATS
-    {
@@ -1176 +1214 @@
-    }
-#endif
-
-    if( !p_vout->b_direct )
-        ChromaDestroy( p_vout );
-
-    /* Destroy all remaining pictures */
-    for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ )
-    {
-        if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE )
-        {
-            free( p_vout->p_picture[i_index].p_data_orig );
-        }
-    }
-
-    /* Destroy subpicture unit */
@@ -1195 +1221 @@
-    /* Destroy the video filters2 */
-    filter_chain_Delete( p_vout->p_vf2_chain );
-
-    /* Destroy translation tables FIXME if b_error is set, it can already be done */
-    p_vout->pf_end( p_vout );
-}
-