Changeset d9810ce021930691108ea74812d4ce6f5e3df547

Timestamp:

06/07/08 09:31:17 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212823877 +0300

git-parent:

[872bfb52d2563c38c8fe3f4c831d2503d3f3a104]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212823877 +0300

Message:

Untriplicate vout release code - fix #1593

Unused video outputs are currently attached to libvlc, so there is no
point in destroying them from the playlist (twice), then from libvlc.
This should also fix #1593 (multiple vout free).

Files:

• src/playlist/engine.c (modified) (3 diffs)
• src/video_output/video_output.c (modified) (1 diff)

src/playlist/engine.c

@@ -29 +29 @@
-#include <assert.h>
-#include <vlc_common.h>
-#include <vlc_vout.h>
-#include <vlc_sout.h>
-#include <vlc_playlist.h>
@@ -197 +196 @@
-
-    vlc_mutex_lock( &p_playlist->gc_lock );
-    while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
-                                                  FIND_CHILD ) ) )
-    {
-        if( p_obj->p_parent != VLC_OBJECT(p_playlist->p_libvlc) )
-        {
-            vlc_object_release( p_obj );
-            break;
-        }
-        msg_Dbg( p_playlist, "garbage collector destroying 1 vout" );
-        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        vlc_object_release( (vout_thread_t *)p_obj );
-    }
-    p_playlist->b_cant_sleep = false;
-    vlc_mutex_unlock( &p_playlist->gc_lock );
@@ -430 +416 @@
-        sout_DeleteInstance( p_sout );
-#endif
-
-    /* close all remaining vout */
-    while( ( p_obj = vlc_object_find( p_playlist,
-                                      VLC_OBJECT_VOUT, FIND_CHILD ) ) )
-    {
-        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        vlc_object_release( (vout_thread_t *)p_obj );
-    }
-
-    while( p_playlist->i_sds )

src/video_output/video_output.c

@@ -125 +125 @@
-    if( !p_fmt )
-    {
-playlist
+the instance
-        if( p_vout )
-        {