| 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 f994ff704932ebc7ddddef5f1abebc4fcf667a66..5c090504ca07fe5b4f9f0bb4838f3ef55238a7f3 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/tmmbr_help.cc
|
| @@ -141,8 +141,7 @@ TMMBRSet* TMMBRHelp::BoundingSet() {
|
| }
|
|
|
| int32_t
|
| -TMMBRHelp::SetTMMBRBoundingSetToSend(const TMMBRSet* boundingSetToSend,
|
| - const uint32_t maxBitrateKbit)
|
| +TMMBRHelp::SetTMMBRBoundingSetToSend(const TMMBRSet* boundingSetToSend)
|
| {
|
| CriticalSectionScoped lock(_criticalSection);
|
|
|
| @@ -158,14 +157,6 @@ TMMBRHelp::SetTMMBRBoundingSetToSend(const TMMBRSet* boundingSetToSend,
|
| {
|
| // cap at our configured max bitrate
|
| uint32_t bitrate = boundingSetToSend->Tmmbr(i);
|
| - if(maxBitrateKbit)
|
| - {
|
| - // do we have a configured max bitrate?
|
| - if(bitrate > maxBitrateKbit)
|
| - {
|
| - bitrate = maxBitrateKbit;
|
| - }
|
| - }
|
| _boundingSetToSend.SetEntry(i, bitrate,
|
| boundingSetToSend->PacketOH(i),
|
| boundingSetToSend->Ssrc(i));
|
|
|