Changeset 4d243c1d7853c7021befe5edd0ac4e051193ae8a

Timestamp:

21/11/06 11:46:12 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1164105972 +0000

git-parent:

[cec120d523341b08cdc3cba2674fb014f9e99a49]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1164105972 +0000

Message:

Rewrote internal RTCP to support multiple client connections. TODO: rtcp scheduling function, server socket, hooking it up with RTP stream_out connections.

Files:

• configure.ac (modified) (1 diff)
• modules/mux/rtp/Modules.am (modified) (1 diff)
• modules/mux/rtp/rtcp.c (modified) (8 diffs)
• modules/mux/rtp/rtcp.h (modified) (2 diffs)

configure.ac

@@ -1449 +1449 @@
-  VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel])
-#  VLC_ADD_PLUGINS([stream_out_transrate])
+  VLC_ADD_PLUGINS([rtcp])
-  VLC_ADD_PLUGINS([profile_parser])
-

modules/mux/rtp/Modules.am

@@ -1 @@
-    
+

modules/mux/rtp/rtcp.c

@@ -23 +23 @@
- *****************************************************************************/
-
+#include <stdlib.h>
-#include <netinet/in.h>
-#include <sys/time.h>
-#include <sys/time.h>
-
@@ -34 +34 @@
-#include "rtcp.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    unsigned int i = 0;
-
-rtcp && !p_buffer
+pkt
-        return VLC_EGENERIC;
-
-    msg_Dbg( p_this, "decoding record: SR" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return VLC_SUCCESS;
-}
-
-t *p_rtcp, uint8_t *p_buffer
-
-unsigned int u_ssrc_count
+pkt_t *p_pkt
+
+rtcp_t *p_rtcp = (rtcp_t *) p_this
-    unsigned int i = 0;
-
-rtcp && !p_buffer
+pkt
-        return VLC_EGENERIC;
-
-    msg_Dbg( p_this, "decoding record: RR" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return VLC_SUCCESS;
-}
-
-
-
-
+
+
+
+
+
+
-        return VLC_EGENERIC;
-
-    msg_Dbg( p_this, "decoding record: SDES" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return VLC_SUCCESS;
-}
-
-
-
-
+
+
+
+
+
+
+
+
-        return VLC_EGENERIC;
-
-    msg_Dbg( p_this, "decoding record: BYE" );
+
+    u_ssrc = bs_read( p_rtcp->bs, 32 );
+    p_rtcp->pf_del_client( p_this, u_ssrc );
+    u_length = p_pkt->u_length-1;
+    for( i = 0 ; i < u_length; i++ )
+    {
+        u_ssrc = bs_read( p_rtcp->bs, 8 );
+        p_rtcp->pf_del_client( p_this, u_ssrc );
+    }
-    return VLC_SUCCESS;
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return VLC_EGENERIC;
-
-    msg_Dbg( p_this, "decoding record: APP" );
+
+    u_ssrc = bs_read( p_rtcp->bs, 32 );
+
+    result = p_rtcp->pf_find_client( p_this, u_ssrc, &i_pos );
+    if( result == VLC_EGENERIC )
+    {
+        result = p_rtcp->pf_add_client( p_this, p_pkt->u_ssrc, &i_pos );
+        if( result == VLC_EGENERIC )
+            return VLC_ENOMEM;
+    }
+
+    vlc_mutex_lock( &p_rtcp->object_lock );
+    p_client = p_rtcp->pp_clients[i_pos];
+
+    for( i = 0 ; i < 4; i++ )
+    {
+        psz_name[i] = bs_read( p_rtcp->bs, 8 );
+    }
+    psz_name[4] = '\0';
+    
+    p_pkt->u_payload_type = RTCP_APP;
+    p_pkt->report.app.psz_prefix = strdup( psz_name );
+    p_pkt->report.app.u_prefix_len = 4;
+    p_pkt->u_length -= 4;
+
+    psz_data = (char *) malloc( p_pkt->u_length );
+    if( !psz_data ) {
+        vlc_mutex_unlock( &p_rtcp->object_lock );
+        return VLC_EGENERIC;
+    }
+
+    for( i = 0; i < p_pkt->u_length; i-- )
+    {
+        psz_data[i] = bs_read( p_rtcp->bs, 8 );
+    }
+    psz_data[p_pkt->u_length] = '\0';
+
+    p_pkt->report.app.psz_data = strdup( psz_data );
+    p_pkt->report.app.u_length = p_pkt->u_length;
+
+    p_client = NULL;
+    vlc_mutex_unlock( &p_rtcp->object_lock );
+
-    /* Just ignore this packet */
-    return VLC_SUCCESS;
@@ -187 +611 @@
- * Decode incoming RTCP packet and inspect the records types.
- */
-
-
-
-
-
-
-
+
+
+
+
+
-        return VLC_EGENERIC;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            case RTCP_SR:
-
+
+
+
-                break;
+
-            case RTCP_RR:
-
+
+
+
-                break;
+
-            case RTCP_SDES:
-
+
+
+
-                break;
+
-            case RTCP_BYE:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                break;
+
-            case RTCP_APP:
-
+
+
+
-                break;
+
-            default:
-                return VLC_EGENERIC;
@@ -238 +705 @@
- * Create RTCP records for reporting to server.
- */
-block_t *rtcp_encode
-
-t  *p_rtcp
-
-
-p_rtcp = (rtcp_t *) malloc( sizeof( rtcp_t ) );
-if( !p_rtcp )
-
-rtcp, 0 , sizeof( rtcp
-rtcp
-rtcp
-rtcp
+rtcp_pkt_t *rtcp_pkt_new
+
+pkt_t *p_pkt
+
+
+if( !p_pkt )
+    return NULL;
+
+pkt, 0 , sizeof( rtcp_pkt
+pkt
+pkt
+pkt
-
-    switch( type )
-    {
-
-
+
+
+
+
+
+
-        case RTCP_SDES:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    mtime_t ntp_time;
-    bs_t bits, *s = &bits;
-    block_t *p_block = NULL;
+    rtcp_stats_t *p_stats = NULL;
+    rtcp_client_t *p_client = NULL;
+    uint32_t i_pos = 0;
+    int result = 0;
+
+    if( p_pkt->u_payload_type != RTCP_SR )
+        return NULL;
-
-    /* FIXME: Maybe this should be a buffer pool instead */
-rtcp
+pkt
-    if( !p_block )
-        return NULL;
@@ -281 +811 @@
-
-    /* Fill in header */
-5, p_rtcp->u_count
+2, p_pkt->u_version
-    bs_write( s, 1, 0 ); /* padding */
-
-
-
-
-
-
-
+
+
+
+
+
+
-    ntp_time = mdate();
-htonl( ((unsigned int)(ntp_time>>32)) 
-htonl( ((unsigned int)ntp_time)
+((unsigned int)(ntp_time>>32)
+((unsigned int)ntp_time
-
-    /* FIXME: Make sure to generate a good RTP server timestamp.
-rtcp
+pkt
-        (unsigned int) ((double)ntp_time.tv_sec +
-        (double)ntp_time.tv_usec/1000000.) * p_mux->rate
-        + session->start_rtptime ); */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+