generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor refactoring: RTCPReceiver::BoundingSet

Browse Source 
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
This commit is contained in:
hta@webrtc.org
2012-04-30 11:23:41 +00:00
parent 890aa0d2c0
commit 65a4e4ed56
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/rtp_rtcp/source/rtcp_receiver.cc
View File

@@ -671,7 +671,7 @@ bool RTCPReceiver::UpdateRTCPReceiveInformationTimers() {
} }
WebRtc_Word32 RTCPReceiver::BoundingSet(bool &tmmbrOwner, WebRtc_Word32 RTCPReceiver::BoundingSet(bool &tmmbrOwner,
TMMBRSet*& boundingSetRec) { TMMBRSet* boundingSetRec) {
CriticalSectionScoped lock(_criticalSectionRTCPReceiver); CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
std::map<WebRtc_UWord32, RTCPReceiveInformation*>::iterator receiveInfoIt = std::map<WebRtc_UWord32, RTCPReceiveInformation*>::iterator receiveInfoIt =

2
src/modules/rtp_rtcp/source/rtcp_receiver.h
View File

@@ -91,7 +91,7 @@ public:
bool UpdateRTCPReceiveInformationTimers(); bool UpdateRTCPReceiveInformationTimers();
WebRtc_Word32 BoundingSet(bool &tmmbrOwner, TMMBRSet*& boundingSetRec); WebRtc_Word32 BoundingSet(bool &tmmbrOwner, TMMBRSet* boundingSetRec);
WebRtc_Word32 UpdateTMMBR(); WebRtc_Word32 UpdateTMMBR();

30
src/modules/rtp_rtcp/source/rtcp_sender_test.cc
View File

@@ -196,10 +196,34 @@ TEST_F(RtcpSenderTest, SendsTmmbnIfSetAndEmpty) {
bool owner = false; bool owner = false;
// The BoundingSet function returns the number of members of the // The BoundingSet function returns the number of members of the
// bounding set, and touches the incoming set only if there's > 1. // 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, EXPECT_EQ(0, test_transport_->rtcp_receiver_->BoundingSet(owner,
incoming_set)); 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 } // namespace webrtc