Changeset 4f620050a14477a01374b2a54f537fee935f5c82

Timestamp:

05/03/07 22:34:30 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[4380e365008bdb1733b9ea36920b53dd13bfe7ec]

git-author:

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

Message:

--sout-udp-rtcp option to force RTCP usage.
(Currently RTCP only Sender Reports are implemented.)

RTCP is auto-enabled for RTP/TS but this could be used by the RTP stream
output plugin to enable RTCP too (in that case, RTP encapsulation is done
in the stream output plugin, so the access output cannot know if it should
do RTCP or not).

Files:

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

modules/access_output/udp.c

@@ -103 +103 @@
-                       "without trying to make the biggest possible packets " \
-                       "in order to improve streaming)." )
+#define RTCP_TEXT N_("Force RTCP Sender Reports")
+#define RTCP_LONGTEXT N_("Sends RTCP Sender Report packets even if " \
+                         "RTP encapsulation is not done")
-#define AUTO_MCAST_TEXT N_("Automatic multicast streaming")
-#define AUTO_MCAST_LONGTEXT N_("Allocates an outbound multicast address " \
@@ -120 +123 @@
-                                 VLC_TRUE );
-    add_suppressed_integer( SOUT_CFG_PREFIX "late" );
-0
+VLC_FALSE
-                                 VLC_TRUE );
-
+
+
+
-              AUTO_MCAST_LONGTEXT, VLC_TRUE );
-0
+VLC_FALSE
-    add_integer( SOUT_CFG_PREFIX "cscov", 12, NULL, CSCOV_TEXT, CSCOV_LONGTEXT, VLC_TRUE );
-
@@ -142 +147 @@
-    "group",
-    "raw",
+    "rtcp",
-    "lite",
-    "cscov",
@@ -191 +197 @@
-    int                 i_mtu;
-
- // 1 if add rtp/ts header
+// true for RTP/MP2 encapsulation
-    vlc_bool_t          b_mtu_warning;
-    uint16_t            i_sequence_number;
@@ -224 +230 @@
-
-    vlc_value_t         val;
+    vlc_bool_t          b_rtcp = VLC_FALSE;
-
-    config_ChainParse( p_access, SOUT_CFG_PREFIX,
@@ -248 +255 @@
-    {
-        if (strcmp (p_access->psz_access, "rtp") == 0)
-
+
+
+
+
+
-    }
-
@@ -367 +378 @@
-    p_sys->i_ssrc            = rand()&0xffffffff;
-
-p_sys->b_rtpts
+b_rtcp
-    {
-        msg_Err (p_access, "cannot initialize RTCP sender");
@@ -820 +831 @@
-static void CloseRTCP (sout_access_thread_t *obj)
-{
+    if (obj->rtcp_handle == -1)
+        return;
+
-    uint8_t *ptr = obj->rtcp_data;
-    /* Bye */
@@ -830 +844 @@
-     * we can afford not to check bandwidth constraints here. */
-    send (obj->rtcp_handle, obj->rtcp_data, 8, 0);
-
-
-
+
-}
-