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

Side by Side Diff: webrtc/voice_engine/output_mixer.h

Issue 1234463003: Integrate Intelligibility with APM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix Mac Error (3) Created 5 years, 4 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // For file recording 95 // For file recording
96 void PlayNotification(int32_t id, uint32_t durationMs); 96 void PlayNotification(int32_t id, uint32_t durationMs);
97 97
98 void RecordNotification(int32_t id, uint32_t durationMs); 98 void RecordNotification(int32_t id, uint32_t durationMs);
99 99
100 void PlayFileEnded(int32_t id); 100 void PlayFileEnded(int32_t id);
101 void RecordFileEnded(int32_t id); 101 void RecordFileEnded(int32_t id);
102 102
103 private: 103 private:
104 OutputMixer(uint32_t instanceId); 104 OutputMixer(uint32_t instanceId);
105 void APMAnalyzeReverseStream(); 105 void APMProcessReverseStream();
106 int InsertInbandDtmfTone(); 106 int InsertInbandDtmfTone();
107 107
108 // uses 108 // uses
109 Statistics* _engineStatisticsPtr; 109 Statistics* _engineStatisticsPtr;
110 AudioProcessing* _audioProcessingModulePtr; 110 AudioProcessing* _audioProcessingModulePtr;
111 111
112 // owns 112 // owns
113 CriticalSectionWrapper& _callbackCritSect; 113 CriticalSectionWrapper& _callbackCritSect;
114 // protect the _outputFileRecorderPtr and _outputFileRecording 114 // protect the _outputFileRecorderPtr and _outputFileRecording
115 CriticalSectionWrapper& _fileCritSect; 115 CriticalSectionWrapper& _fileCritSect;
(...skipping 13 matching lines...) Expand all
129 int _mixingFrequencyHz; 129 int _mixingFrequencyHz;
130 FileRecorder* _outputFileRecorderPtr; 130 FileRecorder* _outputFileRecorderPtr;
131 bool _outputFileRecording; 131 bool _outputFileRecording;
132 }; 132 };
133 133
134 } // namespace voe 134 } // namespace voe
135 135
136 } // namespace werbtc 136 } // namespace werbtc
137 137
138 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ 138 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/test/audioproc_float.cc ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698