macosx: Add a missing PL_LOCK in the wizard.

[vlc] / src / stream_output / stream_output.c

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index f52c017c001e06e2920d13589831da500be28149..8f205c8d1fc49adba484a94c6a67a6521eca0da8 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -294,11 +294,13 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input,
 sout_access_out_t *sout_AccessOutNew( sout_instance_t *p_sout,
                                       const char *psz_access, const char *psz_name )
 {
+    static const char typename[] = "access out";
     sout_access_out_t *p_access;
     char              *psz_next;
 
-    if( !( p_access = vlc_object_create( p_sout,
-                                         sizeof( sout_access_out_t ) ) ) )
+    p_access = vlc_custom_create( p_sout, sizeof( *p_access ),
+                                  VLC_OBJECT_GENERIC, typename );
+    if( !p_access )
         return NULL;
 
     psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg,
@@ -400,10 +402,12 @@ int sout_AccessOutControl (sout_access_out_t *access, int query, va_list args)
 sout_mux_t * sout_MuxNew( sout_instance_t *p_sout, char *psz_mux,
                           sout_access_out_t *p_access )
 {
+    static const char typename[] = "mux";
     sout_mux_t *p_mux;
     char       *psz_next;
 
-    p_mux = vlc_object_create( p_sout, sizeof( sout_mux_t ) );
+    p_mux = vlc_custom_create( p_sout, sizeof( *p_mux ), VLC_OBJECT_GENERIC,
+                               typename);
     if( p_mux == NULL )
         return NULL;
 
@@ -757,6 +761,7 @@ static void mrl_Clean( mrl_t *p_mrl )
  */
 sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
 {
+    static const char typename[] = "stream out";
     sout_stream_t *p_stream;
 
     if( !psz_chain )
@@ -765,8 +770,8 @@ sout_stream_t *sout_StreamNew( sout_instance_t *p_sout, char *psz_chain )
         return NULL;
     }
 
-    p_stream = vlc_object_create( p_sout, sizeof( sout_stream_t ) );
-
+    p_stream = vlc_custom_create( p_sout, sizeof( *p_stream ),
+                                  VLC_OBJECT_GENERIC, typename );
     if( !p_stream )
         return NULL;
 
@@ -813,34 +818,47 @@ static char *_sout_stream_url_to_chain( vlc_object_t *p_this,
 {
     mrl_t       mrl;
     char        *psz_chain;
-    const char  *fmt = "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}";
-    static const char rtpfmt[] = "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s\"}";
 
     mrl_Parse( &mrl, psz_url );
 
-    /* Check if the URLs goes #rtp - otherwise we'll use #standard */
+    /* Check if the URLs goes to #rtp - otherwise we'll use #standard */
+    static const char rtplist[] = "dccp\0sctp\0tcp\0udplite\0";
+    for (const char *a = rtplist; *a; a += strlen (a) + 1)
+        if (strcmp (a, mrl.psz_access) == 0)
+            goto rtp;
+
     if (strcmp (mrl.psz_access, "rtp") == 0)
     {
+        char *port;
         /* For historical reasons, rtp:// means RTP over UDP */
         strcpy (mrl.psz_access, "udp");
-        fmt = rtpfmt;
+rtp:
+        if (mrl.psz_name[0] == '[')
+        {
+            port = strstr (mrl.psz_name, "]:");
+            if (port != NULL)
+                port++;
+        }
+        else
+            port = strchr (mrl.psz_name, ':');
+        if (port != NULL)
+            *port++ = '\0'; /* erase ':' */
+
+        if (asprintf (&psz_chain,
+                      "rtp{mux=\"%s\",proto=\"%s\",dst=\"%s%s%s\"}",
+                      mrl.psz_way, mrl.psz_access, mrl.psz_name,
+                      port ? "\",port=\"" : "", port ? port : "") == -1)
+            psz_chain = NULL;
     }
     else
     {
-        static const char list[] = "dccp\0sctp\0tcp\0udplite\0";
-        for (const char *a = list; *a; a += strlen (a) + 1)
-             if (strcmp (a, mrl.psz_access) == 0)
-             {
-                 fmt = rtpfmt;
-                 break;
-             }
+        /* Convert the URL to a basic standard sout chain */
+        if (asprintf (&psz_chain,
+                      "standard{mux=\"%s\",access=\"%s\",dst=\"%s\"}",
+                      mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1)
+            psz_chain = NULL;
     }
 
-    /* Convert the URL to a basic sout chain */
-    if (asprintf (&psz_chain, fmt,
-                  mrl.psz_way, mrl.psz_access, mrl.psz_name) == -1)
-        psz_chain = NULL;
-
     /* Duplicate and wrap if sout-display is on */
     if (psz_chain && (config_GetInt( p_this, "sout-display" ) > 0))
     {