Changeset e3c6b242570ec32867138f9bd11414400814431b

Timestamp:

04/06/08 19:42:57 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[f2852bcf0d7f6d19df6af364d806a42dfc040677]

git-author:

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

Message:

Remove sout-keep from the input code

It needs to be done by the parent (VLM or playlist)

Files:

• src/input/input.c (modified) (8 diffs)
• src/input/input_internal.h (modified) (1 diff)

src/input/input.c

@@ -87 +87 @@
-static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta );
-static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta );
-
-static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, bool * );
-static void SoutKeep( sout_instance_t * );
-
-static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux );
@@ -186 +183 @@
-    p_input->p->p_es_out = NULL;
-    p_input->p->p_sout  = NULL;
-    p_input->p->b_owns_its_sout = true;
-    p_input->p->b_sout_keep  = false;
-    p_input->p->b_out_pace_control = false;
-    p_input->i_pts_delay = 0;
@@ -294 +289 @@
-    /* */
-    if( p_sout )
-    {
-        p_input->p->p_sout = p_sout;
-        p_input->p->b_owns_its_sout = false;
-    }
-
-    memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
@@ -321 +313 @@
-    stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING );
-#ifdef ENABLE_SOUT
-
-
-
-
-
-
-
+
+
-#endif
-    vlc_gc_decref( p_input->p->input.p_item );
@@ -348 +335 @@
-                                      input_item_t *p_item )
-{
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -396 +375 @@
-                   bool b_block )
-{
-    bool b_sout_keep;
-    sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
-    input_thread_t *p_input;
-
-p_sout
+NULL
-    if( !p_input )
-    {
-        if( p_sout )
-            SoutKeep( p_sout );
-        return VLC_EGENERIC;
-    }
-    p_input->p->b_sout_keep = b_sout_keep;
-
-    if( b_block )
@@ -500 +472 @@
-sout_instance_t * input_DetachSout( input_thread_t *p_input )
-{
-
-
+
+
+
+
-}
-
@@ -1391 +1365 @@
-}
-
-static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, bool *pb_sout_keep )
-{
-    bool 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 = true;
-        else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) )
-            b_keep_sout = 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 )
-    {
-        playlist_t *p_playlist = vlc_object_find( p_parent->p_libvlc,
-                VLC_OBJECT_PLAYLIST, FIND_CHILD );
-        if( p_playlist )
-        {
-            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 );
-            vlc_object_release( p_playlist );
-        }
-    }
-
-    if( pb_sout_keep )
-        *pb_sout_keep = b_keep_sout;
-
-    return p_sout;
-}
-
-static void SoutKeep( sout_instance_t *p_sout )
-{
-    playlist_t * p_playlist = vlc_object_find( p_sout, VLC_OBJECT_PLAYLIST,
-                                                FIND_PARENT );
-    if( p_playlist )
-    {
-        msg_Dbg( p_sout, "sout has been kept" );
-        vlc_object_attach( p_sout, p_playlist );
-        vlc_object_release( p_playlist );
-    }
-    else
-        sout_DeleteInstance( p_sout );
-}
-
-/*****************************************************************************
- * Control

src/input/input_internal.h

@@ -105 +105 @@
-    es_out_t    *p_es_out;
-    sout_instance_t *p_sout;            /* XXX Move it to es_out ? */
-    bool      b_sout_keep;
-    bool      b_out_pace_control; /*     idem ? */
-    bool      b_owns_its_sout;
-
-    /* Main input properties */