Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

Issue 1513303003: [rtp_rtcp] fixed lint errors in rtp_rtcp module that are not fixed in other CLs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 receiveInfoIt++; 739 receiveInfoIt++;
740 delete receiveInfoItemToBeErased->second; 740 delete receiveInfoItemToBeErased->second;
741 _receivedInfoMap.erase(receiveInfoItemToBeErased); 741 _receivedInfoMap.erase(receiveInfoItemToBeErased);
742 } else { 742 } else {
743 receiveInfoIt++; 743 receiveInfoIt++;
744 } 744 }
745 } 745 }
746 return updateBoundingSet; 746 return updateBoundingSet;
747 } 747 }
748 748
749 int32_t RTCPReceiver::BoundingSet(bool &tmmbrOwner, TMMBRSet* boundingSetRec) { 749 int32_t RTCPReceiver::BoundingSet(bool* tmmbrOwner, TMMBRSet* boundingSetRec) {
750 CriticalSectionScoped lock(_criticalSectionRTCPReceiver); 750 CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
751 751
752 std::map<uint32_t, RTCPReceiveInformation*>::iterator receiveInfoIt = 752 std::map<uint32_t, RTCPReceiveInformation*>::iterator receiveInfoIt =
753 _receivedInfoMap.find(_remoteSSRC); 753 _receivedInfoMap.find(_remoteSSRC);
754 754
755 if (receiveInfoIt == _receivedInfoMap.end()) { 755 if (receiveInfoIt == _receivedInfoMap.end()) {
756 return -1; 756 return -1;
757 } 757 }
758 RTCPReceiveInformation* receiveInfo = receiveInfoIt->second; 758 RTCPReceiveInformation* receiveInfo = receiveInfoIt->second;
759 if (receiveInfo == NULL) { 759 if (receiveInfo == NULL) {
760 return -1; 760 return -1;
761 } 761 }
762 if (receiveInfo->TmmbnBoundingSet.lengthOfSet() > 0) { 762 if (receiveInfo->TmmbnBoundingSet.lengthOfSet() > 0) {
763 boundingSetRec->VerifyAndAllocateSet( 763 boundingSetRec->VerifyAndAllocateSet(
764 receiveInfo->TmmbnBoundingSet.lengthOfSet() + 1); 764 receiveInfo->TmmbnBoundingSet.lengthOfSet() + 1);
765 for(uint32_t i=0; i< receiveInfo->TmmbnBoundingSet.lengthOfSet(); 765 for(uint32_t i=0; i< receiveInfo->TmmbnBoundingSet.lengthOfSet();
766 i++) { 766 i++) {
767 if(receiveInfo->TmmbnBoundingSet.Ssrc(i) == main_ssrc_) { 767 if(receiveInfo->TmmbnBoundingSet.Ssrc(i) == main_ssrc_) {
768 // owner of bounding set 768 // owner of bounding set
769 tmmbrOwner = true; 769 *tmmbrOwner = true;
770 } 770 }
771 boundingSetRec->SetEntry(i, 771 boundingSetRec->SetEntry(i,
772 receiveInfo->TmmbnBoundingSet.Tmmbr(i), 772 receiveInfo->TmmbnBoundingSet.Tmmbr(i),
773 receiveInfo->TmmbnBoundingSet.PacketOH(i), 773 receiveInfo->TmmbnBoundingSet.PacketOH(i),
774 receiveInfo->TmmbnBoundingSet.Ssrc(i)); 774 receiveInfo->TmmbnBoundingSet.Ssrc(i));
775 } 775 }
776 } 776 }
777 return receiveInfo->TmmbnBoundingSet.lengthOfSet(); 777 return receiveInfo->TmmbnBoundingSet.lengthOfSet();
778 } 778 }
779 779
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 return -1; 1472 return -1;
1473 } 1473 }
1474 num += receiveInfo->TmmbrSet.lengthOfSet(); 1474 num += receiveInfo->TmmbrSet.lengthOfSet();
1475 receiveInfoIt++; 1475 receiveInfoIt++;
1476 } 1476 }
1477 } 1477 }
1478 return num; 1478 return num;
1479 } 1479 }
1480 1480
1481 } // namespace webrtc 1481 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698