| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2015 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 68 } | 68 } | 
| 69 | 69 | 
| 70 void ChannelProxy::EnableReceiveTransportSequenceNumber(int id) { | 70 void ChannelProxy::EnableReceiveTransportSequenceNumber(int id) { | 
| 71   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 71   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 
| 72   channel()->EnableReceiveTransportSequenceNumber(id); | 72   channel()->EnableReceiveTransportSequenceNumber(id); | 
| 73 } | 73 } | 
| 74 | 74 | 
| 75 void ChannelProxy::RegisterSenderCongestionControlObjects( | 75 void ChannelProxy::RegisterSenderCongestionControlObjects( | 
| 76     RtpPacketSender* rtp_packet_sender, | 76     RtpPacketSender* rtp_packet_sender, | 
| 77     TransportFeedbackObserver* transport_feedback_observer, | 77     TransportFeedbackObserver* transport_feedback_observer, | 
| 78     PacketRouter* packet_router) { | 78     PacketRouter* packet_router, | 
|  | 79     RtcpBandwidthObserver* bandwidth_observer) { | 
| 79   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 80   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 
| 80   channel()->RegisterSenderCongestionControlObjects( | 81   channel()->RegisterSenderCongestionControlObjects( | 
| 81       rtp_packet_sender, transport_feedback_observer, packet_router); | 82       rtp_packet_sender, transport_feedback_observer, packet_router, | 
|  | 83       bandwidth_observer); | 
| 82 } | 84 } | 
| 83 | 85 | 
| 84 void ChannelProxy::RegisterReceiverCongestionControlObjects( | 86 void ChannelProxy::RegisterReceiverCongestionControlObjects( | 
| 85     PacketRouter* packet_router) { | 87     PacketRouter* packet_router) { | 
| 86   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 88   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 
| 87   channel()->RegisterReceiverCongestionControlObjects(packet_router); | 89   channel()->RegisterReceiverCongestionControlObjects(packet_router); | 
| 88 } | 90 } | 
| 89 | 91 | 
| 90 void ChannelProxy::ResetCongestionControlObjects() { | 92 void ChannelProxy::ResetCongestionControlObjects() { | 
| 91   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 93   RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 365   return channel()->SetSendCNPayloadType(type, frequency) == 0; | 367   return channel()->SetSendCNPayloadType(type, frequency) == 0; | 
| 366 } | 368 } | 
| 367 | 369 | 
| 368 Channel* ChannelProxy::channel() const { | 370 Channel* ChannelProxy::channel() const { | 
| 369   RTC_DCHECK(channel_owner_.channel()); | 371   RTC_DCHECK(channel_owner_.channel()); | 
| 370   return channel_owner_.channel(); | 372   return channel_owner_.channel(); | 
| 371 } | 373 } | 
| 372 | 374 | 
| 373 }  // namespace voe | 375 }  // namespace voe | 
| 374 }  // namespace webrtc | 376 }  // namespace webrtc | 
| OLD | NEW | 
|---|