wxwidgets: Don't forget to vlc_gc_decref() the input_item_t once we are done (Patch...

[vlc] / modules / stream_out / standard.c

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 3f50459e81f08e713db9578dd9aec2b8ada94a0b..c318f018a31087a41159cba48cb33bf7ae1885bd 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -24,10 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
 
-
 #include <vlc_network.h>
 #include "vlc_url.h"
 
@@ -40,9 +43,17 @@
 #define MUX_TEXT N_("Output muxer")
 #define MUX_LONGTEXT N_( \
     "Muxer to use for the stream." )
-#define DST_TEXT N_("Output destination")
-#define DST_LONGTEXT N_( \
-    "Destination (URL) to use for the stream." )
+#define DEST_TEXT N_("Output destination")
+#define DEST_LONGTEXT N_( \
+    "Destination (URL) to use for the stream. Overrides path and bind parameters" )
+#define BIND_TEXT N_("address to bind to (helper setting for dst)")
+#define BIND_LONGTEXT N_( \
+  "address:port to bind vlc to listening incoming streams "\
+  "helper setting for dst,dst=bind+'/'+path. dst-parameter overrides this" )
+#define PATH_TEXT N_("filename for stream (helper setting for dst)")
+#define PATH_LONGTEXT N_( \
+  "Filename for stream "\
+  "helper setting for dst, dst=bind+'/'+path, dst-parameter overrides this" )
 #define NAME_TEXT N_("Session name")
 #define NAME_LONGTEXT N_( \
   "This allows you to specify a name for the session, that will be announced "\
@@ -93,8 +104,12 @@ vlc_module_begin();
                 ACCESS_LONGTEXT, VLC_FALSE );
     add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
                 MUX_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
-                DST_LONGTEXT, VLC_FALSE );
+    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+                DEST_LONGTEXT, VLC_FALSE );
+    add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT,
+                BIND_LONGTEXT, VLC_FALSE );
+    add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT,
+                PATH_LONGTEXT, VLC_FALSE );
         change_unsafe();
 
     add_bool( SOUT_CFG_PREFIX "sap", VLC_FALSE, NULL, SAP_TEXT, SAP_LONGTEXT,
@@ -122,7 +137,8 @@ vlc_module_end();
  *****************************************************************************/
 static const char *ppsz_sout_options[] = {
     "access", "mux", "url", "dst",
-    "sap", "name", "group", "description", "url", "email", "phone", NULL
+    "sap", "name", "group", "description", "url", "email", "phone",
+    "bind", "path", NULL
 };
 
 #define DEFAULT_PORT 1234
@@ -148,7 +164,9 @@ static int Open( vlc_object_t *p_this )
 
     char *psz_mux;
     char *psz_access;
-    char *psz_url;
+    char *psz_url=NULL;
+    char *psz_bind;
+    char *psz_path;
 
     vlc_value_t val;
 
@@ -168,12 +186,33 @@ static int Open( vlc_object_t *p_this )
     psz_mux = *val.psz_string ? val.psz_string : NULL;
     if( !*val.psz_string ) free( val.psz_string );
 
+    var_Get( p_stream, SOUT_CFG_PREFIX "bind", &val );
+    psz_bind = *val.psz_string ? val.psz_string : NULL;
+    if( !*val.psz_string ) free( val.psz_string);
+
+    var_Get( p_stream, SOUT_CFG_PREFIX "path", &val );
+    psz_path = *val.psz_string ? val.psz_string : NULL;
+    if( !*val.psz_string ) free( val.psz_string);
+
+    if( psz_bind ) psz_url = psz_bind;
+    if( psz_url && psz_path ) 
+    {
+        if( asprintf( &psz_url,"%s/%s",psz_url,psz_path ) == -1 )
+            psz_url = NULL;
+        free( psz_path );
+    }
 
     var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
-    psz_url = *val.psz_string ? val.psz_string : NULL;
-    if( !*val.psz_string ) free( val.psz_string );
+    if( *val.psz_string ) 
+    {
+        free( psz_url);
+        psz_url = val.psz_string;
+    }
+    else
+        free( val.psz_string );
 
     p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) );
+    if( !p_sys ) return VLC_ENOMEM;
     p_stream->p_sys->p_session = NULL;
 
     msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url );
@@ -295,10 +334,19 @@ static int Open( vlc_object_t *p_this )
         }
     }
     else if( ( !strncmp( psz_access, "rtp", 3 ) ||
-               !strncmp( psz_access, "udp", 3 ) ) &&
-             strncmp( psz_mux, "ts", 2 ) )
+               !strncmp( psz_access, "udp", 3 ) ) )
     {
-        msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+        if( !strncmp( psz_mux, "ffmpeg", 6 ) )
+        {   /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */
+            char *psz_ffmpeg_mux = var_CreateGetString( p_this, "ffmpeg-mux" );
+            if( !psz_ffmpeg_mux || strncmp( psz_ffmpeg_mux, "mpegts", 6 ) )
+                msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+            free( psz_ffmpeg_mux );
+        }
+        else if( strncmp( psz_mux, "ts", 2 ) )
+        {
+            msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+        }
     }
     else if( strncmp( psz_access, "file", 4 ) &&
              ( !strncmp( psz_mux, "mov", 3 ) ||
@@ -380,8 +428,7 @@ static int Open( vlc_object_t *p_this )
             msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp);
 
             p_sys->p_session =
-                sout_AnnounceRegisterSDP (p_sout, SOUT_CFG_PREFIX, psz_sdp,
-                                          dhost, p_method);
+                sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
             sout_MethodRelease (p_method);
         }
         free (dhost);