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

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

Issue 1479023002: Prepare the AudioSendStream to be hooked up to send-side BWE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments addressed. Created 5 years 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) 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 int error = channel()->SetReceiveAbsoluteSenderTimeStatus(enable, id); 57 int error = channel()->SetReceiveAbsoluteSenderTimeStatus(enable, id);
58 RTC_DCHECK_EQ(0, error); 58 RTC_DCHECK_EQ(0, error);
59 } 59 }
60 60
61 void ChannelProxy::SetReceiveAudioLevelIndicationStatus(bool enable, int id) { 61 void ChannelProxy::SetReceiveAudioLevelIndicationStatus(bool enable, int id) {
62 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 62 RTC_DCHECK(thread_checker_.CalledOnValidThread());
63 int error = channel()->SetReceiveAudioLevelIndicationStatus(enable, id); 63 int error = channel()->SetReceiveAudioLevelIndicationStatus(enable, id);
64 RTC_DCHECK_EQ(0, error); 64 RTC_DCHECK_EQ(0, error);
65 } 65 }
66 66
67 void ChannelProxy::SetSendTransportSequenceNumber(int id) {
the sun 2015/12/01 10:25:36 soo nit: but can you please move me with the other
stefan-webrtc 2015/12/01 16:19:33 Done.
68 RTC_DCHECK(channel_owner_.channel());
the sun 2015/12/01 10:25:36 no need for this DCHECK; already done in channel()
stefan-webrtc 2015/12/01 16:19:33 Done.
69 channel()->SetSendTransportSequenceNumber(id);
70 }
71
72 void ChannelProxy::SetCongestionControlObjects(
73 RtpPacketSender* rtp_packet_sender,
74 TransportFeedbackObserver* transport_feedback_observer,
75 PacketRouter* packet_router) {
76 RTC_DCHECK(channel_owner_.channel());
77 channel()->SetCongestionControlObjects(
78 rtp_packet_sender, transport_feedback_observer, packet_router);
79 }
80
67 CallStatistics ChannelProxy::GetRTCPStatistics() const { 81 CallStatistics ChannelProxy::GetRTCPStatistics() const {
68 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 82 RTC_DCHECK(thread_checker_.CalledOnValidThread());
69 CallStatistics stats = {0}; 83 CallStatistics stats = {0};
70 int error = channel()->GetRTPStatistics(stats); 84 int error = channel()->GetRTPStatistics(stats);
71 RTC_DCHECK_EQ(0, error); 85 RTC_DCHECK_EQ(0, error);
72 return stats; 86 return stats;
73 } 87 }
74 88
75 std::vector<ReportBlock> ChannelProxy::GetRemoteRTCPReportBlocks() const { 89 std::vector<ReportBlock> ChannelProxy::GetRemoteRTCPReportBlocks() const {
76 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 90 RTC_DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 28 matching lines...) Expand all
105 119
106 uint32_t ChannelProxy::GetDelayEstimate() const { 120 uint32_t ChannelProxy::GetDelayEstimate() const {
107 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 121 RTC_DCHECK(thread_checker_.CalledOnValidThread());
108 return channel()->GetDelayEstimate(); 122 return channel()->GetDelayEstimate();
109 } 123 }
110 124
111 Channel* ChannelProxy::channel() const { 125 Channel* ChannelProxy::channel() const {
112 RTC_DCHECK(channel_owner_.channel()); 126 RTC_DCHECK(channel_owner_.channel());
113 return channel_owner_.channel(); 127 return channel_owner_.channel();
114 } 128 }
129
115 } // namespace voe 130 } // namespace voe
116 } // namespace webrtc 131 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698