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

Side by Side Diff: webrtc/modules/audio_coding/main/test/utility.h

Issue 1353763002: Remove ACM AudioCodingFeedback callback object and derived classes (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@acm-remove-dtmf-api
Patch Set: Fix an error introduced in first 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 double _sum; 108 double _sum;
109 double _sumSqr; 109 double _sumSqr;
110 }; 110 };
111 111
112 int16_t ChooseCodec(CodecInst& codecInst); 112 int16_t ChooseCodec(CodecInst& codecInst);
113 113
114 void PrintCodecs(); 114 void PrintCodecs();
115 115
116 bool FixedPayloadTypeCodec(const char* payloadName); 116 bool FixedPayloadTypeCodec(const char* payloadName);
117 117
118 class DTMFDetector : public AudioCodingFeedback {
119 public:
120 DTMFDetector();
121 ~DTMFDetector();
122 // used for inband DTMF detection
123 int32_t IncomingDtmf(const uint8_t digitDtmf, const bool toneEnded);
124 void PrintDetectedDigits();
125
126 private:
127 uint32_t _toneCntr[1000];
128
129 };
130
131 class VADCallback : public ACMVADCallback { 118 class VADCallback : public ACMVADCallback {
132 public: 119 public:
133 VADCallback(); 120 VADCallback();
134 ~VADCallback() { 121 ~VADCallback() {
135 } 122 }
136 123
137 int32_t InFrameType(FrameType frame_type); 124 int32_t InFrameType(FrameType frame_type);
138 125
139 void PrintFrameTypes(); 126 void PrintFrameTypes();
140 void Reset(); 127 void Reset();
141 128
142 private: 129 private:
143 uint32_t _numFrameTypes[5]; 130 uint32_t _numFrameTypes[5];
144 }; 131 };
145 132
146 void UseLegacyAcm(webrtc::Config* config); 133 void UseLegacyAcm(webrtc::Config* config);
147 134
148 void UseNewAcm(webrtc::Config* config); 135 void UseNewAcm(webrtc::Config* config);
149 136
150 } // namespace webrtc 137 } // namespace webrtc
151 138
152 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_UTILITY_H_ 139 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_UTILITY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc ('k') | webrtc/modules/audio_coding/main/test/utility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698