Changeset 321 for pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

Timestamp:

Mar 16, 2006 6:52:55 PM (18 years ago)

Author:

bennylp

Message:

Added sound port (sound_port.h/c), and changed sound and RTCP names from pj_* to pjmedia_*

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtcp.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -32 +32 @@
  * Get NTP time.
  */
-static void rtcp_get_ntp_time(struct pj_rtcp_ntp_rec *ntp)
+static void rtcp_get_ntp_time(struct pjmedia_rtcp_ntp_rec *ntp)
 {
     pj_time_val tv;
@@ -45 +45 @@
 
 
-PJ_DEF(void) pj_rtcp_init(pj_rtcp_session *s, pj_uint32_t ssrc)
-{
-    pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
-    
-    pj_memset(rtcp_pkt, 0, sizeof(pj_rtcp_pkt));
+PJ_DEF(void) pjmedia_rtcp_init(pjmedia_rtcp_session *s, 
+                               pj_uint32_t ssrc)
+{
+    pjmedia_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
+    
+    pj_memset(rtcp_pkt, 0, sizeof(pjmedia_rtcp_pkt));
     
     /* Init time */
@@ -67 +68 @@
 }
 
-PJ_DEF(void) pj_rtcp_fini(pj_rtcp_session *session)
+PJ_DEF(void) pjmedia_rtcp_fini(pjmedia_rtcp_session *session)
 {
     /* Nothing to do. */
@@ -73 +74 @@
 }
 
-static void rtcp_init_seq(pj_rtcp_session *s, pj_uint16_t  seq)
+static void rtcp_init_seq(pjmedia_rtcp_session *s, pj_uint16_t  seq)
 {
     s->received = 0;
@@ -84 +85 @@
 }
 
-PJ_DEF(void) pj_rtcp_rx_rtp(pj_rtcp_session *s, pj_uint16_t seq, pj_uint32_t rtp_ts)
+PJ_DEF(void) pjmedia_rtcp_rx_rtp(pjmedia_rtcp_session *s, 
+                                 pj_uint16_t seq, 
+                                 pj_uint32_t rtp_ts)
 {   
     pj_uint32_t arrival;
@@ -130 +133 @@
 }
 
-PJ_DEF(void) pj_rtcp_tx_rtp(pj_rtcp_session *s, pj_uint16_t  bytes_payload_size)
-{
-    pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
+PJ_DEF(void) pjmedia_rtcp_tx_rtp(pjmedia_rtcp_session *s, 
+                                 pj_uint16_t  bytes_payload_size)
+{
+    pjmedia_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
     rtcp_pkt->sr.sender_pcount = pj_htonl( pj_ntohl(rtcp_pkt->sr.sender_pcount) + 1);
     rtcp_pkt->sr.sender_bcount = pj_htonl( pj_ntohl(rtcp_pkt->sr.sender_bcount) + bytes_payload_size );
 }
 
-static void rtcp_build_rtcp(pj_rtcp_session *s, pj_uint32_t receiver_ssrc)
+static void rtcp_build_rtcp(pjmedia_rtcp_session *s, 
+                            pj_uint32_t receiver_ssrc)
 {   
     pj_uint32_t expected;
     pj_uint32_t u32;
     pj_uint32_t expected_interval, received_interval, lost_interval;
-    pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
+    pjmedia_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
     
     /* SSRC and last_seq */
@@ -176 +181 @@
 }
 
-PJ_DEF(void) pj_rtcp_build_rtcp(pj_rtcp_session *session, pj_rtcp_pkt **ret_p_pkt, int *len)
-{
-    pj_rtcp_pkt *rtcp_pkt = &session->rtcp_pkt;
-    pj_rtcp_ntp_rec ntp;
+PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjmedia_rtcp_session *session, 
+                                     pjmedia_rtcp_pkt **ret_p_pkt, 
+                                     int *len)
+{
+    pjmedia_rtcp_pkt *rtcp_pkt = &session->rtcp_pkt;
+    pjmedia_rtcp_ntp_rec ntp;
     pj_time_val now;
     
@@ -214 +221 @@
     /* Return pointer. */
     *ret_p_pkt = rtcp_pkt;
-    *len = sizeof(pj_rtcp_pkt);
-}
-
+    *len = sizeof(pjmedia_rtcp_pkt);
+}
+