Changeset 11fddaa6fa3d16939419a14f7a31a10db8369a52

Timestamp:

15/10/04 17:42:01 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1097854921 +0000

git-parent:

[8b1965a7e9f20db5c98a7a2004c5ad95d5c22f7f]

git-author:

Gildas Bazin <gbazin@videolan.org> 1097854921 +0000

Message:

* src/stream_output/stream_output.c:

• for muxers that request some preparsing before starting muxing,
  we now wait for 1.5 seconds worth of data to be in the fifo instead
  of waiting for 1.5 seconds of real-time.
  
• if we have have control over the output pace, we also wait before
  starting muxing (produces nicer streams).
  

Files:

• src/stream_output/stream_output.c (modified) (9 diffs)

src/stream_output/stream_output.c

@@ -42 +42 @@
-static void sout_CfgDestroy( sout_cfg_t * );
-
-
+
+
-static char *_sout_stream_url_to_chain( vlc_object_t *, char * );
-
@@ -365 +366 @@
-    char       *psz_next;
-
-
-
+
-    if( p_mux == NULL )
-    {
@@ -373 +373 @@
-    }
-
-      
+
-    psz_next = sout_CfgCreate( &p_mux->psz_mux, &p_mux->p_cfg, psz_mux );
-
-
-
-
+
+
-    p_mux->p_access     = p_access;
-    p_mux->pf_control   = NULL;
@@ -388 +386 @@
-
-    p_mux->p_sys        = NULL;
-
+
+
+
+
+
-
-    vlc_object_attach( p_mux, p_sout );
-
-    
+
-        module_Need( p_mux, "sout mux", p_mux->psz_mux, VLC_TRUE );
-
@@ -407 +409 @@
-    if( p_mux->pf_control )
-    {
-
-
+
+
+
+
-        {
-            b_answer = VLC_FALSE;
-        }
+
-        if( b_answer )
-        {
@@ -418 +423 @@
-            p_mux->b_waiting_stream = VLC_FALSE;
-
-
+
+
+
+
+
+
+
+
-            {
-                b_answer = VLC_FALSE;
-            }
+
-            if( b_answer )
-            {
@@ -429 +442 @@
-            }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    return p_mux;
@@ -474 +476 @@
-                        "for this format)" );
-        return NULL;
-    }
-    if( p_mux->i_add_stream_start < 0 )
-    {
-        /* we wait for one second */
-        p_mux->i_add_stream_start = mdate();
-    }
-
@@ -549 +546 @@
-    if( p_mux->b_waiting_stream )
-    {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            p_mux->b_waiting_stream = VLC_FALSE;
-        }