Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/audio/audio_manager_base.h" | 5 #include "media/audio/audio_manager_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| 11 #include "media/audio/audio_output_dispatcher_impl.h" | 11 #include "media/audio/audio_output_dispatcher_impl.h" |
| 12 #include "media/audio/audio_output_proxy.h" | 12 #include "media/audio/audio_output_proxy.h" |
| 13 #include "media/audio/audio_output_resampler.h" | 13 #include "media/audio/audio_output_resampler.h" |
| 14 #include "media/audio/audio_util.h" | 14 #include "media/audio/audio_util.h" |
| 15 #include "media/audio/fake_audio_input_stream.h" | 15 #include "media/audio/fake_audio_input_stream.h" |
| 16 #include "media/audio/fake_audio_output_stream.h" | 16 #include "media/audio/fake_audio_output_stream.h" |
| 17 #include "media/audio/virtual_audio_input_stream.h" | |
| 18 #include "media/audio/virtual_audio_output_stream.h" | |
| 17 #include "media/base/media_switches.h" | 19 #include "media/base/media_switches.h" |
| 18 | 20 |
| 19 // TODO(dalecurtis): Temporarily disabled while switching pipeline to use float, | 21 // TODO(dalecurtis): Temporarily disabled while switching pipeline to use float, |
| 20 // http://crbug.com/114700 | 22 // http://crbug.com/114700 |
| 21 #if defined(ENABLE_AUDIO_MIXER) | 23 #if defined(ENABLE_AUDIO_MIXER) |
| 22 #include "media/audio/audio_output_mixer.h" | 24 #include "media/audio/audio_output_mixer.h" |
| 23 #endif | 25 #endif |
| 24 | 26 |
| 25 namespace media { | 27 namespace media { |
| 26 | 28 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 38 | 40 |
| 39 const char AudioManagerBase::kDefaultDeviceName[] = "Default"; | 41 const char AudioManagerBase::kDefaultDeviceName[] = "Default"; |
| 40 const char AudioManagerBase::kDefaultDeviceId[] = "default"; | 42 const char AudioManagerBase::kDefaultDeviceId[] = "default"; |
| 41 | 43 |
| 42 AudioManagerBase::AudioManagerBase() | 44 AudioManagerBase::AudioManagerBase() |
| 43 : num_active_input_streams_(0), | 45 : num_active_input_streams_(0), |
| 44 max_num_output_streams_(kDefaultMaxOutputStreams), | 46 max_num_output_streams_(kDefaultMaxOutputStreams), |
| 45 max_num_input_streams_(kDefaultMaxInputStreams), | 47 max_num_input_streams_(kDefaultMaxInputStreams), |
| 46 num_output_streams_(0), | 48 num_output_streams_(0), |
| 47 num_input_streams_(0), | 49 num_input_streams_(0), |
| 48 audio_thread_(new base::Thread("AudioThread")) { | 50 audio_thread_(new base::Thread("AudioThread")), |
| 51 virtual_audio_input_stream_(NULL) { | |
| 49 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
| 50 audio_thread_->init_com_with_mta(true); | 53 audio_thread_->init_com_with_mta(true); |
| 51 #endif | 54 #endif |
| 52 CHECK(audio_thread_->Start()); | 55 CHECK(audio_thread_->Start()); |
| 53 message_loop_ = audio_thread_->message_loop_proxy(); | 56 message_loop_ = audio_thread_->message_loop_proxy(); |
| 54 } | 57 } |
| 55 | 58 |
| 56 AudioManagerBase::~AudioManagerBase() { | 59 AudioManagerBase::~AudioManagerBase() { |
| 57 // The platform specific AudioManager implementation must have already | 60 // The platform specific AudioManager implementation must have already |
| 58 // stopped the audio thread. Otherwise, we may destroy audio streams before | 61 // stopped the audio thread. Otherwise, we may destroy audio streams before |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 return NULL; | 96 return NULL; |
| 94 } | 97 } |
| 95 | 98 |
| 96 // If there are no audio output devices we should use a FakeAudioOutputStream | 99 // If there are no audio output devices we should use a FakeAudioOutputStream |
| 97 // to ensure video playback continues to work. | 100 // to ensure video playback continues to work. |
| 98 bool audio_output_disabled = | 101 bool audio_output_disabled = |
| 99 params.format() == AudioParameters::AUDIO_FAKE || | 102 params.format() == AudioParameters::AUDIO_FAKE || |
| 100 !HasAudioOutputDevices(); | 103 !HasAudioOutputDevices(); |
| 101 | 104 |
| 102 AudioOutputStream* stream = NULL; | 105 AudioOutputStream* stream = NULL; |
| 103 if (audio_output_disabled) { | 106 if (virtual_audio_input_stream_) { |
| 107 VirtualAudioOutputStream* virtual_stream = | |
| 108 VirtualAudioOutputStream::MakeStream(this, params); | |
| 109 stream = virtual_stream; | |
| 110 virtual_audio_input_stream_->AddOutputStream(virtual_stream, params); | |
| 111 } else if (audio_output_disabled) { | |
| 104 stream = FakeAudioOutputStream::MakeFakeStream(this, params); | 112 stream = FakeAudioOutputStream::MakeFakeStream(this, params); |
| 105 } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) { | 113 } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) { |
| 106 stream = MakeLinearOutputStream(params); | 114 stream = MakeLinearOutputStream(params); |
| 107 } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) { | 115 } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) { |
| 108 stream = MakeLowLatencyOutputStream(params); | 116 stream = MakeLowLatencyOutputStream(params); |
| 109 } | 117 } |
| 110 | 118 |
| 111 if (stream) | 119 if (stream) |
| 112 ++num_output_streams_; | 120 ++num_output_streams_; |
| 113 | 121 |
| 114 return stream; | 122 return stream; |
| 115 } | 123 } |
| 116 | 124 |
| 117 AudioInputStream* AudioManagerBase::MakeAudioInputStream( | 125 AudioInputStream* AudioManagerBase::MakeAudioInputStream( |
| 118 const AudioParameters& params, const std::string& device_id) { | 126 const AudioParameters& params, const std::string& device_id) { |
| 119 if (!params.IsValid() || (params.channels() > kMaxInputChannels) || | 127 if (!params.IsValid() || (params.channels() > kMaxInputChannels) || |
| 120 device_id.empty()) { | 128 device_id.empty()) { |
| 121 DLOG(ERROR) << "Audio parameters are invalid for device " << device_id; | 129 DLOG(ERROR) << "Audio parameters are invalid for device " << device_id; |
| 122 return NULL; | 130 return NULL; |
| 123 } | 131 } |
| 124 | 132 |
| 125 if (num_input_streams_ >= max_num_input_streams_) { | 133 if (num_input_streams_ >= max_num_input_streams_) { |
| 126 DLOG(ERROR) << "Number of opened input audio streams " | 134 DLOG(ERROR) << "Number of opened input audio streams " |
| 127 << num_input_streams_ | 135 << num_input_streams_ |
| 128 << " exceed the max allowed number " << max_num_input_streams_; | 136 << " exceed the max allowed number " << max_num_input_streams_; |
| 129 return NULL; | 137 return NULL; |
| 130 } | 138 } |
| 131 | 139 |
| 132 AudioInputStream* stream = NULL; | 140 AudioInputStream* stream = NULL; |
| 133 if (params.format() == AudioParameters::AUDIO_FAKE) { | 141 if (params.format() == AudioParameters::AUDIO_WEB_CONTENTS && |
| 142 !virtual_audio_input_stream_) { | |
|
DaleCurtis
2012/11/21 23:45:43
CHECK(!virtual_audio_input_stream) instead of if !
justinlin
2012/11/26 20:19:20
This brings up that what I wanted to do won't work
| |
| 143 // TODO(justinlin): Currently, we can only support mirroring audio from 1 | |
| 144 // tab, so subsequent tab capture requests will just get microphone audio. | |
| 145 // Maybe we should just return the same stream and ref-count, so that we | |
| 146 // only actually destroy the stream when there's no mirroring? | |
| 147 virtual_audio_input_stream_ = | |
| 148 VirtualAudioInputStream::MakeStream(this, params); | |
| 149 stream = virtual_audio_input_stream_; | |
| 150 NotifyAllOutputDeviceChangeListeners(); | |
| 151 } else if (params.format() == AudioParameters::AUDIO_FAKE) { | |
| 134 stream = FakeAudioInputStream::MakeFakeStream(this, params); | 152 stream = FakeAudioInputStream::MakeFakeStream(this, params); |
| 135 } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) { | 153 } else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) { |
| 136 stream = MakeLinearInputStream(params, device_id); | 154 stream = MakeLinearInputStream(params, device_id); |
| 137 } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) { | 155 } else if (params.format() == AudioParameters::AUDIO_PCM_LOW_LATENCY) { |
| 138 stream = MakeLowLatencyInputStream(params, device_id); | 156 stream = MakeLowLatencyInputStream(params, device_id); |
| 139 } | 157 } |
| 140 | 158 |
| 141 if (stream) | 159 if (stream) |
| 142 ++num_input_streams_; | 160 ++num_input_streams_; |
| 143 | 161 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 return false; | 243 return false; |
| 226 } | 244 } |
| 227 | 245 |
| 228 void AudioManagerBase::ShowAudioInputSettings() { | 246 void AudioManagerBase::ShowAudioInputSettings() { |
| 229 } | 247 } |
| 230 | 248 |
| 231 void AudioManagerBase::GetAudioInputDeviceNames( | 249 void AudioManagerBase::GetAudioInputDeviceNames( |
| 232 media::AudioDeviceNames* device_names) { | 250 media::AudioDeviceNames* device_names) { |
| 233 } | 251 } |
| 234 | 252 |
| 235 void AudioManagerBase::ReleaseOutputStream(AudioOutputStream* stream) { | 253 void AudioManagerBase::ReleaseOutputStream(AudioOutputStream* stream) { |
|
DaleCurtis
2012/11/21 23:45:43
Is this method guaranteed to happen on the audio t
justinlin
2012/11/26 20:19:20
Done.
| |
| 236 DCHECK(stream); | 254 DCHECK(stream); |
| 237 // TODO(xians) : Have a clearer destruction path for the AudioOutputStream. | 255 // TODO(xians) : Have a clearer destruction path for the AudioOutputStream. |
| 238 // For example, pass the ownership to AudioManager so it can delete the | 256 // For example, pass the ownership to AudioManager so it can delete the |
| 239 // streams. | 257 // streams. |
| 258 | |
| 259 if (virtual_audio_input_stream_) { | |
|
DaleCurtis
2012/11/21 23:45:43
Hmmm, this seems incorrect. You set virtual_audio_
justinlin
2012/11/26 20:19:20
Done. Added another release method for virtual out
| |
| 260 VirtualAudioOutputStream* virtual_stream = | |
| 261 static_cast<VirtualAudioOutputStream*>(stream); | |
| 262 virtual_audio_input_stream_->RemoveOutputStream(virtual_stream); | |
| 263 } | |
| 264 | |
| 240 num_output_streams_--; | 265 num_output_streams_--; |
| 241 delete stream; | 266 delete stream; |
| 242 } | 267 } |
| 243 | 268 |
| 244 void AudioManagerBase::ReleaseInputStream(AudioInputStream* stream) { | 269 void AudioManagerBase::ReleaseInputStream(AudioInputStream* stream) { |
|
DaleCurtis
2012/11/21 23:45:43
Is this method guaranteed to happen on the audio t
justinlin
2012/11/26 20:19:20
Done.
| |
| 245 DCHECK(stream); | 270 DCHECK(stream); |
| 246 // TODO(xians) : Have a clearer destruction path for the AudioInputStream. | 271 // TODO(xians) : Have a clearer destruction path for the AudioInputStream. |
| 272 | |
| 273 if (virtual_audio_input_stream_ == stream) { | |
| 274 virtual_audio_input_stream_->Stop(); | |
| 275 virtual_audio_input_stream_ = NULL; | |
| 276 NotifyAllOutputDeviceChangeListeners(); | |
| 277 } | |
| 278 | |
| 247 num_input_streams_--; | 279 num_input_streams_--; |
| 248 delete stream; | 280 delete stream; |
| 249 } | 281 } |
| 250 | 282 |
| 251 void AudioManagerBase::IncreaseActiveInputStreamCount() { | 283 void AudioManagerBase::IncreaseActiveInputStreamCount() { |
| 252 base::AtomicRefCountInc(&num_active_input_streams_); | 284 base::AtomicRefCountInc(&num_active_input_streams_); |
| 253 } | 285 } |
| 254 | 286 |
| 255 void AudioManagerBase::DecreaseActiveInputStreamCount() { | 287 void AudioManagerBase::DecreaseActiveInputStreamCount() { |
| 256 DCHECK(IsRecordingInProcess()); | 288 DCHECK(IsRecordingInProcess()); |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 340 output_listeners_.RemoveObserver(listener); | 372 output_listeners_.RemoveObserver(listener); |
| 341 } | 373 } |
| 342 | 374 |
| 343 void AudioManagerBase::NotifyAllOutputDeviceChangeListeners() { | 375 void AudioManagerBase::NotifyAllOutputDeviceChangeListeners() { |
| 344 DCHECK(message_loop_->BelongsToCurrentThread()); | 376 DCHECK(message_loop_->BelongsToCurrentThread()); |
| 345 DVLOG(1) << "Firing OnDeviceChange() notifications."; | 377 DVLOG(1) << "Firing OnDeviceChange() notifications."; |
| 346 FOR_EACH_OBSERVER(AudioDeviceListener, output_listeners_, OnDeviceChange()); | 378 FOR_EACH_OBSERVER(AudioDeviceListener, output_listeners_, OnDeviceChange()); |
| 347 } | 379 } |
| 348 | 380 |
| 349 } // namespace media | 381 } // namespace media |
| OLD | NEW |