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

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

Issue 2230823004: Added a level indicator to new mixer. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer_gn_fixes
Patch Set: Updated comments in volume test. Created 4 years, 4 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
Index: webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
diff --git a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
index 3933350fed0a593af4425d1b898e32765753bb74..e3075892f9a8f81822a8447d9e2b397adfde9632 100644
--- a/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
+++ b/webrtc/modules/audio_mixer/new_audio_conference_mixer_impl.h
@@ -20,6 +20,7 @@
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_mixer/new_audio_conference_mixer.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/voice_engine/level_indicator.h"
namespace webrtc {
class AudioProcessing;
@@ -125,6 +126,11 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
bool LimitMixedAudio(AudioFrame* mixedAudio) const;
+ // Output level functions from VoEVolumeControl
minyue-webrtc 2016/08/11 10:27:33 comment is a bit misleading, revise the wording.
aleloi 2016/08/11 12:15:19 Done.
+ uint32_t GetSpeechOutputLevel() override;
minyue-webrtc 2016/08/11 10:27:33 why does this have to be "speech"?
aleloi 2016/08/11 12:15:19 Historical reasons, I'd say. The function name in
+
+ uint32_t GetSpeechOutputLevelFullRange() override;
+
std::unique_ptr<CriticalSectionWrapper> crit_;
std::unique_ptr<CriticalSectionWrapper> cb_crit_;
@@ -152,6 +158,9 @@ class NewAudioConferenceMixerImpl : public NewAudioConferenceMixer {
// Used for inhibiting saturation in mixing.
std::unique_ptr<AudioProcessing> limiter_;
+
+ // measures audio level for the combined signal
+ voe::AudioLevel audio_level_;
aleloi 2016/08/11 12:15:19 Will add capitalization and sentence break (sorry,
};
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698