Changeset e87abf624a0302f8d6f7bdd0a9f550cec1f5fb12

Timestamp:

28/02/07 23:45:02 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[0bf39ed37db37db3d1c925e3af7a742ff251a522]

git-author:

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

Message:

Reworked/improved the way sout-keep works. (VLM sout-keep does not
work again yet )

Files:

• src/input/input.c (modified) (22 diffs)
• src/input/input_internal.h (modified) (2 diffs)
• src/input/vlm.c (modified) (5 diffs)
• src/playlist/engine.c (modified) (2 diffs)
• src/stream_output/stream_output.c (modified) (2 diffs)

src/input/input.c

@@ -53 +53 @@
-
-static input_thread_t * Create  ( vlc_object_t *, input_item_t *,
-
+, sout_instance_t *
-static  int             Init    ( input_thread_t *p_input );
-static void             Error   ( input_thread_t *p_input );
-static void             End     ( input_thread_t *p_input );
-static void             MainLoop( input_thread_t *p_input );
+static void             Destroy( input_thread_t *p_input, sout_instance_t **pp_sout );
-
-static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
@@ -80 +81 @@
-
-static void InputMetaUser( input_thread_t *p_input );
+
+static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t * );
+static void SoutKeep( sout_instance_t * );
-
-/*****************************************************************************
@@ -106 +110 @@
- *****************************************************************************/
-static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
-
+, sout_instance_t *p_sout
-{
-    input_thread_t *p_input = NULL;                 /* thread descriptor */
@@ -152 +156 @@
-    p_input->p->p_es_out = NULL;
-    p_input->p->p_sout  = NULL;
+    p_input->p->b_sout_keep  = VLC_FALSE;
-    p_input->p->b_out_pace_control = VLC_FALSE;
-    p_input->i_pts_delay = 0;
@@ -189 +194 @@
-    vlc_mutex_lock( &p_item->lock );
-    for( i = 0; i < p_item->i_options; i++ )
-    {
-        var_OptionParse( p_input, p_item->ppsz_options[i] );
-    }
-    vlc_mutex_unlock( &p_item->lock );
-
@@ -258 +261 @@
-        p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
-
+    /* */
+    if( p_sout )
+        p_input->p->p_sout = p_sout;
+
-    /* Attach only once we are ready */
-    vlc_object_attach( p_input, p_parent );
@@ -264 +271 @@
-}
-
-
+, sout_instance_t **pp_sout
-{
-    vlc_object_detach( p_input );
+
+    if( pp_sout )
+        *pp_sout = NULL;
+    if( p_input->p->p_sout )
+    {
+        if( pp_sout )
+            *pp_sout = p_input->p->p_sout;
+        else if( p_input->p->b_sout_keep )
+            SoutKeep( p_input->p->p_sout );
+        else
+            sout_DeleteInstance( p_input->p->p_sout );
+    }
-
-    vlc_mutex_destroy( &p_input->p->lock_control );
@@ -273 +292 @@
-    vlc_object_destroy( p_input );
-}
+
-/**
- * Initialize an input thread and run it. You will need to monitor the
@@ -284 +304 @@
-                                      input_item_t *p_item )
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if( !p_input )
-        return NULL;
@@ -300 +328 @@
-    /* Create thread and wait for its readiness. */
-    if( vlc_thread_create( p_input, "input", Run,
- 
+
-    {
-        input_ChangeState( p_input, ERROR_S );
-        msg_Err( p_input, "cannot create input thread" );
-
+, &p_sout
-        return NULL;
-    }
@@ -323 +351 @@
-                   vlc_bool_t b_block )
-{
-
-
-
-
+
+
+
+
+
+
+
+
-        return VLC_EGENERIC;
+    }
+    p_input->p->b_sout_keep = b_sout_keep;
-
-    if( b_block )
@@ -341 +375 @@
-            input_ChangeState( p_input, ERROR_S );
-            msg_Err( p_input, "cannot create input thread" );
-
+, NULL
-            return VLC_EGENERIC;
-        }
@@ -358 +392 @@
-int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
-{
- = NULL;           /* thread descriptor */
+;
-
-    /* Allocate descriptor */
-
+, NULL
-    if( !p_input )
-        return VLC_EGENERIC;
@@ -368 +402 @@
-    End( p_input );
-
-
+, NULL
-
-    return VLC_SUCCESS;
@@ -424 +458 @@
-void input_DestroyThread( input_thread_t *p_input )
-{
+    input_DestroyThreadExtended( p_input, NULL );
+}
+
+void input_DestroyThreadExtended( input_thread_t *p_input, sout_instance_t **pp_sout )
+{
-    /* Join the thread */
-    vlc_thread_join( p_input );
-
-    /* */
-
+, pp_sout
-}
-
@@ -524 +563 @@
-exit:
-    /* Release memory */
-
+, NULL
-    return 0;
-}
@@ -535 +574 @@
-    int64_t i_intf_update = 0;
-    int i_updates = 0;
+
-    while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof )
-    {
@@ -745 +785 @@
-        }
-
-handle so
+Find a usable sout and attach it to p_inp
-        psz = var_GetString( p_input, "sout" );
-        if( *psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
-        {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if( p_input->p_libvlc->b_stats )
-            {
@@ -767 +833 @@
-                             1000000;
-            }
+        }
+        else if( p_input->p->p_sout )
+        {
+            msg_Dbg( p_input, "destroying useless sout" );
+
+            sout_DeleteInstance( p_input->p->p_sout );
+            p_input->p->p_sout = NULL;
-        }
-        free( psz );
@@ -1094 +1167 @@
-
-    if( p_input->p->p_sout )
-sout_DeleteInstance
+vlc_object_detach
-
-    /* Mark them deleted */
@@ -1179 +1252 @@
-        if( p_input->p->p_sout )
-        {
-            vlc_value_t keep;
-
-            CL_CO( sout_sent_packets );
-            CL_CO( sout_sent_bytes );
-            CL_CO( sout_send_bitrate );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-#undef CL_CO
@@ -1208 +1265 @@
-    /* Tell we're dead */
-    p_input->b_dead = VLC_TRUE;
+}
+
+static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep )
+{
+    vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" );
+    sout_instance_t *p_sout = NULL;
+    int i;
+
+    /* Search sout-keep options
+     * XXX it has to be done here, but it is duplicated work :( */
+    vlc_mutex_lock( &p_item->lock );
+    for( i = 0; i < p_item->i_options; i++ )
+    {
+        const char *psz_option = p_item->ppsz_options[i];
+        if( !psz_option )
+            continue;
+        if( *psz_option == ':' )
+            psz_option++;
+
+        if( !strcmp( psz_option, "sout-keep" ) )
+            b_keep_sout = VLC_TRUE;
+        else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) )
+            b_keep_sout = VLC_FALSE;
+    }
+    vlc_mutex_unlock( &p_item->lock );
+
+    /* Find a potential sout to reuse
+     * XXX it might be unusable but this will be checked later */
+    if( b_keep_sout )
+    {
+        /* Remove the sout from the playlist garbage collector */
+        playlist_t *p_playlist = pl_Yield( p_parent );
+
+        vlc_mutex_lock( &p_playlist->gc_lock );
+        p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
+        if( p_sout )
+        {
+            if( p_sout->p_parent != VLC_OBJECT(p_playlist) )
+            {
+                vlc_object_release( p_sout );
+                p_sout = NULL;
+            }
+            else
+            {
+                vlc_object_detach( p_sout );    /* Remove it from the GC */
+
+                vlc_object_release( p_sout );
+            }
+        }
+        vlc_mutex_unlock( &p_playlist->gc_lock );
+
+        pl_Release( p_parent );
+    }
+
+    if( pb_sout_keep )
+        *pb_sout_keep = b_keep_sout;
+
+    return p_sout;
+}
+static void SoutKeep( sout_instance_t *p_sout )
+{
+    /* attach sout to the playlist */
+    playlist_t  *p_playlist = pl_Yield( p_sout );
+
+    msg_Dbg( p_sout, "sout has been kept" );
+    vlc_object_attach( p_sout, p_playlist );
+
+    pl_Release( p_sout );
-}
-

src/input/input_internal.h

@@ -94 +94 @@
-    es_out_t    *p_es_out;
-    sout_instance_t *p_sout;            /* XXX Move it to es_out ? */
+    vlc_bool_t      b_sout_keep;
-    vlc_bool_t      b_out_pace_control; /*     idem ? */
-
@@ -226 +227 @@
-
-/* input.c */
-
-
+
+
+
+
-
-/* var.c */

src/input/vlm.c

@@ -1141 +1141 @@
-            asprintf( &psz_header, _("Media: %s"), media->psz_name );
-
-
-
+
-            {
-                while( !p_input->b_eof && !p_input->b_error )
@@ -1148 +1147 @@
-
-                input_StopThread( p_input );
-( p_input
+Extended( p_input, NULL
-            }
-            free( psz_output );
@@ -1243 +1242 @@
-        {
-            input_StopThread( p_instance->p_input );
-( p_instance->p_input
+Extended( p_instance->p_input, NULL
-        }
-
-        asprintf( &psz_header, _("Media: %s"), media->psz_name );
-
-
+
-        if( !p_instance->p_input )
-        {
@@ -1362 +1360 @@
-        {
-            input_StopThread( p_instance->p_input );
-( p_instance->p_input
+Extended( p_instance->p_input, NULL
-        }
-
@@ -2503 +2501 @@
-
-                    input_StopThread( p_instance->p_input );
-( p_instance->p_input
+Extended( p_instance->p_input, NULL
-                    p_instance->p_input = NULL;
-

src/playlist/engine.c

@@ -211 +211 @@
-            break;
-        }
+        msg_Dbg( p_playlist, "garbage collector destroying 1 sout" );
+        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        sout_DeleteInstance( (sout_instance_t*)p_obj );
@@ -410 +412 @@
-                                      VLC_OBJECT_SOUT, FIND_CHILD ) ) )
-    {
+        vlc_object_detach( p_obj );
-        vlc_object_release( p_obj );
-        sout_DeleteInstance( (sout_instance_t*)p_obj );

src/stream_output/stream_output.c

@@ -74 +74 @@
-{
-    sout_instance_t *p_sout;
-    vlc_value_t keep;
-
-    if( var_Get( p_parent, "sout-keep", &keep ) >= 0 && keep.b_bool )
-    {
-        /* Remove the sout from the playlist garbage collector */
-        playlist_t *p_playlist = pl_Yield( p_parent );
-
-        vlc_mutex_lock( &p_playlist->gc_lock );
-        p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
-        if( p_sout && p_sout->p_parent != (vlc_object_t *)p_playlist )
-        {
-            vlc_object_release( p_sout );
-            p_sout = NULL;
-        }
-        if( p_sout )
-            vlc_object_detach( p_sout );    /* Remove it from the GC */
-        vlc_mutex_unlock( &p_playlist->gc_lock );
-
-        pl_Release( p_parent );
-
-        /* */
-
-        if( p_sout )
-        {
-            if( !strcmp( p_sout->psz_sout, psz_dest ) )
-            {
-                msg_Dbg( p_parent, "sout keep: reusing sout" );
-                msg_Dbg( p_parent, "sout keep: you probably want to use "
-                          "gather stream_out" );
-                vlc_object_attach( p_sout, p_parent );
-                vlc_object_release( p_sout );
-                return p_sout;
-            }
-
-            msg_Dbg( p_parent, "sout keep: destroying unusable sout" );
-            vlc_object_release( p_sout );
-            sout_DeleteInstance( p_sout );
-        }
-    }
-
-    /* *** Allocate descriptor *** */
@@ -165 +126 @@
-void sout_DeleteInstance( sout_instance_t * p_sout )
-{
-    /* Unlink object */
-    vlc_object_detach( p_sout );
-
-    /* remove the stream out chain */
-    sout_StreamDelete( p_sout->p_stream );