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

Side by Side Diff: webrtc/modules/audio_mixer/audio_mixer_impl.h

Issue 2411313003: Split audio mixer into interface and implementation. (Closed)
Patch Set: Capitalize Ssrc Created 4 years, 2 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
11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/audio/audio_mixer.h"
17 #include "webrtc/base/scoped_ref_ptr.h" 18 #include "webrtc/base/scoped_ref_ptr.h"
18 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
19 #include "webrtc/base/thread_checker.h" 20 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/modules/audio_mixer/audio_mixer.h"
21 #include "webrtc/modules/audio_processing/include/audio_processing.h" 21 #include "webrtc/modules/audio_processing/include/audio_processing.h"
22 #include "webrtc/modules/include/module_common_types.h" 22 #include "webrtc/modules/include/module_common_types.h"
23 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 23 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
24 #include "webrtc/voice_engine/level_indicator.h"
25 #include "webrtc/voice_engine_configurations.h" 24 #include "webrtc/voice_engine_configurations.h"
26 25
27 namespace webrtc { 26 namespace webrtc {
28 27
29 typedef std::vector<AudioFrame*> AudioFrameList; 28 typedef std::vector<AudioFrame*> AudioFrameList;
30 29
31 class AudioMixerImpl : public AudioMixer { 30 class AudioMixerImpl : public AudioMixer {
32 public: 31 public:
33 struct SourceStatus { 32 struct SourceStatus {
34 SourceStatus(Source* audio_source, bool is_mixed, float gain) 33 SourceStatus(Source* audio_source, bool is_mixed, float gain)
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 rtc::ThreadChecker thread_checker_; 103 rtc::ThreadChecker thread_checker_;
105 104
106 // Used for inhibiting saturation in mixing. 105 // Used for inhibiting saturation in mixing.
107 std::unique_ptr<AudioProcessing> limiter_ ACCESS_ON(&thread_checker_); 106 std::unique_ptr<AudioProcessing> limiter_ ACCESS_ON(&thread_checker_);
108 107
109 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl); 108 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl);
110 }; 109 };
111 } // namespace webrtc 110 } // namespace webrtc
112 111
113 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ 112 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698