[Sumover-dev] [svn commit] r4240 - vic/branches/cc/rtp

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Wed Aug  6 13:16:38 2008
New Revision: 4240

Modified:
   vic/branches/cc/rtp/session.cpp
   vic/branches/cc/rtp/transmitter.cpp

Log:
turned on is_cc_active_ (rtp/transmitter.h)


Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Wed Aug  6 13:16:38 2008
@@ -591,7 +591,7 @@
 void SessionManager::announce(CtrlHandler* ch)
 {
 	send_report(ch, 0);
-	send_xreport(ch, 0);
+	//send_xreport(ch, 0);
 }
 
 /*
@@ -1111,7 +1111,7 @@
 void SessionManager::parse_xr_records(u_int32_t ssrc, rtcp_xr* r, int cnt,
 				      const u_char* ep, Address & addr)
 {
-    	debug_msg("XXX parse_xr_records\n");
+	debug_msg("XXX parse_xr_records\n");
 	UNUSED(cnt);
 	UNUSED(ep);
 	UNUSED(addr);

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Wed Aug  6 13:16:38 2008
@@ -91,7 +91,7 @@
 	tail_(0),
 	loop_layer_(1000),
 	loopback_(0),
-	is_cc_active_(0)
+	is_cc_active_(1)
 {
 	memset((char*)&mh_, 0, sizeof(mh_));
 	mh_.msg_iovlen = 2;
@@ -214,8 +214,25 @@
 {
 	if (is_cc_active_) {
 		tfwc_sndr_parse_buf(pb);
+		if (!busy_) {
+			double delay = txtime(pb);
+			nextpkttime_ = gettimeofday_secs() + delay;
+			output(pb);
+			/*
+			 * emulate a transmit interrupt --
+			 * assume we will have more to send.
+			 */
+			msched(int(delay * 1e-3));
+			busy_ = 1;
+		} else {
+			if (head_ != 0) {
+				tail_->next = pb;
+				tail_ = pb;
+			} else
+				tail_ = head_ = pb;
+			pb->next = 0;
+		}
 	} else {
-		tfwc_sndr_parse_buf(pb);
 		if (!busy_) {
 			double delay = txtime(pb);
 			nextpkttime_ = gettimeofday_secs() + delay;