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

Unified Diff: webrtc/modules/audio_mixer/audio_mixer_impl.h

Issue 2302483002: Style changes in Audio Mixer (Closed)
Patch Set: Rebase. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer_defines.cc ('k') | webrtc/modules/audio_mixer/audio_mixer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_mixer/audio_mixer_impl.h
diff --git a/webrtc/modules/audio_mixer/audio_mixer_impl.h b/webrtc/modules/audio_mixer/audio_mixer_impl.h
index dc4d931d702f4fbf61852b3bfe4e2b6cf0f39693..ecfcbfa621d1d2213c719a23cc1331d90237c0b8 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_impl.h
+++ b/webrtc/modules/audio_mixer/audio_mixer_impl.h
@@ -15,41 +15,21 @@
#include <memory>
#include <vector>
+#include "webrtc/base/thread_annotations.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_mixer/audio_mixer.h"
+#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/voice_engine/level_indicator.h"
namespace webrtc {
-class AudioProcessing;
-class CriticalSectionWrapper;
typedef std::vector<AudioFrame*> AudioFrameList;
typedef std::vector<MixerAudioSource*> MixerAudioSourceList;
-// Cheshire cat implementation of MixerAudioSource's non virtual functions.
-class NewMixHistory {
- public:
- NewMixHistory();
- ~NewMixHistory();
-
- // Returns true if the audio source is being mixed.
- bool IsMixed() const;
-
- // Returns true if the audio source was mixed previous mix
- // iteration.
- bool WasMixed() const;
-
- // Updates the mixed status.
- int32_t SetIsMixed(bool mixed);
-
- void ResetMixedStatus();
-
- private:
- bool is_mixed_;
-};
-
class AudioMixerImpl : public AudioMixer {
public:
// AudioProcessing only accepts 10 ms frames.
@@ -99,12 +79,6 @@ class AudioMixerImpl : public AudioMixer {
bool RemoveAudioSourceFromList(MixerAudioSource* remove_audio_source,
MixerAudioSourceList* audio_source_list) const;
- // Mix the AudioFrames stored in audioFrameList into mixed_audio.
- static int32_t MixFromList(AudioFrame* mixed_audio,
- const AudioFrameList& audio_frame_list,
- int32_t id,
- bool use_limiter);
-
bool LimitMixedAudio(AudioFrame* mixed_audio) const;
// Output level functions for VoEVolumeControl.
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer_defines.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