Make AudioOutputDevice restartable and reinitializable

media/base/audio_renderer_mixer.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 "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_hardware_config.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 
@@ skipping 173 matching lines @@
     const GetNewSinkCB& get_new_sink_cb)
     : get_new_sink_cb_(get_new_sink_cb),
       output_param_detector_(new OutputParamDetector(output_params)),
       audio_sink_(sink),
       output_params_(output_params),
       master_converter_(output_params, output_params, true),
       pause_delay_(base::TimeDelta::FromSeconds(kPauseDelaySeconds)),
       last_play_time_(base::TimeTicks::Now()),
       // Initialize |playing_| to true since Start() results in an auto-play.
       playing_(true) {
+  printf("################ Creating new mixer.\n");
     DVLOG(1) << "AudioRendererMixer::AudioRendererMixer(),\n"
              << output_params_.AsHumanReadableString() << "mixer: " << this;
   // TODO(olka) we probably want to (a) start with a null sink and create a new
   // one when a new input is added, or (b) create a sink through a callback
   audio_sink_->Initialize(output_params, this);
   audio_sink_->Start();
 }
 
 AudioRendererMixer::~AudioRendererMixer() {
   DVLOG(1) << "AudioRendererMixer::~AudioRendererMixer(), mixer: " << this;
@@ skipping 27 matching lines @@
 
   // If |frames_per_buffer| does not change, do not bother to reconfigure the
   // sink depending on just |format|. TODO(olka) we may reconcider this.
   {
     base::AutoLock auto_lock(lock_);
     if (new_output_params.frames_per_buffer() ==
         output_params_.frames_per_buffer())
       return;
   }
 
+#if 1
+  {
+//    base::AutoLock auto_lock(lock_);
+    if (audio_sink_) {
+      printf("################ Restarting sink for mixer.\n");
+      // Initialize |playing_| to true since Start() results in an auto-play.
+      last_play_time_ = base::TimeTicks::Now();
+      output_params_ = new_output_params;
+      audio_sink_->Stop();
+      audio_sink_->Initialize(output_params_, this);
+      audio_sink_->Start();
+      if (playing_)
+        audio_sink_->Play();
+      DVLOG(1) << "Sink reinitialized";
+      return;
+    }
+  }
+#endif
+
+  NOTREACHED();
+
+  printf("################ Creating new sink for mixer.\n");
+
   // To minimize possible glitches during the sink switch, first we initialize
   // the new sink, and after that we stop the current one. This may be a problem
   // on Mac since audio output won't switch to a larger buffer when there is IO
   // with a smaller one.
   scoped_refptr<media::AudioRendererSink> new_audio_sink =
       get_new_sink_cb_.Run();
   if (!new_audio_sink) {
     LOG(ERROR) << "Sink creation failed.";
     return;  // Fail back to an existing one.
   }
@@ skipping 144 matching lines @@
 }
 
 void AudioRendererMixer::OnRenderError() {
   // Call each mixer input and signal an error.
   base::AutoLock auto_lock(lock_);
   for (const auto& cb : error_callbacks_)
     cb.Run();
 }
 
 }  // namespace media