Changeset c4d19b859876eee3510940ae172d66d4723ba1a8

Timestamp:

13/10/07 01:41:31 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[8281a1556a25c368985933c44c2cbc3667bd5f62]

git-author:

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

Message:

Added sout-mux-caching option. It allow to set the initial muxer cache value
in millisecond.

Original patch created by Jeff Hansen.

Files:

• src/libvlc-module.c (modified) (2 diffs)
• src/stream_output/stream_output.c (modified) (3 diffs)

src/libvlc-module.c

@@ -844 +844 @@
-    "multiple playlist item (automatically insert the gather stream output " \
-    "if not specified)" )
+
+#define SOUT_MUX_CACHING_TEXT N_("Stream output muxer caching (ms)")
+#define SOUT_MUX_CACHING_LONGTEXT N_( \
+    "This allow you to configure the initial caching amount for stream output " \
+    " muxer. This value should be set in milliseconds." )
-
-#define PACKETIZER_TEXT N_("Preferred packetizer list")
@@ -1687 +1692 @@
-    add_bool( "sout-spu", 1, NULL, SOUT_SPU_TEXT,
-                                SOUT_SPU_LONGTEXT, VLC_TRUE );
+    add_integer( "sout-mux-caching", 1500, NULL, SOUT_MUX_CACHING_TEXT,
+                                SOUT_MUX_CACHING_LONGTEXT, VLC_TRUE );
-
-    set_section( N_("VLM"), NULL );

src/stream_output/stream_output.c

@@ -104 +104 @@
-    vlc_object_attach( p_sout, p_parent );
-
+    /* */
+    var_Create( p_sout, "sout-mux-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+    /* */
-    p_sout->p_stream = sout_StreamNew( p_sout, p_sout->psz_chain );
-
-    if( p_sout->p_stream == NULL )
-    {
@@ -471 +474 @@
-    {
-        msg_Err( p_mux, "cannot add a new stream (unsupported while muxing "
-
+. You can try increasing sout-mux-caching value
-        return NULL;
-    }
@@ -552 +555 @@
-    if( p_mux->b_waiting_stream )
-    {
+        const int64_t i_caching = var_GetInteger( p_mux->p_sout, "sout-mux-caching" ) * I64C(1000);
+
-        if( p_mux->i_add_stream_start < 0 )
-        {
-            p_mux->i_add_stream_start = p_buffer->i_dts;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            return;
-}
+p_mux->b_waiting_stream = VLC_FALSE;
-    }
-    p_mux->pf_mux( p_mux );