[Sumover-dev] [svn commit] r4697 - in vic/branches/cc: codec

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

Author: soohyunc
Date: Wed Mar 17 15:52:15 2010
New Revision: 4697

Modified:
   vic/branches/cc/cc/o.sh
   vic/branches/cc/codec/encoder-h261.cpp

Log:
-- print Tx queue len before and after encoding



Modified: vic/branches/cc/cc/o.sh
==============================================================================
--- vic/branches/cc/cc/o.sh	(original)
+++ vic/branches/cc/cc/o.sh	Wed Mar 17 15:52:15 2010
@@ -38,4 +38,4 @@
 rm drop.tr
 
 # tx queue len
-grep txq_end trace.s | awk '{print $2" "$4}' > txq.xg
+grep txq_now trace.s | awk '{print $2" "$4}' > txq.xg

Modified: vic/branches/cc/codec/encoder-h261.cpp
==============================================================================
--- vic/branches/cc/codec/encoder-h261.cpp	(original)
+++ vic/branches/cc/codec/encoder-h261.cpp	Wed Mar 17 15:52:15 2010
@@ -833,6 +833,8 @@
 	// (get the necessary stats before encoding) ---------------------*
 	// Tx queue size before entering this encoding
 	txq_beg_ = tx_->tx_buf_size();
+	fprintf(stderr, "   now: %f\ttxq_now: %d\n", 
+		h261_now()-offset(), txq_beg_);
 	// sent packets after the previous encoding round, 
 	// but before starting this encoding instance.
 	// -- these packets were sent from the Tx queue 
@@ -840,7 +842,8 @@
 	sent_more_ = txq_end_ - txq_beg_;
 
 	fprintf(stderr, "\tnow: %f\tsent: %d more: %d vf[%d]: %d\n",
-	h261_now()-offset(), num_sent_, sent_more_, vfno_%FHSIZE, ppframe_[vfno_%FHSIZE]);
+	h261_now()-offset(), num_sent_, sent_more_, 
+	vfno_%FHSIZE, ppframe_[vfno_%FHSIZE]);
 
 	// all encoded packets associated with 
 	// the previously captured frame have been sent 
@@ -877,7 +880,7 @@
 	// (these Tx'd packets may include the previous frame(s).)
 	num_sent_ = ppframe_[vfno_%FHSIZE] - txq_dif_;
 
-	fprintf(stderr, "   now: %f\ttxq_end: %d\tdif: %d\n", 
+	fprintf(stderr, "   now: %f\ttxq_now: %d\tdif: %d\n", 
 		h261_now()-offset(), txq_end_, txq_dif_);
 
 	fprintf(stderr, "   now: %f\tenc_time: %f\n\n",