| Index: webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
|
| index da43204b0938b420898bc937810a9adaf9fd94f5..5ca01142fa882886138372348d6b69c940eed034 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
|
| @@ -70,7 +70,6 @@ TMMBRHelp::TMMBRHelp()
|
| : _criticalSection(CriticalSectionWrapper::CreateCriticalSection()),
|
| _candidateSet(),
|
| _boundingSet(),
|
| - _boundingSetToSend(),
|
| _ptrIntersectionBoundingSet(NULL),
|
| _ptrMaxPRBoundingSet(NULL) {
|
| }
|
| @@ -107,39 +106,6 @@ TMMBRSet* TMMBRHelp::BoundingSet() {
|
| return &_boundingSet;
|
| }
|
|
|
| -int32_t
|
| -TMMBRHelp::SetTMMBRBoundingSetToSend(const TMMBRSet* boundingSetToSend)
|
| -{
|
| - CriticalSectionScoped lock(_criticalSection);
|
| -
|
| - if (boundingSetToSend == NULL)
|
| - {
|
| - _boundingSetToSend.clearSet();
|
| - return 0;
|
| - }
|
| -
|
| - VerifyAndAllocateBoundingSetToSend(boundingSetToSend->lengthOfSet());
|
| - _boundingSetToSend.clearSet();
|
| - for (uint32_t i = 0; i < boundingSetToSend->lengthOfSet(); i++)
|
| - {
|
| - // cap at our configured max bitrate
|
| - uint32_t bitrate = boundingSetToSend->Tmmbr(i);
|
| - _boundingSetToSend.SetEntry(i, bitrate,
|
| - boundingSetToSend->PacketOH(i),
|
| - boundingSetToSend->Ssrc(i));
|
| - }
|
| - return 0;
|
| -}
|
| -
|
| -int32_t
|
| -TMMBRHelp::VerifyAndAllocateBoundingSetToSend(uint32_t minimumSize)
|
| -{
|
| - CriticalSectionScoped lock(_criticalSection);
|
| -
|
| - _boundingSetToSend.VerifyAndAllocateSet(minimumSize);
|
| - return 0;
|
| -}
|
| -
|
| TMMBRSet*
|
| TMMBRHelp::VerifyAndAllocateCandidateSet(uint32_t minimumSize)
|
| {
|
| @@ -155,12 +121,6 @@ TMMBRHelp::CandidateSet()
|
| return &_candidateSet;
|
| }
|
|
|
| -TMMBRSet*
|
| -TMMBRHelp::BoundingSetToSend()
|
| -{
|
| - return &_boundingSetToSend;
|
| -}
|
| -
|
| int32_t
|
| TMMBRHelp::FindTMMBRBoundingSet(TMMBRSet*& boundingSet)
|
| {
|
|
|