Changeset 1447 for pjproject/branches/pjproject-0.5-stable/pjmedia/include/pjmedia/rtcp.h

Timestamp:

Sep 20, 2007 1:19:03 PM (17 years ago)

Author:

bennylp

Message:

Ticket #13: Send RTCP RR if stream is not transmitting any RTP packets

File:

• pjproject/branches/pjproject-0.5-stable/pjmedia/include/pjmedia/rtcp.h (modified) (7 diffs)

pjproject/branches/pjproject-0.5-stable/pjmedia/include/pjmedia/rtcp.h

@@ -59 +59 @@
 struct pjmedia_rtcp_sr
 {
-    pj_uint32_t     ssrc;           /**< SSRC identification.           */
     pj_uint32_t     ntp_sec;        /**< NTP time, seconds part.        */
     pj_uint32_t     ntp_frac;       /**< NTP time, fractions part.      */
@@ -118 +117 @@
 #endif
     unsigned        length:16;  /**< packet length          */
+    pj_uint32_t     ssrc;       /**< SSRC identification    */
 };
 
@@ -130 +130 @@
  * manually by application.
  */
-struct pjmedia_rtcp_pkt
+typedef struct pjmedia_rtcp_sr_pkt
 {
     pjmedia_rtcp_common  common;        /**< Common header.         */
     pjmedia_rtcp_sr      sr;            /**< Sender report.         */
     pjmedia_rtcp_rr      rr;            /**< variable-length list   */
-};
-
-/**
- * @see pjmedia_rtcp_pkt
- */
-typedef struct pjmedia_rtcp_pkt pjmedia_rtcp_pkt;
+} pjmedia_rtcp_sr_pkt;
+
+/**
+ * This structure declares RTCP RR (Receiver Report) packet.
+ */
+typedef struct pjmedia_rtcp_rr_pkt
+{
+    pjmedia_rtcp_common  common;        /**< Common header.         */
+    pjmedia_rtcp_rr      rr;            /**< variable-length list   */
+} pjmedia_rtcp_rr_pkt;
 
 
@@ -251 +255 @@
 {
     char                   *name;       /**< Name identification.           */
-    pjmedia_rtcp_pkt        rtcp_pkt;   /**< Cached RTCP packet.            */
+    pjmedia_rtcp_sr_pkt     rtcp_sr_pkt;/**< Cached RTCP packet.            */
+    pjmedia_rtcp_rr_pkt     rtcp_rr_pkt;/**< Cached RTCP RR packet.         */
     
     pjmedia_rtp_seq_session seq_ctrl;   /**< RTCP sequence number control.  */
@@ -310 +315 @@
  * @return                  PJ_SUCCESS on success.
  */
-PJ_DEF(pj_status_t) pjmedia_rtcp_get_ntp_time(const pjmedia_rtcp_session *sess,
-                                              pjmedia_rtcp_ntp_rec *ntp);
+PJ_DECL(pj_status_t) pjmedia_rtcp_get_ntp_time(const pjmedia_rtcp_session *sess,
+                                               pjmedia_rtcp_ntp_rec *ntp);
 
 
@@ -364 +369 @@
 
 /**
- * Build a RTCP SR+RR packet to be transmitted to remote RTP peer.
+ * Build a RTCP packet to be transmitted to remote RTP peer. This will
+ * create RTCP Sender Report (SR) or Receiver Report (RR) depending on
+ * whether the endpoint has been transmitting RTP since the last interval.
  * Note that this function will reset the interval counters (such as
  * the ones to calculate fraction lost) in the session.
@@ -370 +377 @@
  * @param session   The RTCP session.
  * @param rtcp_pkt  Upon return, it will contain pointer to the 
- *                  RTCP packet.
+ *                  RTCP packet, which can be RTCP SR or RR.
  * @param len       Upon return, it will indicate the size of 
  *                  the RTCP packet.
  */
 PJ_DECL(void) pjmedia_rtcp_build_rtcp( pjmedia_rtcp_session *session, 
-                                       pjmedia_rtcp_pkt **rtcp_pkt, 
-                                       int *len);
+                                       void **rtcp_pkt, int *len);