Mixing audio with different latency requirements

media/base/audio_renderer_mixer_input_unittest.cc

Index: media/base/audio_renderer_mixer_input_unittest.cc
diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc
index 9d2345d60beb71018c7ea9c0fe48443eb16105c3..ad4a9545ac88ec3a43e05529883ba425ee9e2b9a 100644
--- a/media/base/audio_renderer_mixer_input_unittest.cc
+++ b/media/base/audio_renderer_mixer_input_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
+#include "media/base/audio_latency.h"
 #include "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/audio_renderer_mixer_pool.h"
@@ -44,11 +45,13 @@ class AudioRendererMixerInputTest : public testing::Test,
 
   void CreateMixerInput(const std::string& device_id) {
     mixer_input_ = new AudioRendererMixerInput(this, kRenderFrameId, device_id,
-                                               url::Origin());
+                                               url::Origin(),
+                                               AudioLatency::LATENCY_PLAYBACK);
   }
 
   AudioRendererMixer* GetMixer(int owner_id,
                                const AudioParameters& params,
+                               AudioLatency::LatencyType latency,
                                const std::string& device_id,
                                const url::Origin& security_origin,
                                OutputDeviceStatus* device_status) {
@@ -74,8 +77,7 @@ class AudioRendererMixerInputTest : public testing::Test,
       mixers_[idx].reset(
           new AudioRendererMixer(audio_parameters_, sinks_[idx].get()));
     }
-    EXPECT_CALL(*this,
-                ReturnMixer(kRenderFrameId, testing::_, device_id, testing::_));
+    EXPECT_CALL(*this, ReturnMixer(mixers_[idx].get()));

[chcunningham, 2016/06/22 02:13:56]

Can we rename this to ReleaseMixer? Return is a little ambiguous between
fetching/releasing.

[o1ka, 2016/06/23 16:36:16]

I remember renaming it once, it used to be RemoveMixer() :)
Probably ReleaseMixer() is better; it's a bit out of scope of the change though.
I can do it if you insist and Dale supports it as well :)

[chcunningham, 2016/06/27 23:12:25]

Understood. I just kept reading ReturnMixer as something like "CreateMixer".
We'll see what Dale thinks

[o1ka, 2016/06/28 13:04:58]

Acknowledged.

 
     if (device_status)
       *device_status = OUTPUT_DEVICE_STATUS_OK;
@@ -86,11 +88,7 @@ class AudioRendererMixerInputTest : public testing::Test,
     return mixer_input_->ProvideInput(audio_bus_.get(), 0);
   }
 
-  MOCK_METHOD4(ReturnMixer,
-               void(int,
-                    const AudioParameters&,
-                    const std::string&,
-                    const url::Origin&));
+  MOCK_METHOD1(ReturnMixer, void(const AudioRendererMixer*));
 
   MOCK_METHOD4(
       GetOutputDeviceInfo,