[Sumover-dev] [svn commit] r4237 - in vic/branches/cc: rtp

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

Author: soohyunc
Date: Tue Aug  5 18:17:03 2008
New Revision: 4237

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

Log:
o  (temporary commit)
   changed/put a few method to compile


Modified: vic/branches/cc/cc/tfwc_sndr.cpp
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.cpp	(original)
+++ vic/branches/cc/cc/tfwc_sndr.cpp	Tue Aug  5 18:17:03 2008
@@ -48,7 +48,7 @@
 	seqno_(-1) 
 {}
 
-void TfwcSndr::cc_parse_buf(pktbuf* pb) {
+void TfwcSndr::tfwc_sndr_parse_buf(pktbuf* pb) {
 
 	// get RTP hearder information
 	rtphdr* rh =(rtphdr*) pb->data;
@@ -59,6 +59,6 @@
 	debug_msg("sent seqno:		%d\n", seqno_);
 }
 
-u_int16_t TfwcSndr::cc_get_seqno() {
+u_int16_t TfwcSndr::get_seqno() {
 	return seqno_;
 }

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Tue Aug  5 18:17:03 2008
@@ -39,9 +39,10 @@
 class TfwcSndr {
 public:
 	TfwcSndr();
-	void cc_parse_buf(pktbuf*);	// get pktbuf from transmitter module
-	u_int16_t cc_get_seqno();		// return packet sequence number
-	u_int16_t seqno_;			// packet sequence number
+	// parse RTP data packet from Transmitter module
+	void tfwc_sndr_parse_buf(pktbuf*);
+	u_int16_t get_seqno();	// return packet sequence number
+	u_int16_t seqno_;	// packet sequence number
 
 protected:
 	TfwcSndr* tfwcsndr_;

Modified: vic/branches/cc/rtp/session.cpp
==============================================================================
--- vic/branches/cc/rtp/session.cpp	(original)
+++ vic/branches/cc/rtp/session.cpp	Tue Aug  5 18:17:03 2008
@@ -636,7 +636,7 @@
 		sr->sr_np = htonl(sl.np());
 		sr->sr_nb = htonl(sl.nb());
 		rr = (rtcp_rr*)(sr + 1);
-		xr = (rtcp_xr*)(rr + 1);
+		xr = (rtcp_xr*)(rr + 1);	// extended report
 	} else {
 		flags |= RTCP_PT_RR;
 		rr = (rtcp_rr*)(rh + 1);
@@ -1061,11 +1061,6 @@
 void SessionManager::parse_xr(rtcphdr* rh, int flags, u_char* ep,
 							  Source* ps, Address & addr, int layer)
 {
-	UNUSED(flags);
-	UNUSED(ep);
-	UNUSED(ps);
-	UNUSED(addr);
-	UNUSED(layer);
 
 	Source* s;
 	u_int32_t ssrc = rh->rh_ssrc;
@@ -1082,6 +1077,11 @@
 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");
+	UNUSED(cnt);
+	UNUSED(ep);
+	UNUSED(addr);
+
 	ackvec_ = r->xr_ackvec;
 	/*
 	 * if AoA is received, then first trim ackvec and send a new ackvec

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Tue Aug  5 18:17:03 2008
@@ -213,9 +213,9 @@
 void Transmitter::send(pktbuf* pb)
 {
 	if (is_cc_active_) {
-		cc_parse_buf(pb);
+		tfwc_sndr_parse_buf(pb);
 	} else {
-		cc_parse_buf(pb);
+		tfwc_sndr_parse_buf(pb);
 		if (!busy_) {
 			double delay = txtime(pb);
 			nextpkttime_ = gettimeofday_secs() + delay;