Changeset 19248128916fcc7062c7e5e6d22939ae820b76a3

Timestamp:

07/29/04 20:48:01 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[dc30ef149e773a648fb090b82989b90950ed9a87]

git-author:

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

Message:

• rtp: added port-audio and port-video option (for default port).
  

Files:

• modules/stream_out/rtp.c (modified) (11 diffs)

modules/stream_out/rtp.c

@@ -55 +55 @@
-#define PORT_LONGTEXT N_( \
-    "Allows you to specify the base port used for the RTP streaming." )
+
+#define PORT_AUDIO_TEXT N_("Audio port")
+#define PORT_AUDIO_LONGTEXT N_( \
+    "Allows you to specify the default audio port used for the RTP streaming." )
+
+#define PORT_VIDEO_TEXT N_("Video port")
+#define PORT_VIDEO_LONGTEXT N_( \
+    "Allows you to specify the default video port used for the RTP streaming." )
+
-#define TTL_TEXT N_("Time to live")
-#define TTL_LONGTEXT N_( \
@@ -78 +87 @@
-                MUX_LONGTEXT, VLC_TRUE );
-
-", 1234, NULL, PORT
+-audio", 1234, NULL, PORT_AUDIO
-                 PORT_LONGTEXT, VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "port-video", 1236, NULL, PORT_VIDEO_TEXT,
+                 PORT_LONGTEXT, VLC_TRUE );
+    add_integer( SOUT_CFG_PREFIX "port", 1238, NULL, PORT_TEXT,
+                 PORT_LONGTEXT, VLC_TRUE );
+
-    add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT,
-                 TTL_LONGTEXT, VLC_TRUE );
@@ -90 +104 @@
- *****************************************************************************/
-static const char *ppsz_sout_options[] = {
-
+port-audio", "port-video", "
-};
-
@@ -141 +155 @@
-    char *psz_destination;
-    int  i_port;
+    int  i_port_audio;
+    int  i_port_video;
-    int  i_ttl;
-
@@ -241 +257 @@
-    p_sys->psz_session_name = *val.psz_string ? val.psz_string : NULL;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    if( !p_sys->psz_session_name )
@@ -630 +653 @@
-    sout_stream_id_t  *id;
-    sout_access_out_t *p_access = NULL;
+    int               i_port;
+    char              *psz_sdp;
-
-    if( p_sys->p_mux != NULL )
@@ -646 +671 @@
-        id->pf_packetize= NULL;
-        id->p_rtsp_url  = NULL;
-
+
-        return id;
+    }
+
+
+    /* Choose the port */
+    i_port = 0;
+    if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
+    {
+        i_port = p_sys->i_port_audio;
+        p_sys->i_port_audio = 0;
+    }
+    else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
+    {
+        i_port = p_sys->i_port_video;
+        p_sys->i_port_video = 0;
+    }
+    while( i_port == 0 )
+    {
+        if( p_sys->i_port != p_sys->i_port_audio && p_sys->i_port != p_sys->i_port_video )
+        {
+            i_port = p_sys->i_port;
+            p_sys->i_port += 2;
+            break;
+        }
+        p_sys->i_port += 2;
-    }
-
@@ -664 +713 @@
-            sprintf( access, "udp{raw}" );
-        }
-p_sys->
+
-        if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL )
-        {
@@ -683 +732 @@
-    id->psz_fmtp   = NULL;
-    id->psz_destination = p_sys->psz_destination ? strdup( p_sys->psz_destination ) : NULL;
-p_sys->
+
-    id->p_rtsp_url = NULL;
-    vlc_mutex_init( p_stream, &id->lock_rtsp );
@@ -820 +869 @@
-
-    /* Update p_sys context */
-    /* update port used (2 -> 1 rtp, 1 rtcp )*/
-    vlc_mutex_lock( &p_sys->lock_es );
-    TAB_APPEND( p_sys->i_es, p_sys->es, id );
-    vlc_mutex_unlock( &p_sys->lock_es );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return id;
@@ -855 +898 @@
-    TAB_REMOVE( p_sys->i_es, p_sys->es, id );
-    vlc_mutex_unlock( &p_sys->lock_es );
+
+    /* Release port */
+    if( id->i_port > 0 )
+    {
+        if( id->i_cat == AUDIO_ES && p_sys->i_port_audio == 0 )
+            p_sys->i_port_audio = id->i_port;
+        else if( id->i_cat == VIDEO_ES && p_sys->i_port_video == 0 )
+            p_sys->i_port_video = id->i_port;
+    }
-
-    if( id->p_access )