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

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

Author: soohyunc
Date: Thu Sep  4 18:46:07 2008
New Revision: 4287

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

Log:
o  (critical issue fixed)
   when we are in CC mode, we shouldn't call Transmitter::flush() at the encoder
   side - see H261Encoder::encode() that this method calls "tx_->flush()" which
   forces to transmit packets in the queue.

--> needed to implement a macro to block calling Transmitter::flush() when CC is
    active


Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Thu Sep  4 18:46:07 2008
@@ -215,7 +215,7 @@
 {
 	// CC is active, so just follow CC routines 
 	// (i.e., not sending packets here)
-	if (is_cc_active_) {
+	if (is_cc_on()) {
 		// if it is the very first packet, just send it.
 		if(is_first_) {
 			tfwc_sndr_send(pb);
@@ -282,18 +282,20 @@
 
 void Transmitter::flush()
 {
-	if (busy_) {
-		busy_ = 0;
-		cancel();
-	}
+	if (!is_cc_on()) {
+		if (busy_) {
+			busy_ = 0;
+			cancel();
+		}
 
-	pktbuf* p = head_;
-	while (p != 0) {
-		pktbuf* n = p->next;
-		output(p);
-		p = n;
+		pktbuf* p = head_;
+		while (p != 0) {
+			pktbuf* n = p->next;
+			output(p);
+			p = n;
+		}
+		head_ = 0;
 	}
-	head_ = 0;
 }
 
 void Transmitter::output(pktbuf* pb)