diff options
| author | grunell <grunell@chromium.org> | 2015-12-18 00:51:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-18 08:52:29 +0000 |
| commit | 5f5e8869579b8887f112f664cddff58efab5209e (patch) | |
| tree | a75af951ba6f7ce76466e322560ef3300ea3c7fc /media/audio/cras | |
| parent | 280746cce16d03242f855c4c795a62b7349f38d4 (diff) | |
| download | chromium_src-5f5e8869579b8887f112f664cddff58efab5209e.zip chromium_src-5f5e8869579b8887f112f664cddff58efab5209e.tar.gz chromium_src-5f5e8869579b8887f112f664cddff58efab5209e.tar.bz2 | |
Check if ChromeOS keyboard mic is available directly in GetInputStreamParameters().
Removes a bunch of functions + thread hops at first stream start.
BUG=511113
Review URL: https://codereview.chromium.org/1517233002
Cr-Commit-Position: refs/heads/master@{#366056}
Diffstat (limited to 'media/audio/cras')
| -rw-r--r-- | media/audio/cras/audio_manager_cras.cc | 8 | ||||
| -rw-r--r-- | media/audio/cras/audio_manager_cras.h | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc index e872ada..036f6fd 100644 --- a/media/audio/cras/audio_manager_cras.cc +++ b/media/audio/cras/audio_manager_cras.cc @@ -135,7 +135,6 @@ bool AudioManagerCras::HasAudioInputDevices() { AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory) : AudioManagerBase(audio_log_factory), - has_keyboard_mic_(false), beamforming_on_device_id_(nullptr), beamforming_off_device_id_(nullptr) { SetMaxOutputStreamsAllowed(kMaxOutputStreams); @@ -181,7 +180,7 @@ AudioParameters AudioManagerCras::GetInputStreamParameters( AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, kDefaultSampleRate, 16, buffer_size); - if (has_keyboard_mic_) + if (chromeos::CrasAudioHandler::Get()->HasKeyboardMic()) params.set_effects(AudioParameters::KEYBOARD_MIC); if (mic_positions_.size() > 1) { @@ -212,11 +211,6 @@ AudioParameters AudioManagerCras::GetInputStreamParameters( return params; } -void AudioManagerCras::SetHasKeyboardMic() { - DCHECK(GetTaskRunner()->BelongsToCurrentThread()); - has_keyboard_mic_ = true; -} - AudioOutputStream* AudioManagerCras::MakeLinearOutputStream( const AudioParameters& params) { DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h index fbe0102..91e763e 100644 --- a/media/audio/cras/audio_manager_cras.h +++ b/media/audio/cras/audio_manager_cras.h @@ -27,7 +27,6 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; AudioParameters GetInputStreamParameters( const std::string& device_id) override; - void SetHasKeyboardMic() override; // AudioManagerBase implementation. AudioOutputStream* MakeLinearOutputStream( @@ -61,8 +60,6 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { void AddBeamformingDevices(AudioDeviceNames* device_names); - bool has_keyboard_mic_; - // Stores the mic positions field from the device. std::vector<Point> mic_positions_; |