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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h

Issue 1356543003: ACM: Remove functions related to DTMF (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 12 matching lines...) Expand all
23 #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h" 23 #include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
24 #include "webrtc/modules/audio_coding/main/acm2/codec_manager.h" 24 #include "webrtc/modules/audio_coding/main/acm2/codec_manager.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class CriticalSectionWrapper; 28 class CriticalSectionWrapper;
29 class AudioCodingImpl; 29 class AudioCodingImpl;
30 30
31 namespace acm2 { 31 namespace acm2 {
32 32
33 class ACMDTMFDetection;
34
35 class AudioCodingModuleImpl final : public AudioCodingModule { 33 class AudioCodingModuleImpl final : public AudioCodingModule {
36 public: 34 public:
37 friend webrtc::AudioCodingImpl; 35 friend webrtc::AudioCodingImpl;
38 36
39 explicit AudioCodingModuleImpl(const AudioCodingModule::Config& config); 37 explicit AudioCodingModuleImpl(const AudioCodingModule::Config& config);
40 ~AudioCodingModuleImpl() override; 38 ~AudioCodingModuleImpl() override;
41 39
42 ///////////////////////////////////////// 40 /////////////////////////////////////////
43 // Sender 41 // Sender
44 // 42 //
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // Maximum playout delay. 147 // Maximum playout delay.
150 int SetMaximumPlayoutDelay(int time_ms) override; 148 int SetMaximumPlayoutDelay(int time_ms) override;
151 149
152 // Smallest latency NetEq will maintain. 150 // Smallest latency NetEq will maintain.
153 int LeastRequiredDelayMs() const override; 151 int LeastRequiredDelayMs() const override;
154 152
155 // Impose an initial delay on playout. ACM plays silence until |delay_ms| 153 // Impose an initial delay on playout. ACM plays silence until |delay_ms|
156 // audio is accumulated in NetEq buffer, then starts decoding payloads. 154 // audio is accumulated in NetEq buffer, then starts decoding payloads.
157 int SetInitialPlayoutDelay(int delay_ms) override; 155 int SetInitialPlayoutDelay(int delay_ms) override;
158 156
159 // TODO(turajs): DTMF playout is always activated in NetEq these APIs should
160 // be removed, as well as all VoE related APIs and methods.
161 //
162 // Configure Dtmf playout status i.e on/off playout the incoming outband Dtmf
163 // tone.
164 int SetDtmfPlayoutStatus(bool enable) override;
165
166 // Get Dtmf playout status.
167 bool DtmfPlayoutStatus() const override;
168
169 // Set playout mode voice, fax. 157 // Set playout mode voice, fax.
170 int SetPlayoutMode(AudioPlayoutMode mode) override; 158 int SetPlayoutMode(AudioPlayoutMode mode) override;
171 159
172 // Get playout mode voice, fax. 160 // Get playout mode voice, fax.
173 AudioPlayoutMode PlayoutMode() const override; 161 AudioPlayoutMode PlayoutMode() const override;
174 162
175 // Get playout timestamp. 163 // Get playout timestamp.
176 int PlayoutTimestamp(uint32_t* timestamp) override; 164 int PlayoutTimestamp(uint32_t* timestamp) override;
177 165
178 // Get 10 milliseconds of raw audio data to play out, and 166 // Get 10 milliseconds of raw audio data to play out, and
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 int playout_frequency_hz_; 357 int playout_frequency_hz_;
370 // TODO(henrik.lundin): All members below this line are temporary and should 358 // TODO(henrik.lundin): All members below this line are temporary and should
371 // be removed after refactoring is completed. 359 // be removed after refactoring is completed.
372 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; 360 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_;
373 CodecInst current_send_codec_; 361 CodecInst current_send_codec_;
374 }; 362 };
375 363
376 } // namespace webrtc 364 } // namespace webrtc
377 365
378 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 366 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698