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

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

Issue 1702043002: Remove video-codec max bitrate from TMMBN. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months 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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 CriticalSectionScoped lock(critical_section_rtcp_sender_.get()); 1008 CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
1009 xr_send_receiver_reference_time_enabled_ = enable; 1009 xr_send_receiver_reference_time_enabled_ = enable;
1010 } 1010 }
1011 1011
1012 bool RTCPSender::RtcpXrReceiverReferenceTime() const { 1012 bool RTCPSender::RtcpXrReceiverReferenceTime() const {
1013 CriticalSectionScoped lock(critical_section_rtcp_sender_.get()); 1013 CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
1014 return xr_send_receiver_reference_time_enabled_; 1014 return xr_send_receiver_reference_time_enabled_;
1015 } 1015 }
1016 1016
1017 // no callbacks allowed inside this function 1017 // no callbacks allowed inside this function
1018 int32_t RTCPSender::SetTMMBN(const TMMBRSet* boundingSet, 1018 int32_t RTCPSender::SetTMMBN(const TMMBRSet* boundingSet) {
1019 uint32_t maxBitrateKbit) {
1020 CriticalSectionScoped lock(critical_section_rtcp_sender_.get()); 1019 CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
1021 1020
1022 if (0 == tmmbr_help_.SetTMMBRBoundingSetToSend(boundingSet, maxBitrateKbit)) { 1021 if (0 == tmmbr_help_.SetTMMBRBoundingSetToSend(boundingSet)) {
1023 SetFlag(kRtcpTmmbn, true); 1022 SetFlag(kRtcpTmmbn, true);
1024 return 0; 1023 return 0;
1025 } 1024 }
1026 return -1; 1025 return -1;
1027 } 1026 }
1028 1027
1029 void RTCPSender::SetFlag(RTCPPacketType type, bool is_volatile) { 1028 void RTCPSender::SetFlag(RTCPPacketType type, bool is_volatile) {
1030 report_flags_.insert(ReportFlag(type, is_volatile)); 1029 report_flags_.insert(ReportFlag(type, is_volatile));
1031 } 1030 }
1032 1031
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 // RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Sender); 1080 // RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Sender);
1082 // but we can't because of an incorrect warning (C4822) in MVS 2013. 1081 // but we can't because of an incorrect warning (C4822) in MVS 2013.
1083 } sender(transport_, event_log_); 1082 } sender(transport_, event_log_);
1084 1083
1085 uint8_t buffer[IP_PACKET_SIZE]; 1084 uint8_t buffer[IP_PACKET_SIZE];
1086 return packet.BuildExternalBuffer(buffer, IP_PACKET_SIZE, &sender) && 1085 return packet.BuildExternalBuffer(buffer, IP_PACKET_SIZE, &sender) &&
1087 !sender.send_failure_; 1086 !sender.send_failure_;
1088 } 1087 }
1089 1088
1090 } // namespace webrtc 1089 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_sender.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698