Changeset a5a265ad837cfcff4f231f1cf2c7d692577f75af

Timestamp:

04/29/07 11:22:04 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

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

git-parent:

[1e9bb01789991135c548aff9deae9db9c2f3b63c]

git-author:

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

Message:

Numerous compile fixes.

Files:

• modules/mux/rtp/rtcp.c (modified) (13 diffs)
• modules/mux/rtp/rtcp.h (modified) (10 diffs)

modules/mux/rtp/rtcp.c

@@ -2 +2 @@
- * rtcp.c: RTP/RTCP source file
- *****************************************************************************
-
+-2007
- *
- * $Id$
@@ -34 +34 @@
-#include "rtcp.h"
-
-
-
-
-
-
-
-
-
-
+
+
-
-/* SDES support functions */
@@ -51 +44 @@
-    p_item = (rtcp_SDES_item_t *) malloc( sizeof( rtcp_SDES_item_t ) );
-    if( !p_item )
-GENERIC
+NOMEM
-    p_item->u_type = i_item;
-    p_item->psz_data = strdup( psz_name );
@@ -84 +77 @@
-    p_client = (rtcp_client_t*) malloc( sizeof(rtcp_client_t) );
-    if( !p_client )
-GENERIC
+NOMEM
-    p_client->i_index = p_rtcp->i_clients + 1;
-    p_client->b_deleted = VLC_FALSE;
@@ -110 +103 @@
-                           p_rtcp->i_next_date;
-        p_rtcp->u_clients--;
+        /* BYE message is sent by rtcp_destroy_client() */
-    }
-    vlc_mutex_unlock( &p_rtcp->object_lock );
@@ -139 +133 @@
-}
-
+/* Close communication with clients and release allocated objects */
+int rtcp_destroy_clients( vlc_object_t *p_this )
+{
+    rtcp_t *p_rtcp = (rtcp_t *) p_this;
+    uint32_t i = 0;
+
+    for( i=0; i < p_rtcp->i_clients; i++ )
+    {
+        rtcp_pkt_t *pkt = NULL;
+        rtcp_client_t *p_old = p_rtcp->pp_clients[i];
+
+        p_rtcp->pf_del_client( p_this, p_old->u_ssrc );
+    pkt = rtcp_pkt_new( p_this, RTCP_BYE );
+    if( pkt )
+    {
+        block_t *p_block = NULL;
+        p_block = rtcp_encode_BYE( p_this, pkt, strdup("server is leaving") );
+            /* FIXME: 
+             * if( p_block )
+         *    send_RTCP( p_this, p_block );
+             */
+    }
+            
+    }
+    /* wait till all clients have been signalled */
+    while( p_rtcp->i_clients != 0 )
+    {
+        p_rtcp->pf_cleanup_clients( p_this );
+        msleep( 500 );
+    }
+    return VLC_SUCCESS;
+}
+
-/*  rtcp_find_client should be called with the object lock held.
- *  vlc_mutex_lock( &p_rtcp->obj_lock );
@@ -163 +190 @@
- *--------------------------------------------------------------------------
- */
-
+ uint32_t u_ssrc,
-                        vlc_bool_t b_sender, vlc_bool_t b_first )
-{
@@ -175 +202 @@
-    int n = p_rtcp->i_clients;
-
-    int u_ssrc = 0; /* FIXME: how to know which client we look for?? */
-    
-    if( b_first )
-        i_rtcp_min = (i_rtcp_min >> 1);
@@ -195 +220 @@
-    /* calculate average time between reports */
-    p_client = p_rtcp->pf_find_client( p_this, u_ssrc, &i_pos );
-   
-   
+    
+    
-        
-    i_interval = p_client->p_stats->u_avg_pkt_size * ( n / i_bandwidth );
@@ -211 +236 @@
- *--------------------------------------------------------------------------
- */
-
-    uint64_t u_bandwidth
-
-
-   
+ uint64_t u_bandwidth,
+         uint32_t u_ssrc
+
+
+    
-    rtcp_stats_t *p_stats = NULL;
-    mtime_t i_interval = 0;
-    uint32_t i_pos = 0;
-
-    int u_ssrc = 0; /* FIXME: how to know which client we look for?? */
-
-    p_client = p_rtcp->pf_find_client( p_this, u_ssrc, &i_pos );
-   
-       
+    
+        
-    p_stats = (rtcp_stats_t*) p_client->p_stats;
-    i_interval = (mtime_t) rtcp_interval( p_this, u_bandwidth,
-
+u_ssrc, 
-    p_rtcp->i_next_date = p_rtcp->i_last_date + i_interval;
-
@@ -255 +278 @@
-                p_rtcp->i_last_date = p_rtcp->i_date;
-                i_interval = rtcp_interval( p_this, u_bandwidth,
-
+u_ssrc, 
-                rtcp_schedule( p_this, p_rtcp->i_next_date + i_interval, rtcp_event );
-                *b_first = VLC_FALSE;
@@ -990 +1013 @@
-    uint32_t i_count = strlen( psz_reason );
-    uint8_t  u_octet = i_count / 8;  /* Octect count ??*/
-   u
+    
-
-    if( p_pkt->u_payload_type != RTCP_BYE )
@@ -1013 +1036 @@
-    //FIXME: bs_write( s, 8, p_item->u_type );
-    bs_write( s, 8, u_octet );
-
+
-    for( i_pos = 0; i_pos < i_count; i_pos++ )
-    {

modules/mux/rtp/rtcp.h

@@ -2 +2 @@
- * rtcp.h: RTP/RTCP headerfile
- *****************************************************************************
-
+-2007
- *
- * $Id$
@@ -145 +145 @@
-typedef struct rtcp_client_t
-{
+    int fd;                        /*< socket descriptor of rtcp stream */
+
-    uint32_t    i_index;
-    uint32_t    u_ssrc;            /*< channel name */
@@ -166 +168 @@
-    VLC_COMMON_MEMBERS
-
-    int fd;                        /*< socket descriptor of rtcp stream */
-
-    uint32_t u_clients;            /*< number of clients connected */
-    uint32_t u_active;             /*< number of active senders */
@@ -183 +183 @@
-    bs_t    *bs;                   /*< bitstream decoding data pointer */
-
+    /* functions */
-    int (*pf_add_client)( vlc_object_t *p_this, uint32_t u_ssrc, uint32_t *i_pos );
-    int (*pf_del_client)( vlc_object_t *p_this, uint32_t u_ssrc );
-    int (*pf_find_client)( vlc_object_t *p_this, uint32_t u_ssrc, uint32_t *i_pos );
-
+
+
-} rtcp_t;
-
@@ -193 +195 @@
-/* Should be called with vlc_mutex_lock( &p_this->objec_lock ) held */
-int rtcp_find_client( vlc_object_t *p_this, uint32_t u_ssrc, uint32_t *i_pos );
-
+
+
-
-/**
@@ -222 +225 @@
- * rtcp_pkt_new - Encode RTCP packet
- * Create a new RTCP packet of type 'type'
-
+:
- * \param type  type of RTCP packet @see
- */
@@ -241 +244 @@
- * \param p_this        VLC_OBJECT of type rtcp_t
- * \param u_bandwith    bandwidth of RTP connection
+ * \param u_ssrc        client to sent or receive from
- * \param b_sender      are we the sender or the receiver
- * \param b_first       the first time this function is called use only half
- *                      of the initial waiting time
- */
-
+ uint32_t u_ssrc,
-                        vlc_bool_t b_sender, vlc_bool_t b_first );
-
@@ -251 +255 @@
- * rtcp_expire
- * Decides to sent an RTCP report or a BYE record
+ * Arguments:
- * \param p_this        VLC_OBJECT of type rtcp_t
- * \param u_bandwith    bandwidth of RTP connection
+ * \param u_ssrc        client to sent or receive from
- * \param rtcp_event    type of event received
- * \param b_sender      are we the sender or the receiver
@@ -259 +265 @@
- *                      it will return *b_first = VLC_FALSE;
- */
-
-    uint64_t u_bandwidth
+ uint64_t u_bandwidth,
+                 uint32_t u_ssrc
-
-/**
@@ -266 +272 @@
- * Determine what to do on the received Sender Report, decode it
- * or leave the channel (BYE record).
+ * Arguments:
- * \param p_this        VLC_OBJECT of type rtcp_t
- * \param p_pkt         RTCP packet that was received