Support Opus Ambisonics playback

media/test/pipeline_integration_test.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 891 matching lines @@
 }
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-opus.ogg"));
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
+TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg_4ch_ChannelMapping2) {

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

Do we need the 4ch one if we have the 11ch one? We only do if you're planning to
mark < 8 channels as non-discrete. This should test the mapping which gets sent
to the NullAudioSink as well.

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

Now that we check that webaudio is attached before rendering discrete, are these
pipeline tests still appropriate? As far as I understand, these seem to use
media source?

+  ASSERT_EQ(PIPELINE_OK, Start("bear-opus-4ch-channelmapping2.ogg"));
+
+  Play();
+
+  ASSERT_TRUE(WaitUntilOnEnded());
+}
+
+TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg_11ch_ChannelMapping2) {
+  ASSERT_EQ(PIPELINE_OK, Start("bear-opus-11ch-channelmapping2.ogg"));
+
+  Play();
+
+  ASSERT_TRUE(WaitUntilOnEnded());
+}
+
 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm", kHashed));
 
   Play();
 
   ASSERT_TRUE(WaitUntilOnEnded());
 
   EXPECT_HASH_EQ("f0be120a90a811506777c99a2cdf7cc1", GetVideoHash());
   EXPECT_HASH_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash());
   EXPECT_TRUE(demuxer_->GetTimelineOffset().is_null());
@@ skipping 1527 matching lines @@
                                  0x1C896, 65536));
 }
 
 // Verify that Opus audio in WebM containers can be played back.
 TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-opus-end-trimming.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
+TEST_F(PipelineIntegrationTest,
+       BasicPlayback_AudioOnly_Opus_4ch_ChannelMapping2_WebM) {
+  ASSERT_EQ(PIPELINE_OK,
+            Start("bear-opus-end-trimming-4ch-channelmapping2.webm"));
+  Play();
+  ASSERT_TRUE(WaitUntilOnEnded());
+}
+
+TEST_F(PipelineIntegrationTest,
+       BasicPlayback_AudioOnly_Opus_11ch_ChannelMapping2_WebM) {
+  ASSERT_EQ(PIPELINE_OK,
+            Start("bear-opus-end-trimming-11ch-channelmapping2.webm"));
+  Play();
+  ASSERT_TRUE(WaitUntilOnEnded());
+}
+
 // Verify that VP9 video in WebM containers can be played back.
 TEST_F(PipelineIntegrationTest, BasicPlayback_VideoOnly_VP9_WebM) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-vp9.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
 // Verify that VP9 video and Opus audio in the same WebM container can be played
 // back.
 TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Opus_WebM) {
@@ skipping 147 matching lines @@
 
 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
   ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
   ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
             demuxer_->GetStartTime());
 }
 
 }  // namespace media