From 65a4e4ed564febabd4241476df9e6677ccd01238 Mon Sep 17 00:00:00 2001
From: "hta@webrtc.org" <hta@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 30 Apr 2012 11:23:41 +0000
Subject: [PATCH] Minor refactoring: RTCPReceiver::BoundingSet Remove ability
 to modify a pointer argument.

Added a test for transmitting a non-empty TMMBN

BUG=
TEST=unittest

Review URL: https://webrtc-codereview.appspot.com/542004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2148 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/modules/rtp_rtcp/source/rtcp_receiver.cc  |  2 +-
 src/modules/rtp_rtcp/source/rtcp_receiver.h   |  2 +-
 .../rtp_rtcp/source/rtcp_sender_test.cc       | 30 +++++++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/modules/rtp_rtcp/source/rtcp_receiver.cc b/src/modules/rtp_rtcp/source/rtcp_receiver.cc
index e78f53a31..9caac861d 100644
--- a/src/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/src/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -671,7 +671,7 @@ bool RTCPReceiver::UpdateRTCPReceiveInformationTimers() {
 }
 
 WebRtc_Word32 RTCPReceiver::BoundingSet(bool &tmmbrOwner,
-                                        TMMBRSet*& boundingSetRec) {
+                                        TMMBRSet* boundingSetRec) {
   CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
 
   std::map<WebRtc_UWord32, RTCPReceiveInformation*>::iterator receiveInfoIt =
diff --git a/src/modules/rtp_rtcp/source/rtcp_receiver.h b/src/modules/rtp_rtcp/source/rtcp_receiver.h
index fec9efb6b..294e67df6 100644
--- a/src/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/src/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -91,7 +91,7 @@ public:
 
     bool UpdateRTCPReceiveInformationTimers();
 
-    WebRtc_Word32 BoundingSet(bool &tmmbrOwner, TMMBRSet*& boundingSetRec);
+    WebRtc_Word32 BoundingSet(bool &tmmbrOwner, TMMBRSet* boundingSetRec);
 
     WebRtc_Word32 UpdateTMMBR();
 
diff --git a/src/modules/rtp_rtcp/source/rtcp_sender_test.cc b/src/modules/rtp_rtcp/source/rtcp_sender_test.cc
index e41d93ee1..59fb71b57 100644
--- a/src/modules/rtp_rtcp/source/rtcp_sender_test.cc
+++ b/src/modules/rtp_rtcp/source/rtcp_sender_test.cc
@@ -196,10 +196,34 @@ TEST_F(RtcpSenderTest, SendsTmmbnIfSetAndEmpty) {
   bool owner = false;
   // The BoundingSet function returns the number of members of the
   // bounding set, and touches the incoming set only if there's > 1.
-  // TODO(hta): Change the type of the BoundingSet second argument from
-  // TMMBRSet*& to TMMBRSet* - it never writes to the pointer.
   EXPECT_EQ(0, test_transport_->rtcp_receiver_->BoundingSet(owner,
       incoming_set));
-  EXPECT_TRUE(incoming_set == NULL);
+}
+
+TEST_F(RtcpSenderTest, SendsTmmbnIfSetAndValid) {
+  EXPECT_EQ(0, rtcp_sender_->SetRTCPStatus(kRtcpCompound));
+  TMMBRSet bounding_set;
+  bounding_set.VerifyAndAllocateSet(1);
+  const WebRtc_UWord32 idx = bounding_set.lengthOfSet;
+  // TODO(hta): Make an accessor on TMMBRSet to do this insertion.
+  const WebRtc_UWord32 kSourceSsrc = 12345;
+  bounding_set.ptrPacketOHSet[idx] = 0;
+  bounding_set.ptrTmmbrSet[idx] = 32768;  // bits per second
+  bounding_set.ptrSsrcSet[idx] = kSourceSsrc;
+  bounding_set.lengthOfSet++;
+
+  EXPECT_EQ(0, rtcp_sender_->SetTMMBN(&bounding_set, 3));
+  ASSERT_EQ(0U, test_transport_->rtcp_packet_info_.rtcpPacketTypeFlags);
+  EXPECT_EQ(0, rtcp_sender_->SendRTCP(kRtcpSr));
+  // We now expect the packet to show up in the rtcp_packet_info_ of
+  // test_transport_.
+  ASSERT_NE(0U, test_transport_->rtcp_packet_info_.rtcpPacketTypeFlags);
+  EXPECT_TRUE(gotPacketType(kRtcpTmmbn));
+  TMMBRSet incoming_set;
+  bool owner = false;
+  // We expect 1 member of the incoming set.
+  EXPECT_EQ(1, test_transport_->rtcp_receiver_->BoundingSet(owner,
+      &incoming_set));
+  EXPECT_EQ(kSourceSsrc, incoming_set.ptrSsrcSet[0]);
 }
 }  // namespace webrtc