Changeset 0b879fdfa25b12b2d4ca60e119cf4a1bdafe5c8b

Timestamp:

06/03/07 16:53:43 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1173196423 +0000

git-parent:

[c1432d5dc66274596ec743c608e97e6034e897df]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1173196423 +0000

Message:

Make --sout-udp-rtcp an integer carrying a port number rather than a boolean

Files:

• modules/access_output/udp.c (modified) (10 diffs)

modules/access_output/udp.c

@@ -103 +103 @@
-                       "without trying to make the biggest possible packets " \
-                       "in order to improve streaming)." )
-
-
-
+
+
-#define AUTO_MCAST_TEXT N_("Automatic multicast streaming")
-#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \
@@ -125 +124 @@
-    add_bool( SOUT_CFG_PREFIX "raw",  VLC_FALSE, NULL, RAW_TEXT, RAW_LONGTEXT,
-                                 VLC_TRUE );
-bool( SOUT_CFG_PREFIX "rtcp",  VLC_FALSE
-
+integer( SOUT_CFG_PREFIX "rtcp",  0
+   
-    add_bool( SOUT_CFG_PREFIX "auto-mcast", VLC_FALSE, NULL, AUTO_MCAST_TEXT,
-              AUTO_MCAST_LONGTEXT, VLC_TRUE );
@@ -211 +210 @@
-#define RTP_HEADER_LENGTH 12
-
-
+, uint16_t dport
-static void SendRTCP (sout_access_thread_t *obj, uint32_t timestamp);
-static void CloseRTCP (sout_access_thread_t *obj);
@@ -224 +223 @@
-
-    char                *psz_dst_addr = NULL;
-
+i_rtcp_port = 0, 
-    const char          *protoname = "UDP";
-
@@ -230 +229 @@
-
-    vlc_value_t         val;
-    vlc_bool_t          b_rtcp = VLC_FALSE;
-
-    config_ChainParse( p_access, SOUT_CFG_PREFIX,
@@ -255 +253 @@
-    {
-        if (strcmp (p_access->psz_access, "rtp") == 0)
-
-
-
-
-
+
-    }
-
@@ -289 +283 @@
-        }
-    }
+
+    /* This option is really only meant for the RTP streaming output
+     * plugin. Doing RTCP for raw UDP will yield weird results. */
+    i_rtcp_port = var_GetInteger (p_access, SOUT_CFG_PREFIX"rtcp");
+    /* If RTCP port is not specified, use the default, if we do RTP/MP2 encap,
+     * or do not use RTCP at all otherwise. */
+    if ((i_rtcp_port == 0) && (p_sys->b_rtpts))
+        i_rtcp_port = i_dst_port + 1;
-
-    p_sys->p_thread =
@@ -378 +380 @@
-    p_sys->i_ssrc            = rand()&0xffffffff;
-
-b_rtcp && OpenRTCP (p_access, proto
+i_rtcp_port && OpenRTCP (p_access, proto, i_rtcp_port
-    {
-        msg_Err (p_access, "cannot initialize RTCP sender");
@@ -765 +767 @@
- * - we do not implement any profile-specific extensions for the time being.
- */
-
+, uint16_t dport
-{
-    sout_access_out_sys_t *p_sys = obj->p_sys;
@@ -772 +774 @@
-
-    char src[NI_MAXNUMERICHOST], dst[NI_MAXNUMERICHOST];
-, dport
+
-
-    fd = obj->p_sys->p_thread->i_handle;
-    if (net_GetSockAddress (fd, src, &sport)
-&dport
+NULL
-        return VLC_EGENERIC;
-
-    sport++;
-    dport++;
-    fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, proto);
-    if (fd == -1)