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

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

Issue 2392883002: Multi frequency DTMF support - sender side (Closed)
Patch Set: rebase Created 4 years, 1 month 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 int error = channel()->GetSpeechOutputLevelFullRange(level); 129 int error = channel()->GetSpeechOutputLevelFullRange(level);
130 RTC_DCHECK_EQ(0, error); 130 RTC_DCHECK_EQ(0, error);
131 return static_cast<int32_t>(level); 131 return static_cast<int32_t>(level);
132 } 132 }
133 133
134 uint32_t ChannelProxy::GetDelayEstimate() const { 134 uint32_t ChannelProxy::GetDelayEstimate() const {
135 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 135 RTC_DCHECK(thread_checker_.CalledOnValidThread());
136 return channel()->GetDelayEstimate(); 136 return channel()->GetDelayEstimate();
137 } 137 }
138 138
139 bool ChannelProxy::SetSendTelephoneEventPayloadType(int payload_type) { 139 bool ChannelProxy::SetSendTelephoneEventPayloadType(int payload_type,
140 int payload_frequency) {
140 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 141 RTC_DCHECK(thread_checker_.CalledOnValidThread());
141 return channel()->SetSendTelephoneEventPayloadType(payload_type) == 0; 142 return channel()->SetSendTelephoneEventPayloadType(payload_type,
143 payload_frequency) == 0;
142 } 144 }
143 145
144 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { 146 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) {
145 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 147 RTC_DCHECK(thread_checker_.CalledOnValidThread());
146 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; 148 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0;
147 } 149 }
148 150
149 void ChannelProxy::SetBitrate(int bitrate_bps) { 151 void ChannelProxy::SetBitrate(int bitrate_bps) {
150 // May be called on different threads and needs to be handled by the channel. 152 // May be called on different threads and needs to be handled by the channel.
151 channel()->SetBitRate(bitrate_bps); 153 channel()->SetBitRate(bitrate_bps);
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 channel()->set_associate_send_channel(ChannelOwner(nullptr)); 249 channel()->set_associate_send_channel(ChannelOwner(nullptr));
248 } 250 }
249 251
250 Channel* ChannelProxy::channel() const { 252 Channel* ChannelProxy::channel() const {
251 RTC_DCHECK(channel_owner_.channel()); 253 RTC_DCHECK(channel_owner_.channel());
252 return channel_owner_.channel(); 254 return channel_owner_.channel();
253 } 255 }
254 256
255 } // namespace voe 257 } // namespace voe
256 } // namespace webrtc 258 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698