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

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

Issue 2294263002: Fix style guide issues in audio mixer. (Closed)
Patch Set: Rebase. Created 4 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 10 matching lines...) Expand all
21 class MixerAudioSource; 21 class MixerAudioSource;
22 22
23 class AudioMixer { 23 class AudioMixer {
24 public: 24 public:
25 static const int kMaximumAmountOfMixedAudioSources = 3; 25 static const int kMaximumAmountOfMixedAudioSources = 3;
26 enum Frequency { 26 enum Frequency {
27 kNbInHz = 8000, 27 kNbInHz = 8000,
28 kWbInHz = 16000, 28 kWbInHz = 16000,
29 kSwbInHz = 32000, 29 kSwbInHz = 32000,
30 kFbInHz = 48000, 30 kFbInHz = 48000,
31 kLowestPossible = -1,
32 kDefaultFrequency = kWbInHz 31 kDefaultFrequency = kWbInHz
33 }; 32 };
34 33
35 // Factory method. Constructor disabled. 34 // Factory method. Constructor disabled.
36 static std::unique_ptr<AudioMixer> Create(int id); 35 static std::unique_ptr<AudioMixer> Create(int id);
37 virtual ~AudioMixer() {} 36 virtual ~AudioMixer() {}
38 37
39 // Add/remove audio sources as candidates for mixing. 38 // Add/remove audio sources as candidates for mixing.
40 virtual int32_t SetMixabilityStatus(MixerAudioSource* audio_source, 39 virtual int32_t SetMixabilityStatus(MixerAudioSource* audio_source,
41 bool mixable) = 0; 40 bool mixable) = 0;
(...skipping 21 matching lines...) Expand all
63 62
64 // Output level functions for VoEVolumeControl. Return value 63 // Output level functions for VoEVolumeControl. Return value
65 // between 0 and 9 is returned by voe::AudioLevel. 64 // between 0 and 9 is returned by voe::AudioLevel.
66 virtual int GetOutputAudioLevel() = 0; 65 virtual int GetOutputAudioLevel() = 0;
67 66
68 // Return value between 0 and 0x7fff is returned by voe::AudioLevel. 67 // Return value between 0 and 0x7fff is returned by voe::AudioLevel.
69 virtual int GetOutputAudioLevelFullRange() = 0; 68 virtual int GetOutputAudioLevelFullRange() = 0;
70 69
71 protected: 70 protected:
72 AudioMixer() {} 71 AudioMixer() {}
72
73 private:
74 RTC_DISALLOW_COPY_AND_ASSIGN(AudioMixer);
73 }; 75 };
74 } // namespace webrtc 76 } // namespace webrtc
75 77
76 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ 78 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698