Caching AudioOutputDevice instances in mixer manager

media/test/pipeline_integration_test_base.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/test/pipeline_integration_test_base.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 30 matching lines @@
 const char kNullVideoHash[] = "d41d8cd98f00b204e9800998ecf8427e";
 const char kNullAudioHash[] = "0.00,0.00,0.00,0.00,0.00,0.00,";
 
 PipelineIntegrationTestBase::PipelineIntegrationTestBase()
     : hashing_enabled_(false),
       clockless_playback_(false),
       pipeline_(new PipelineImpl(message_loop_.task_runner(), new MediaLog())),
       ended_(false),
       pipeline_status_(PIPELINE_OK),
       last_video_frame_format_(PIXEL_FORMAT_UNKNOWN),
-      last_video_frame_color_space_(COLOR_SPACE_UNSPECIFIED),
-      hardware_config_(AudioParameters(), AudioParameters()) {
+      last_video_frame_color_space_(COLOR_SPACE_UNSPECIFIED) {
   base::MD5Init(&md5_context_);
 }
 
 PipelineIntegrationTestBase::~PipelineIntegrationTestBase() {
   if (!pipeline_->IsRunning())
     return;
 
   Stop();
 }
 
@@ skipping 229 matching lines @@
       base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
                  base::Unretained(this)),
       message_loop_.task_runner()));
 
   // Disable frame dropping if hashing is enabled.
   std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
       message_loop_.task_runner(), message_loop_.task_runner().get(),
       video_sink_.get(), std::move(video_decoders), false, nullptr,
       new MediaLog()));
 
-  if (!clockless_playback_) {
-    audio_sink_ = new NullAudioSink(message_loop_.task_runner());
-  } else {
-    clockless_audio_sink_ = new ClocklessAudioSink();
-  }
-
   ScopedVector<AudioDecoder> audio_decoders;
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
   audio_decoders.push_back(
       new FFmpegAudioDecoder(message_loop_.task_runner(), new MediaLog()));
 #endif
 
   audio_decoders.push_back(new OpusAudioDecoder(message_loop_.task_runner()));
 
-  // Don't allow the audio renderer to resample buffers if hashing is enabled.
-  if (!hashing_enabled_) {
-    AudioParameters out_params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
-                               CHANNEL_LAYOUT_STEREO, 44100, 16, 512);
-    hardware_config_.UpdateOutputConfig(out_params);
+  if (!clockless_playback_) {
+    audio_sink_ = new NullAudioSink(message_loop_.task_runner());
+  } else {
+    clockless_audio_sink_ = new ClocklessAudioSink(OutputDeviceInfo(
+        "", OUTPUT_DEVICE_STATUS_OK,
+        // Don't allow the audio renderer to resample buffers if hashing is
+        // enabled:
+        hashing_enabled_
+            ? AudioParameters()
+            : AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+                              CHANNEL_LAYOUT_STEREO, 44100, 16, 512)));
   }
 
   std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
       message_loop_.task_runner(),
       (clockless_playback_)
           ? static_cast<AudioRendererSink*>(clockless_audio_sink_.get())
           : audio_sink_.get(),
-      std::move(audio_decoders), hardware_config_, new MediaLog()));
+      std::move(audio_decoders), new MediaLog()));
   if (hashing_enabled_) {
     if (clockless_playback_)
       clockless_audio_sink_->StartAudioHashForTesting();
     else
       audio_sink_->StartAudioHashForTesting();
   }
 
   std::unique_ptr<RendererImpl> renderer_impl(
       new RendererImpl(message_loop_.task_runner(), std::move(audio_renderer),
                        std::move(video_renderer)));
@@ skipping 38 matching lines @@
   DCHECK(clockless_playback_);
   return clockless_audio_sink_->render_time();
 }
 
 base::TimeTicks DummyTickClock::NowTicks() {
   now_ += base::TimeDelta::FromSeconds(60);
   return now_;
 }
 
 }  // namespace media