Call for help.

[vlc] / modules / stream_out / standard.c

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index e002beef80328bec2589e72c6238d66be393f12a..68d96b1f4b7f0f9747adb3182be94fe007dd67fb 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * standard.c
+ * standard.c: standard stream output module
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: standard.c,v 1.13 2003/08/28 21:02:14 fenrir Exp $
+ * Copyright (C) 2003-2004 VideoLAN
+ * $Id: standard.c,v 1.18 2004/01/25 14:34:25 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -40,7 +40,7 @@
 static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
-static sout_stream_id_t *Add ( sout_stream_t *, sout_format_t * );
+static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
 static int               Del ( sout_stream_t *, sout_stream_id_t * );
 static int               Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_t* );
 
@@ -48,7 +48,7 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Standard stream") );
+    set_description( _("Standard stream output") );
     set_capability( "sout stream", 50 );
     add_shortcut( "standard" );
     add_shortcut( "std" );
@@ -69,7 +69,8 @@ static int Open( vlc_object_t *p_this )
 {
     sout_stream_t       *p_stream = (sout_stream_t*)p_this;
     sout_instance_t     *p_sout = p_stream->p_sout;
-    sout_stream_sys_t   *p_sys = malloc( sizeof( sout_stream_sys_t) );
+    slp_session_t       *p_slp = NULL;
+    sap_session_t       *p_sap = NULL;
 
     char *psz_mux      = sout_cfg_find_value( p_stream->p_cfg, "mux" );
     char *psz_access   = sout_cfg_find_value( p_stream->p_cfg, "access" );
@@ -87,9 +88,6 @@ static int Open( vlc_object_t *p_this )
 
     char                *psz_mux_byext = NULL;
 
-    p_sys->p_sap = NULL;
-    p_sys->p_slp = NULL;
-
     msg_Dbg( p_this, "creating `%s/%s://%s'",
              psz_access, psz_mux, psz_url );
 
@@ -109,8 +107,10 @@ static int Open( vlc_object_t *p_this )
             { "wma", "asf" },
             { "wmv", "asf" },
             { "trp", "ts" },
+            { "ts",  "ts" },
             { "mpg", "ps" },
             { "mpeg","ps" },
+            { "ps",  "ps" },
             { "mpeg1","mpeg1" },
             { NULL,  NULL }
         };
@@ -153,11 +153,11 @@ static int Open( vlc_object_t *p_this )
         ( psz_mux == NULL || *psz_mux == '\0' ) )
     {
         /* access given, no mux */
-        if( !strcmp( psz_access, "mmsh" ) )
+        if( !strncmp( psz_access, "mmsh", 4 ) )
         {
             psz_mux = "asfh";
         }
-        else if( !strcmp( psz_access, "udp" ) )
+        else if( !strncmp( psz_access, "udp", 3 ) )
         {
             psz_mux = "ts";
         }
@@ -170,7 +170,7 @@ static int Open( vlc_object_t *p_this )
              ( psz_access == NULL || *psz_access == '\0' ) )
     {
         /* mux given, no access */
-        if( !strcmp( psz_mux, "asfh" ) )
+        if( !strncmp( psz_mux, "asfh", 4 ) )
         {
             psz_access = "mmsh";
         }
@@ -184,19 +184,31 @@ static int Open( vlc_object_t *p_this )
     /* fix or warm of incompatible couple */
     if( psz_mux && *psz_mux && psz_access && *psz_access )
     {
-        if( !strcmp( psz_access, "mmsh" ) && strcmp( psz_mux, "asfh" ) )
+        if( !strncmp( psz_access, "mmsh", 4 ) && strncmp( psz_mux, "asfh", 4 ) )
         {
+            char *p = strchr( psz_mux,'{' );
+
             msg_Warn( p_stream, "fixing to mmsh/asfh" );
-            psz_mux = "asfh";
+            if( p )
+            {
+                /* -> a little memleak but ... */
+                psz_mux = malloc( strlen( "asfh" ) + strlen( p ) + 1);
+                sprintf( psz_mux, "asfh%s", p );
+            }
+            else
+            {
+                psz_mux = "asfh";
+            }
         }
-        else if( ( !strcmp( psz_access, "rtp" ) ||
-                   !strcmp( psz_access, "udp" ) ) &&
+        else if( ( !strncmp( psz_access, "rtp", 3 ) ||
+                   !strncmp( psz_access, "udp", 3 ) ) &&
                  strncmp( psz_mux, "ts", 2 ) )
         {
             msg_Err( p_stream, "for now udp and rtp are only valid with TS" );
         }
-        else if( strcmp( psz_access, "file" ) &&
-                 ( !strcmp( psz_mux, "mov" ) || !strcmp( psz_mux, "mp4" ) ) )
+        else if( strncmp( psz_access, "file", 4 ) &&
+                 ( !strncmp( psz_mux, "mov", 3 ) ||
+                   !strncmp( psz_mux, "mp4", 3 ) ) )
         {
             msg_Err( p_stream, "mov and mp4 work only with file output" );
         }
@@ -243,11 +255,11 @@ static int Open( vlc_object_t *p_this )
         }
         msg_Dbg( p_sout , "Creating SAP with IPv%i", atoi(psz_ipv) );
 
-        p_sys->p_sap = sout_SAPNew( p_sout , psz_url ,
+        p_sap = sout_SAPNew( p_sout , psz_url ,
             p_sap_cfg->psz_value ? p_sap_cfg->psz_value : psz_url,
             atoi(psz_ipv), psz_v6_scope );
 
-        if( !p_sys->p_sap )
+        if( !p_sap )
             msg_Err( p_sout,"Unable to initialize SAP. SAP disabled");
     }
 
@@ -264,14 +276,15 @@ static int Open( vlc_object_t *p_this )
         }
         else
         {
-            p_sys->p_slp = (slp_session_t*)malloc(sizeof(slp_session_t));
-            if(!p_sys->p_slp)
+            p_slp = (slp_session_t*)malloc(sizeof(slp_session_t));
+            if(!p_slp)
             {
                 msg_Warn(p_sout,"Out of memory");
+                if( p_sap ) free( p_sap );
                 return -1;
             }
-            p_sys->p_slp->psz_url= strdup(psz_url);
-            p_sys->p_slp->psz_name = strdup(
+            p_slp->psz_url= strdup(psz_url);
+            p_slp->psz_name = strdup(
                     p_slp_cfg->psz_value ? p_slp_cfg->psz_value : psz_url);
         }
     }
@@ -280,21 +293,21 @@ static int Open( vlc_object_t *p_this )
     /* XXX beurk */
     p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader );
 
-
-    p_sys->p_mux = p_mux;
-
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;
     p_stream->pf_send   = Send;
 
-    p_stream->p_sys     = p_sys;
+    p_stream->p_sys        = malloc( sizeof( sout_stream_sys_t) );
+    p_stream->p_sys->p_mux = p_mux;
+    p_stream->p_sys->p_slp = p_slp;
+    p_stream->p_sys->p_sap = p_sap;
+
     return VLC_SUCCESS;
 }
 
 /*****************************************************************************
  * Close:
  *****************************************************************************/
-
 static void Close( vlc_object_t * p_this )
 {
     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
@@ -327,7 +340,7 @@ struct sout_stream_id_t
 };
 
 
-static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt )
+static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     sout_stream_id_t  *id;