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

Unified Diff: media/audio/virtual_audio_input_stream.cc

Issue 1897953003: Unmute Tab Audio For Desktop Share (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit Created 4 years, 7 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 | « media/audio/virtual_audio_input_stream.h ('k') | media/audio/virtual_audio_output_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/virtual_audio_input_stream.cc
diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc
index ef9799668f8a5ce31865fe8351bfdb6bc37f4ea5..1252805c0d9d5babfbb6f13845a20d095768b7e1 100644
--- a/media/audio/virtual_audio_input_stream.cc
+++ b/media/audio/virtual_audio_input_stream.cc
@@ -65,34 +65,36 @@ void VirtualAudioInputStream::Stop() {
callback_ = NULL;
}
-void VirtualAudioInputStream::AddOutputStream(
- VirtualAudioOutputStream* stream, const AudioParameters& output_params) {
+void VirtualAudioInputStream::AddInputProvider(
+ AudioConverter::InputCallback* input,
+ const AudioParameters& params) {
DCHECK(thread_checker_.CalledOnValidThread());
base::AutoLock scoped_lock(converter_network_lock_);
- AudioConvertersMap::iterator converter = converters_.find(output_params);
+ AudioConvertersMap::iterator converter = converters_.find(params);
if (converter == converters_.end()) {
- std::pair<AudioConvertersMap::iterator, bool> result = converters_.insert(
- std::make_pair(output_params, new LoopbackAudioConverter(
- output_params, params_, false)));
+ std::pair<AudioConvertersMap::iterator, bool> result =
+ converters_.insert(std::make_pair(
+ params, new LoopbackAudioConverter(params, params_, false)));
converter = result.first;
// Add to main mixer if we just added a new AudioTransform.
mixer_.AddInput(converter->second);
}
- converter->second->AddInput(stream);
+ converter->second->AddInput(input);
++num_attached_output_streams_;
}
-void VirtualAudioInputStream::RemoveOutputStream(
- VirtualAudioOutputStream* stream, const AudioParameters& output_params) {
+void VirtualAudioInputStream::RemoveInputProvider(
+ AudioConverter::InputCallback* input,
+ const AudioParameters& params) {
DCHECK(thread_checker_.CalledOnValidThread());
base::AutoLock scoped_lock(converter_network_lock_);
- DCHECK(converters_.find(output_params) != converters_.end());
- converters_[output_params]->RemoveInput(stream);
+ DCHECK(converters_.find(params) != converters_.end());
+ converters_[params]->RemoveInput(input);
--num_attached_output_streams_;
DCHECK_LE(0, num_attached_output_streams_);
« no previous file with comments | « media/audio/virtual_audio_input_stream.h ('k') | media/audio/virtual_audio_output_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698