Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store …

content/renderer/media/webrtc_local_audio_renderer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc_local_audio_renderer.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
@@ skipping 103 matching lines @@
 }
 
 void WebRtcLocalAudioRenderer::Start() {
   DVLOG(1) << "WebRtcLocalAudioRenderer::Start()";
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // We get audio data from |audio_track_|...
   MediaStreamAudioSink::AddToAudioTrack(this, audio_track_);
   // ...and |sink_| will get audio data from us.
   DCHECK(!sink_.get());
-  sink_ = AudioDeviceFactory::NewOutputDevice(source_render_frame_id_);
+  sink_ =
+      AudioDeviceFactory::NewOutputDevice(source_render_frame_id_, session_id_);
 
   base::AutoLock auto_lock(thread_lock_);
   last_render_time_ = base::TimeTicks::Now();
   playing_ = false;
 }
 
 void WebRtcLocalAudioRenderer::Stop() {
   DVLOG(1) << "WebRtcLocalAudioRenderer::Stop()";
   DCHECK(task_runner_->BelongsToCurrentThread());
 
@@ skipping 100 matching lines @@
   {
     // Clear up the old data in the FIFO.
     base::AutoLock auto_lock(thread_lock_);
     audio_shifter_->Flush();
   }
 
   if (!sink_params_.IsValid() || !playing_ || !volume_ || sink_started_)
     return;
 
   DVLOG(1) << "WebRtcLocalAudioRenderer::MaybeStartSink() -- Starting sink_.";
-  sink_->InitializeWithSessionId(sink_params_, this, session_id_);
+  sink_->Initialize(sink_params_, this);
   sink_->Start();
   sink_started_ = true;
   UMA_HISTOGRAM_ENUMERATION("Media.LocalRendererSinkStates",
                             kSinkStarted, kSinkStatesMax);
 }
 
 void WebRtcLocalAudioRenderer::ReconfigureSink(
     const media::AudioParameters& params) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
@@ skipping 28 matching lines @@
 
     base::AutoLock auto_lock(thread_lock_);
     audio_shifter_.reset(new_shifter);
   }
 
   if (!sink_.get())
     return;  // WebRtcLocalAudioRenderer has not yet been started.
 
   // Stop |sink_| and re-create a new one to be initialized with different audio
   // parameters.  Then, invoke MaybeStartSink() to restart everything again.
-  if (sink_started_) {
-    sink_->Stop();
-    sink_started_ = false;
-  }
+  sink_->Stop();
+  sink_started_ = false;
 
-  sink_ = AudioDeviceFactory::NewOutputDevice(source_render_frame_id_);
+  sink_ =
+      AudioDeviceFactory::NewOutputDevice(source_render_frame_id_, session_id_);
   MaybeStartSink();
 }
 
 }  // namespace content