Changeset 4239

Timestamp:

08/06/08 11:46:54 (5 years ago)

Author:

soohyunc

Message:

(continue XR report)
added a mechanisms if CC is turned on or not

Location:

vic/branches/cc/rtp

Files:

• session.cpp (modified) (1 diff)
• transmitter.h (modified) (3 diffs)

vic/branches/cc/rtp/session.cpp

@@ -664 +664 @@
                 sr->sr_nb = htonl(sl.nb());
                 rr = (rtcp_rr*)(sr + 1);
-                xr = (rtcp_xr*)(rr + 1);        // extended report
+                //xr = (rtcp_xr*)(rr + 1);      // extended report
         } else {
                 flags |= RTCP_PT_RR;
                 rr = (rtcp_rr*)(rh + 1);
-                xr = (rtcp_xr*)(rr + 1);        // extended report
-        }
+                //xr = (rtcp_xr*)(rr + 1);      // extended report
+        }
+
+        // if CC is turned on, we need XR report
+        if (is_cc_on()) {
+                flags |= RTCP_PT_XR;
+                xr = (rtcp_xr*)(rh + 1);        // extended report
+        }
+
         int nrr = 0;
         int nsrc = 0;

vic/branches/cc/rtp/transmitter.h

@@ -84 +84 @@
         void flush();
         void send(pktbuf*);
+        inline bool is_cc_on() { return is_cc_active_; }
         /*
          * Buffer allocation hooks.
@@ -119 +120 @@
         static int dumpfd_;     /* fd to dump packet stream to */
         static u_int16_t seqno_;
+
+        /* Cc related variables */
+        bool is_cc_active_;             /* is Cc module activated?              */
+
     private:
         static pktbuf* freehdrs_;
@@ -124 +129 @@
         static int nbufs_;
         static int nhdrs_;
-
-        /* Cc related variables */
-        bool is_cc_active_;             /* is Cc module activated?              */
 };