Changeset d7bc817f72e44cacf0fc9468c7988ee1f4b565a7

Timestamp:

26/02/07 20:27:35 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[f6b77b24afe7f73539125d178712b83b9bb4d771]

git-author:

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

Message:

Force VLM stream to not use sout-keep.
Fixed race condition with sout-keep.
Fixed broken sout-keep behaviour (currently active sout can be used

twice or destroyed..., it might fixed segfaults reported by xxcv))

Files:

• src/input/input.c (modified) (1 diff)
• src/input/vlm.c (modified) (5 diffs)
• src/stream_output/stream_output.c (modified) (3 diffs)

src/input/input.c

@@ -1187 +1187 @@
-            if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool )
-            {
+                playlist_t  *p_playlist = pl_Yield( p_input );
+
-                /* attach sout to the playlist */
-                msg_Dbg( p_input, "keeping sout" );
-                vlc_object_detach( p_input->p->p_sout );
-
+
+
+
-            }
-            else
-            {
-                msg_Dbg( p_input, "destroying sout" );
-                sout_DeleteInstance( p_input->p->p_sout );
+                msg_Dbg( p_input, "destroyed sout" );
-            }
-        }

src/input/vlm.c

@@ -88 +88 @@
-
-        vlc_mutex_init( p_this->p_libvlc, &p_vlm->lock );
-
-
-
-
-
+
+
+
+
-
-        vlc_object_yield( p_vlm );
@@ -1115 +1114 @@
-            char *psz_output;
-            char *psz_header;
+            char *psz_dup;
-            int i;
-
@@ -1126 +1126 @@
-
-            media->item.psz_uri = strdup( media->input[0] );
-
-
-
+
+
+
+
+
-            for( i = 0; i < media->i_option; i++ )
-            {
-
-
-
-
-
-
-
+
+
+
+
+
-
-            asprintf( &psz_header, _("Media: %s"), media->psz_name );
@@ -1144 +1144 @@
-                                              ) ) )
-            {
-
+
+
-
-                input_StopThread( p_input );
@@ -1196 +1197 @@
-        if( !p_instance )
-        {
+            char *psz_dup;
+
-            p_instance = malloc( sizeof(vlm_media_instance_t) );
-
+
+
+
-            memset( p_instance, 0, sizeof(vlm_media_instance_t) );
+
+            p_instance->psz_name = psz_id ? strdup( psz_id ) : NULL;
-            input_ItemInit( VLC_OBJECT(vlm), &p_instance->item );
-            p_instance->p_input = NULL;
-
-
-
-
-
+
+
+
+
+
-                          media->psz_output ? media->psz_output : "",
-
-
+
-                          media->psz_vod_output ? media->psz_vod_output : "" );
-p_instance->item.i_options = 1
+TAB_APPEND( p_instance->item.i_options, p_instance->item.ppsz_options, psz_dup )
-            }
-
-            for( i = 0; i < media->i_option; i++ )
-            {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            TAB_APPEND( media->i_instance, media->instance, p_instance );
-        }

src/stream_output/stream_output.c

@@ -35 +35 @@
-
-#include <vlc_sout.h>
+#include <vlc_playlist.h>
-
-#include "stream_output.h"
@@ -75 +76 @@
-    vlc_value_t keep;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            if( !strcmp( p_sout->psz_sout, psz_dest ) )
@@ -90 +103 @@
-                msg_Dbg( p_parent, "sout keep: you probably want to use "
-                          "gather stream_out" );
-                vlc_object_detach( p_sout );
-                vlc_object_attach( p_sout, p_parent );
-                vlc_object_release( p_sout );
-                return p_sout;
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            vlc_object_release( p_sout );
-            sout_DeleteInstance( p_sout );