Support Opus Ambisonics playback

media/test/pipeline_integration_test.cc

Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 8f618567feb98c60045f47c61e66dff9b4578d49..1746329b704e14a57a568873e58a8aafd6f8170a 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -909,6 +909,22 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg) {
   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));
 
@@ -2456,6 +2472,22 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) {
   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"));