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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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/api/audio/audio_mixer.h"
18 #include "webrtc/base/scoped_ref_ptr.h"
19 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/base/race_checker.h"
18 #include "webrtc/modules/audio_mixer/frame_combiner.h" 21 #include "webrtc/modules/audio_mixer/frame_combiner.h"
19 #include "webrtc/modules/audio_mixer/output_rate_calculator.h" 22 #include "webrtc/modules/audio_mixer/output_rate_calculator.h"
20 #include "webrtc/modules/audio_processing/include/audio_processing.h" 23 #include "webrtc/modules/audio_processing/include/audio_processing.h"
21 #include "webrtc/modules/include/module_common_types.h" 24 #include "webrtc/modules/include/module_common_types.h"
22 #include "webrtc/rtc_base/race_checker.h"
23 #include "webrtc/rtc_base/scoped_ref_ptr.h"
24 #include "webrtc/rtc_base/thread_annotations.h"
25 #include "webrtc/typedefs.h" 25 #include "webrtc/typedefs.h"
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 typedef std::vector<AudioFrame*> AudioFrameList; 29 typedef std::vector<AudioFrame*> AudioFrameList;
30 30
31 class AudioMixerImpl : public AudioMixer { 31 class AudioMixerImpl : public AudioMixer {
32 public: 32 public:
33 struct SourceStatus { 33 struct SourceStatus {
34 SourceStatus(Source* audio_source, bool is_mixed, float gain) 34 SourceStatus(Source* audio_source, bool is_mixed, float gain)
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 SourceStatusList audio_source_list_ GUARDED_BY(crit_); // May be mixed. 104 SourceStatusList audio_source_list_ GUARDED_BY(crit_); // May be mixed.
105 105
106 // Component that handles actual adding of audio frames. 106 // Component that handles actual adding of audio frames.
107 FrameCombiner frame_combiner_ GUARDED_BY(race_checker_); 107 FrameCombiner frame_combiner_ GUARDED_BY(race_checker_);
108 108
109 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl); 109 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixerImpl);
110 }; 110 };
111 } // namespace webrtc 111 } // namespace webrtc
112 112
113 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_ 113 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_mixer/audio_frame_manipulator.cc ('k') | webrtc/modules/audio_mixer/audio_mixer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698