summaryrefslogtreecommitdiff
path: root/chromium/media/audio/agc_audio_stream.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-25 11:39:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-25 15:20:42 +0000
commit6c91641271e536ffaa88a1dff5127e42ee99a91e (patch)
tree703d9dd49602377ddc90cbf886aad37913f2496b /chromium/media/audio/agc_audio_stream.h
parentb145b7fafd36f0c260d6a768c81fc14e32578099 (diff)
downloadqtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/media/audio/agc_audio_stream.h')
-rw-r--r--chromium/media/audio/agc_audio_stream.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/media/audio/agc_audio_stream.h b/chromium/media/audio/agc_audio_stream.h
index b0117e1962c..3fc542189ca 100644
--- a/chromium/media/audio/agc_audio_stream.h
+++ b/chromium/media/audio/agc_audio_stream.h
@@ -6,6 +6,7 @@
#define MEDIA_AUDIO_AGC_AUDIO_STREAM_H_
#include "base/logging.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
@@ -132,6 +133,12 @@ class MEDIA_EXPORT AgcAudioStream : public AudioInterface {
*normalized_volume = normalized_volume_;
}
+ // Gets the current automatic gain control state.
+ bool GetAutomaticGainControl() override {
+ DCHECK(thread_checker_.CalledOnValidThread());
+ return agc_is_enabled_;
+ }
+
private:
// Sets the automatic gain control (AGC) to on or off. When AGC is enabled,
// the microphone volume is queried periodically and the volume level can
@@ -145,12 +152,6 @@ class MEDIA_EXPORT AgcAudioStream : public AudioInterface {
return true;
}
- // Gets the current automatic gain control state.
- bool GetAutomaticGainControl() override {
- DCHECK(thread_checker_.CalledOnValidThread());
- return agc_is_enabled_;
- }
-
// Takes a new microphone volume sample and stores it in |normalized_volume_|.
// Range is normalized to [0.0,1.0] or [0.0, 1.5] on Linux.
// This method is called periodically when AGC is enabled and always on the