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

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

Issue 1782053002: Relanding https://codereview.webrtc.org/1715883002/ in pieces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 9 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
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/dtmf_inband.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 uint32_t ChannelProxy::GetDelayEstimate() const { 141 uint32_t ChannelProxy::GetDelayEstimate() const {
142 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 142 RTC_DCHECK(thread_checker_.CalledOnValidThread());
143 return channel()->GetDelayEstimate(); 143 return channel()->GetDelayEstimate();
144 } 144 }
145 145
146 bool ChannelProxy::SetSendTelephoneEventPayloadType(int payload_type) { 146 bool ChannelProxy::SetSendTelephoneEventPayloadType(int payload_type) {
147 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 147 RTC_DCHECK(thread_checker_.CalledOnValidThread());
148 return channel()->SetSendTelephoneEventPayloadType(payload_type) == 0; 148 return channel()->SetSendTelephoneEventPayloadType(payload_type) == 0;
149 } 149 }
150 150
151 bool ChannelProxy::SendTelephoneEventOutband(uint8_t event, 151 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) {
152 uint32_t duration_ms) {
153 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 152 RTC_DCHECK(thread_checker_.CalledOnValidThread());
154 return 153 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0;
155 channel()->SendTelephoneEventOutband(event, duration_ms, 10, false) == 0;
156 } 154 }
157 155
158 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) { 156 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
159 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 157 RTC_DCHECK(thread_checker_.CalledOnValidThread());
160 channel()->SetSink(std::move(sink)); 158 channel()->SetSink(std::move(sink));
161 } 159 }
162 160
163 Channel* ChannelProxy::channel() const { 161 Channel* ChannelProxy::channel() const {
164 RTC_DCHECK(channel_owner_.channel()); 162 RTC_DCHECK(channel_owner_.channel());
165 return channel_owner_.channel(); 163 return channel_owner_.channel();
166 } 164 }
167 165
168 } // namespace voe 166 } // namespace voe
169 } // namespace webrtc 167 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/dtmf_inband.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698