[Sumover-dev] [svn commit] r4698 - in vic/branches/mpeg4: rtp

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

Author: douglask
Date: Fri Mar 19 12:42:13 2010
New Revision: 4698

Modified:
   vic/branches/mpeg4/rtp/session.cpp
   vic/branches/mpeg4/tcl/cf-util.tcl

Log:
Patch supplied by Andrew Ford for sending the "loc" Tcl resource via SDES_LOC
over RTCP.


Modified: vic/branches/mpeg4/rtp/session.cpp
==============================================================================
--- vic/branches/mpeg4/rtp/session.cpp	(original)
+++ vic/branches/mpeg4/rtp/session.cpp	Fri Mar 19 12:42:13 2010
@@ -497,7 +497,14 @@
 		nameslot = RTCP_SDES_NAME;
 		noteslot = RTCP_SDES_NAME;
 	}
+
 	u_int seq = (++sdes_seq_) & 0x7;
+	// if loc is set as a tcl resource, change to use 10 different packets
+	// with loc on the last even one
+	const char* loc = ls.sdes(RTCP_SDES_LOC);
+	if ( loc && *loc )
+		seq = sdes_seq_ % 10;
+
 	switch (seq) {
 
 	case 0:  case 4:
@@ -510,6 +517,9 @@
 	case 6:
 		p = build_sdes_item(p, RTCP_SDES_TOOL, ls);
 		break;
+	case 8:
+		p = build_sdes_item(p, RTCP_SDES_LOC, ls);
+		break;
 	default:
 		p = build_sdes_item(p, nameslot, ls);
 	}

Modified: vic/branches/mpeg4/tcl/cf-util.tcl
==============================================================================
--- vic/branches/mpeg4/tcl/cf-util.tcl	(original)
+++ vic/branches/mpeg4/tcl/cf-util.tcl	Fri Mar 19 12:42:13 2010
@@ -134,6 +134,7 @@
 	$src sdes email [resource rtpEmail]
 	$src sdes note [resource rtpNote]
 	$src sdes cname $cname
+	$src sdes loc [resource loc]
 	set tool $V(app)-[version]
 	global tcl_platform
 	if {[info exists tcl_platform(os)] && $tcl_platform(os) != "" && \