| Index: webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| index a66c686d0e25e93c341b670f9f692991bb8f853d..7762e66bf28f7c23e5da2fb9461a007d297c1f8e 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
|
| @@ -982,14 +982,9 @@ bool RTCPSender::RtcpXrReceiverReferenceTime() const {
|
| return xr_send_receiver_reference_time_enabled_;
|
| }
|
|
|
| -// no callbacks allowed inside this function
|
| -void RTCPSender::SetTMMBN(const std::vector<rtcp::TmmbItem>* bounding_set) {
|
| +void RTCPSender::SetTmmbn(std::vector<rtcp::TmmbItem> bounding_set) {
|
| rtc::CritScope lock(&critical_section_rtcp_sender_);
|
| - if (bounding_set) {
|
| - tmmbn_to_send_ = *bounding_set;
|
| - } else {
|
| - tmmbn_to_send_.clear();
|
| - }
|
| + tmmbn_to_send_ = std::move(bounding_set);
|
| SetFlag(kRtcpTmmbn, true);
|
| }
|
|
|
|
|