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

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 1608563005: Enable transport seq num extension on receive channel to suppress log warning. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add test. Created 4 years, 11 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 2905 matching lines...) Expand 10 before | Expand all | Expand 10 after
2916 } 2916 }
2917 return 0; 2917 return 0;
2918 } 2918 }
2919 2919
2920 void Channel::EnableSendTransportSequenceNumber(int id) { 2920 void Channel::EnableSendTransportSequenceNumber(int id) {
2921 int ret = 2921 int ret =
2922 SetSendRtpHeaderExtension(true, kRtpExtensionTransportSequenceNumber, id); 2922 SetSendRtpHeaderExtension(true, kRtpExtensionTransportSequenceNumber, id);
2923 RTC_DCHECK_EQ(0, ret); 2923 RTC_DCHECK_EQ(0, ret);
2924 } 2924 }
2925 2925
2926 void Channel::EnableReceiveTransportSequenceNumber(int id) {
2927 rtp_header_parser_->DeregisterRtpHeaderExtension(
2928 kRtpExtensionTransportSequenceNumber);
2929 bool ret = rtp_header_parser_->RegisterRtpHeaderExtension(
2930 kRtpExtensionTransportSequenceNumber, id);
2931 RTC_DCHECK(ret);
2932 }
2933
2926 void Channel::SetCongestionControlObjects( 2934 void Channel::SetCongestionControlObjects(
2927 RtpPacketSender* rtp_packet_sender, 2935 RtpPacketSender* rtp_packet_sender,
2928 TransportFeedbackObserver* transport_feedback_observer, 2936 TransportFeedbackObserver* transport_feedback_observer,
2929 PacketRouter* packet_router) { 2937 PacketRouter* packet_router) {
2930 RTC_DCHECK(packet_router != nullptr || packet_router_ != nullptr); 2938 RTC_DCHECK(packet_router != nullptr || packet_router_ != nullptr);
2931 if (transport_feedback_observer) { 2939 if (transport_feedback_observer) {
2932 RTC_DCHECK(feedback_observer_proxy_.get()); 2940 RTC_DCHECK(feedback_observer_proxy_.get());
2933 feedback_observer_proxy_->SetTransportFeedbackObserver( 2941 feedback_observer_proxy_->SetTransportFeedbackObserver(
2934 transport_feedback_observer); 2942 transport_feedback_observer);
2935 } 2943 }
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
4109 int64_t min_rtt = 0; 4117 int64_t min_rtt = 0;
4110 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) 4118 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt)
4111 != 0) { 4119 != 0) {
4112 return 0; 4120 return 0;
4113 } 4121 }
4114 return rtt; 4122 return rtt;
4115 } 4123 }
4116 4124
4117 } // namespace voe 4125 } // namespace voe
4118 } // namespace webrtc 4126 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698