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

Side by Side Diff: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 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) 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
11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL _H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL _H_
12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL _H_ 12 #define WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IMPL _H_
13 13
14 #include <list> 14 #include <list>
15 #include <map> 15 #include <map>
16 16
17 #include "webrtc/base/scoped_ptr.h" 17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/engine_configurations.h" 18 #include "webrtc/engine_configurations.h"
19 #include "webrtc/modules/audio_conference_mixer/interface/audio_conference_mixer .h" 19 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h "
20 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h" 20 #include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"
21 #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h" 21 #include "webrtc/modules/audio_conference_mixer/source/time_scheduler.h"
22 #include "webrtc/modules/interface/module_common_types.h" 22 #include "webrtc/modules/include/module_common_types.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 class AudioProcessing; 25 class AudioProcessing;
26 class CriticalSectionWrapper; 26 class CriticalSectionWrapper;
27 27
28 typedef std::list<AudioFrame*> AudioFrameList; 28 typedef std::list<AudioFrame*> AudioFrameList;
29 typedef std::list<MixerParticipant*> MixerParticipantList; 29 typedef std::list<MixerParticipant*> MixerParticipantList;
30 30
31 // Cheshire cat implementation of MixerParticipant's non virtual functions. 31 // Cheshire cat implementation of MixerParticipant's non virtual functions.
32 class MixHistory 32 class MixHistory
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 // Counter keeping track of concurrent calls to process. 181 // Counter keeping track of concurrent calls to process.
182 // Note: should never be higher than 1 or lower than 0. 182 // Note: should never be higher than 1 or lower than 0.
183 int16_t _processCalls; 183 int16_t _processCalls;
184 184
185 // Used for inhibiting saturation in mixing. 185 // Used for inhibiting saturation in mixing.
186 rtc::scoped_ptr<AudioProcessing> _limiter; 186 rtc::scoped_ptr<AudioProcessing> _limiter;
187 }; 187 };
188 } // namespace webrtc 188 } // namespace webrtc
189 189
190 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM PL_H_ 190 #endif // WEBRTC_MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_AUDIO_CONFERENCE_MIXER_IM PL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698