Changeset 9cb2370c5cde359db8d9dc9630f41da11007a639

Timestamp:

19/02/07 20:24:14 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[c16439ab29327e0624818d26fbaabfbe890dd72e]

git-author:

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

Message:

Simplistic RTCP sender for access output
Still needs fixing

Files:

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

modules/access_output/udp.c

@@ -26 +26 @@
- * Preamble
- *****************************************************************************/
+#include <vlc/vlc.h>
+
-#include <stdlib.h>
-#include <sys/types.h>
@@ -32 +34 @@
-#include <errno.h>
-#include <fcntl.h>
-
-
+
+
-#include <vlc_sout.h>
-#include <vlc_block.h>
@@ -170 +172 @@
-    block_fifo_t *p_empty_blocks;
-
+    uint32_t sent_pkts;
+    uint32_t sent_bytes;
+    size_t   rtcp_size;
+    int      rtcp_handle;
+    uint8_t  rtcp_data[28 + 8 + (2 * 257)];
+
-} sout_access_thread_t;
-
@@ -190 +198 @@
-#define RTP_HEADER_LENGTH 12
-
+static int OpenRTCP (sout_access_out_t *obj);
+static void SendRTCP (sout_access_thread_t *obj, uint32_t timestamp);
+static void CloseRTCP (sout_access_thread_t *obj);
+
-/*****************************************************************************
- * Open: open the file
- *****************************************************************************/
+/* FIXME: lots of leaks in error handling here! */
-static int Open( vlc_object_t *p_this )
-{
@@ -317 +330 @@
-    p_sys->i_mtu = var_CreateGetInteger( p_this, "mtu" );
-
-    if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite,
-                           VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
-    {
-        msg_Err( p_access->p_sout, "cannot spawn sout access thread" );
-        vlc_object_destroy( p_sys->p_thread );
-        return VLC_EGENERIC;
-    }
-
-    srand( (uint32_t)mdate());
-    p_sys->p_buffer          = NULL;
-    p_sys->i_sequence_number = rand()&0xffff;
-    p_sys->i_ssrc            = rand()&0xffffffff;
+
+    if (p_sys->b_rtpts && OpenRTCP (p_access))
+    {
+        msg_Err (p_access, "cannot initialize RTCP sender");
+        return VLC_EGENERIC;
+    }
+
+    if( vlc_thread_create( p_sys->p_thread, "sout write thread", ThreadWrite,
+                           VLC_THREAD_PRIORITY_HIGHEST, VLC_FALSE ) )
+    {
+        msg_Err( p_access->p_sout, "cannot spawn sout access thread" );
+        vlc_object_destroy( p_sys->p_thread );
+        return VLC_EGENERIC;
+    }
-
-    var_Get( p_access, SOUT_CFG_PREFIX "raw", &val );
@@ -371 +390 @@
-
-    net_Close( p_sys->p_thread->i_handle );
+    CloseRTCP (p_sys->p_thread);
-
-    vlc_object_detach( p_sys->p_thread );
@@ -518 +538 @@
-    else
-    {
-       
+
-        p_buffer->i_flags = 0;
-        p_buffer = block_Realloc( p_buffer, 0, p_sys->i_mtu );
@@ -534 +554 @@
-        p_buffer->p_buffer[1] = 0x21; // mpeg2-ts
-
-L
+B
-        p_sys->i_sequence_number++;
-L
-L
+B
+B
-
-        p_buffer->i_buffer = RTP_HEADER_LENGTH;
@@ -558 +578 @@
-# define strerror( x ) winsock_strerror( strerror_buf )
-#endif
+    size_t rtcp_counter = 0;
-
-    while( !p_thread->b_die )
@@ -606 +627 @@
-            i_to_send = p_thread->i_group;
-        }
-
-
+
+
+
-        {
-            msg_Warn( p_thread, "send error: %s", strerror(errno) );
+        }
+        else
+        {
+            p_thread->sent_pkts++;
+            p_thread->sent_bytes += val;
+            rtcp_counter += val;
-        }
-
@@ -626 +654 @@
-        }
-#endif
+
+        if (p_thread->rtcp_handle != -1)
+        {
+            /* FIXME: this is a very incorrect simplistic RTCP timer */
+            if ((rtcp_counter / 80) >= p_thread->rtcp_size)
+            {
+                SendRTCP (p_thread, p_pk->i_dts * 9 / 100);
+                rtcp_counter = 0;
+            }
+        }
-
-        block_FifoPut( p_thread->p_empty_blocks, p_pk );
@@ -665 +703 @@
-    return NULL;
-}
+
+
+/*
+ * NOTE on RTCP implementation:
+ * - there is a single sender (us), no conferencing here! => n = sender = 1,
+ * - as such we need not bother to include Receiver Reports,
+ * - in unicast case, there is a single receiver => members = 1 + 1 = 2,
+ *   and obviously n > 25% of members,
+ * - in multicast case, we do not want to maintain the number of receivers
+ *   and we assume it is big (i.e. than 3) because that's what broadcasting is
+ *   all about,
+ * - it is assumed we_sent = true (could be wrong), since we are THE sender,
+ * - we always send SR + SDES, while running,
+ * - FIXME: we do not implement separate rate limiting for SDES,
+ * - FIXME: we should send BYE when stopping,
+ * - we do not implement any profile-specific extensions for the time being.
+ */
+static int OpenRTCP (sout_access_out_t *obj)
+{
+    sout_access_out_sys_t *p_sys = obj->p_sys;
+    uint8_t *ptr;
+    int fd;
+
+    char src[NI_MAXNUMERICHOST], dst[NI_MAXNUMERICHOST];
+    int sport, dport;
+
+    fd = obj->p_sys->p_thread->i_handle;
+    if (net_GetSockAddress (fd, src, &sport)
+     || net_GetPeerAddress (fd, dst, &dport))
+        return VLC_EGENERIC;
+
+    sport++;
+    dport++;
+    /* FIXME: should we use UDP for non-UDP protos? */
+    fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, IPPROTO_UDP);
+    if (fd == -1)
+        return VLC_EGENERIC;
+
+    obj->p_sys->p_thread->rtcp_handle = fd;
+
+    ptr = (uint8_t *)strchr (src, '%');
+    if (ptr != NULL)
+        *ptr = '\0'; /* remove scope ID frop IPv6 addresses */
+
+    ptr = obj->p_sys->p_thread->rtcp_data;
+
+    /* Sender report */
+    ptr[0] = 2 << 6; /* V = 2, P = RC = 0 */
+    ptr[1] = 200; /* payload type: Sender Report */
+    SetWBE (ptr + 2, 6); /* length = 6 (7 double words) */
+    SetDWBE (ptr + 4, p_sys->i_ssrc);
+    ptr += 28;
+    /* timestamps and counter are handled later */
+
+    /* Source description */
+    uint8_t *sdes = ptr;
+    ptr[0] = (2 << 6) | 1; /* V = 2, P = 0, SC = 1 */
+    ptr[1] = 202; /* payload type: Source Description */
+    uint8_t *lenptr = ptr + 2;
+    SetDWBE (ptr + 4, p_sys->i_ssrc);
+    ptr += 8;
+
+    ptr[0] = 1; /* CNAME - mandatory */
+    assert (NI_MAXNUMERICHOST <= 256);
+    ptr[1] = strlen (src);
+    memcpy (ptr + 2, src, ptr[1]);
+    ptr += ptr[1] + 2;
+
+    static const char tool[] = PACKAGE_STRING;
+    ptr[0] = 6; /* TOOL */
+    ptr[1] = (sizeof (tool) > 256) ? 255 : (sizeof (tool) - 1);
+    memcpy (ptr + 2, tool, ptr[1]);
+    ptr += ptr[1] + 2;
+
+    while ((ptr - sdes) & 3) /* 32-bits padding */
+        *ptr++ = 0;
+    SetWBE (lenptr, ptr - sdes);
+
+    obj->p_sys->p_thread->rtcp_size = ptr - obj->p_sys->p_thread->rtcp_data;
+    return VLC_SUCCESS;
+}
+
+static void CloseRTCP (sout_access_thread_t *obj)
+{
+    /* TODO: send RTCP BYE */
+    if (obj->rtcp_handle != -1)
+        net_Close (obj->rtcp_handle);
+}
+
+static void SendRTCP (sout_access_thread_t *obj, uint32_t timestamp)
+{
+    uint8_t *ptr = obj->rtcp_data;
+    SetQWBE (ptr + 8, NTPtime64 ());
+    SetDWBE (ptr + 16, timestamp);
+    SetDWBE (ptr + 20, obj->sent_pkts);
+    SetDWBE (ptr + 24, obj->sent_bytes);
+
+    send (obj->rtcp_handle, ptr, obj->rtcp_size, 0);
+}