[vlc-commits] commit: rtp sout: move ES port number initialization (Pierre Ynard )

[git at videolan.org]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed May 26 07:57:32 2010 +0200| [a35051d3e5ba0809824e6ce633d7bb55015c8785] | committer: Pierre Ynard 

rtp sout: move ES port number initialization

They are only ever used if there is an explicit dst

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a35051d3e5ba0809824e6ce633d7bb55015c8785
---

 modules/stream_out/rtp.c |   64 +++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index aed8ba8..05b32d4 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -913,36 +913,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
         return NULL;
     }
 
-    /* Choose the port */
-    uint16_t i_port = 0;
-    if( p_fmt == NULL )
-        ;
-    else
-    if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
-        i_port = p_sys->i_port_audio;
-    else
-    if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
-        i_port = p_sys->i_port_video;
-
-    /* We do not need the ES lock (p_sys->lock_es) here, because this is the
-     * only one thread that can *modify* the ES table. The ES lock protects
-     * the other threads from our modifications (TAB_APPEND, TAB_REMOVE). */
-    for (int i = 0; i_port && (i < p_sys->i_es); i++)
-         if (i_port == p_sys->es[i]->i_port)
-             i_port = 0; /* Port already in use! */
-    for (uint16_t p = p_sys->i_port; i_port == 0; p += 2)
-    {
-        if (p == 0)
-        {
-            msg_Err (p_stream, "too many RTP elementary streams");
-            return NULL;
-        }
-        i_port = p;
-        for (int i = 0; i_port && (i < p_sys->i_es); i++)
-             if (p == p_sys->es[i]->i_port)
-                 i_port = 0;
-    }
-
     sout_stream_id_t *id = malloc( sizeof( *id ) );
     if( unlikely(id == NULL) )
         return NULL;
@@ -959,7 +929,6 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     id->psz_fmtp   = NULL;
     id->i_clock_rate = 90000; /* most common case for video */
     id->i_channels = 0;
-    id->i_port     = i_port;
     if( p_fmt != NULL )
     {
         id->i_cat  = p_fmt->i_cat;
@@ -1025,6 +994,39 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
     if( p_sys->psz_destination != NULL )
     {
+        /* Choose the port */
+        uint16_t i_port = 0;
+        if( p_fmt == NULL )
+            ;
+        else
+        if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
+            i_port = p_sys->i_port_audio;
+        else
+        if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
+            i_port = p_sys->i_port_video;
+
+        /* We do not need the ES lock (p_sys->lock_es) here, because
+         * this is the only one thread that can *modify* the ES table.
+         * The ES lock protects the other threads from our modifications
+         * (TAB_APPEND, TAB_REMOVE). */
+        for (int i = 0; i_port && (i < p_sys->i_es); i++)
+             if (i_port == p_sys->es[i]->i_port)
+                 i_port = 0; /* Port already in use! */
+        for (uint16_t p = p_sys->i_port; i_port == 0; p += 2)
+        {
+            if (p == 0)
+            {
+                msg_Err (p_stream, "too many RTP elementary streams");
+                goto error;
+            }
+            i_port = p;
+            for (int i = 0; i_port && (i < p_sys->i_es); i++)
+                 if (p == p_sys->es[i]->i_port)
+                     i_port = 0;
+        }
+
+        id->i_port = i_port;
+
         int type = SOCK_STREAM;
 
         switch( p_sys->proto )