Support Opus Ambisonics playback

media/renderers/audio_renderer_impl_unittest.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/renderers/audio_renderer_impl.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 135 matching lines @@
     ConfigureDecoder();
     ScopedVector<AudioDecoder> decoders;
     decoders.push_back(decoder_);
     renderer_.reset(new AudioRendererImpl(message_loop_.task_runner(),
                                           sink_.get(), std::move(decoders),
                                           new MediaLog()));
     testing::Mock::VerifyAndClearExpectations(&demuxer_stream_);
     ConfigureDemuxerStream(true);
   }
 
+  // Reconfigures a demuxer stream using a given config.
+  void ConfigureChangeDemuxerStream(const AudioDecoderConfig& audio_config) {
+    demuxer_stream_.set_audio_decoder_config(audio_config);
+    ConfigureDecoder();
+    ConfigureDemuxerStream(true);
+  }
+
   void ExpectUnsupportedAudioDecoder() {
     EXPECT_CALL(*decoder_, Initialize(_, _, _, _))
         .WillOnce(DoAll(SaveArg<3>(&output_cb_), RunCallback<2>(false)));
   }
 
   // RendererClient implementation.
   MOCK_METHOD1(OnError, void(PipelineStatus));
   void OnEnded() override {
     CHECK(!ended_);
     ended_ = true;
@@ skipping 475 matching lines @@
   DeliverBuffer(DecodeStatus::OK, buffer);
 
   // All channels should now be enabled.
   mask = channel_mask();
   EXPECT_FALSE(mask.empty());
   ASSERT_EQ(mask.size(), static_cast<size_t>(hw_params.channels()));
   for (int ch = 0; ch < hw_params.channels(); ++ch)
     ASSERT_TRUE(mask[ch]);
 }
 
+// Verify that the proper reduced search space is configured for playback rate
+// changes when downmixing is applied to the input with discrete layout.
+// The default hardware layout is stereo.
+TEST_F(AudioRendererImplTest, ChannelMask_DownmixDiscreteLayout) {
+  int audio_channels = 6;

[DaleCurtis, 2017/03/31 19:06:53]

Should be impossible to get discrete + 6 channels per the ffmpeg_common code?

[flim-chromium, 2017/04/05 18:19:34]

Thanks for spotting this. It looks like UpmixDiscreteLayout below is also no
longer needed; I've removed it. 

+  AudioDecoderConfig audio_config(
+      kCodecOpus, kSampleFormat, CHANNEL_LAYOUT_DISCRETE,
+      kInputSamplesPerSecond, EmptyExtraData(), Unencrypted());
+  audio_config.SetChannelsForDiscrete(audio_channels);
+  ConfigureChangeDemuxerStream(audio_config);
+
+  Initialize();
+  std::vector<bool> mask = channel_mask();
+  EXPECT_FALSE(mask.empty());
+  ASSERT_EQ(mask.size(), static_cast<size_t>(audio_channels));
+  for (int ch = 0; ch < audio_channels; ++ch)
+    ASSERT_TRUE(mask[ch]);
+
+  // TODO (flim): channel configuration change?
+}
+
+// Verify that the proper reduced search space is configured for playback rate
+// changes when upmixing is applied to the input with discrete layout.
+TEST_F(AudioRendererImplTest, ChannelMask_UpmixDiscreteLayout) {
+  AudioParameters hw_params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+                            CHANNEL_LAYOUT_7_1, kOutputSamplesPerSecond,
+                            SampleFormatToBytesPerChannel(kSampleFormat) * 8,
+                            1024);
+  ConfigureConfigChangeRenderer(
+      AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+                      CHANNEL_LAYOUT_DISCRETE, kOutputSamplesPerSecond,
+                      SampleFormatToBytesPerChannel(kSampleFormat) * 8, 1024),
+      hw_params);
+
+  AudioDecoderConfig audio_config(
+      kCodecOpus, kSampleFormat, CHANNEL_LAYOUT_DISCRETE,
+      kInputSamplesPerSecond, EmptyExtraData(), Unencrypted());
+  audio_config.SetChannelsForDiscrete(4);
+  ConfigureChangeDemuxerStream(audio_config);
+
+  Initialize();
+  std::vector<bool> mask = channel_mask();
+  EXPECT_FALSE(mask.empty());
+  ASSERT_EQ(mask.size(), static_cast<size_t>(hw_params.channels()));
+  for (int ch = 0; ch < hw_params.channels(); ++ch) {
+    if (ch > 3)
+      ASSERT_FALSE(mask[ch]);
+    else
+      ASSERT_TRUE(mask[ch]);
+  }
+
+  // TODO (flim): channel configuration change?
+}
+
 TEST_F(AudioRendererImplTest, Underflow_Flush) {
   Initialize();
   Preroll();
   StartTicking();
 
   // Force underflow.
   EXPECT_TRUE(ConsumeBufferedData(frames_buffered()));
   WaitForPendingRead();
   EXPECT_CALL(*this, OnBufferingStateChange(BUFFERING_HAVE_NOTHING));
   EXPECT_FALSE(ConsumeBufferedData(OutputFrames(1)));
@@ skipping 402 matching lines @@
   // Advance far enough that we shouldn't be clamped to current time (tested
   // already above).
   tick_clock_->Advance(kOneSecond);
   EXPECT_EQ(
       current_time + timestamp_helper.GetFrameDuration(frames_to_consume.value),
       CurrentMediaWallClockTime(&is_time_moving));
   EXPECT_TRUE(is_time_moving);
 }
 
 }  // namespace media