Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: media/test/pipeline_integration_test.cc

Issue 2752323002: Support Opus Ambisonics playback (Closed)
Patch Set: another fix for unreliable ffmpeg channels vs layout Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/test/data/bear-opus-end-trimming-4ch-channelmapping2.webm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 } 559 }
560 560
561 TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg) { 561 TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg) {
562 ASSERT_EQ(PIPELINE_OK, Start("bear-opus.ogg")); 562 ASSERT_EQ(PIPELINE_OK, Start("bear-opus.ogg"));
563 563
564 Play(); 564 Play();
565 565
566 ASSERT_TRUE(WaitUntilOnEnded()); 566 ASSERT_TRUE(WaitUntilOnEnded());
567 } 567 }
568 568
569 TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg_4ch_ChannelMapping2) {
570 ASSERT_EQ(PIPELINE_OK,
571 Start("bear-opus-4ch-channelmapping2.ogg", kClockless));
572
573 Play();
574
575 ASSERT_TRUE(WaitUntilOnEnded());
576 }
577
578 TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg_11ch_ChannelMapping2) {
579 ASSERT_EQ(PIPELINE_OK,
580 Start("bear-opus-11ch-channelmapping2.ogg", kClockless));
581
582 Play();
583
584 ASSERT_TRUE(WaitUntilOnEnded());
585 }
586
569 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) { 587 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
570 ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm", kHashed)); 588 ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm", kHashed));
571 589
572 Play(); 590 Play();
573 591
574 ASSERT_TRUE(WaitUntilOnEnded()); 592 ASSERT_TRUE(WaitUntilOnEnded());
575 593
576 EXPECT_HASH_EQ("f0be120a90a811506777c99a2cdf7cc1", GetVideoHash()); 594 EXPECT_HASH_EQ("f0be120a90a811506777c99a2cdf7cc1", GetVideoHash());
577 EXPECT_HASH_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash()); 595 EXPECT_HASH_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash());
578 EXPECT_TRUE(demuxer_->GetTimelineOffset().is_null()); 596 EXPECT_TRUE(demuxer_->GetTimelineOffset().is_null());
(...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
2191 0x1C896, 65536)); 2209 0x1C896, 65536));
2192 } 2210 }
2193 2211
2194 // Verify that Opus audio in WebM containers can be played back. 2212 // Verify that Opus audio in WebM containers can be played back.
2195 TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) { 2213 TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) {
2196 ASSERT_EQ(PIPELINE_OK, Start("bear-opus-end-trimming.webm")); 2214 ASSERT_EQ(PIPELINE_OK, Start("bear-opus-end-trimming.webm"));
2197 Play(); 2215 Play();
2198 ASSERT_TRUE(WaitUntilOnEnded()); 2216 ASSERT_TRUE(WaitUntilOnEnded());
2199 } 2217 }
2200 2218
2219 TEST_F(PipelineIntegrationTest,
2220 BasicPlayback_AudioOnly_Opus_4ch_ChannelMapping2_WebM) {
2221 ASSERT_EQ(
2222 PIPELINE_OK,
2223 Start("bear-opus-end-trimming-4ch-channelmapping2.webm", kClockless));
2224 Play();
2225 ASSERT_TRUE(WaitUntilOnEnded());
2226 }
2227
2228 TEST_F(PipelineIntegrationTest,
2229 BasicPlayback_AudioOnly_Opus_11ch_ChannelMapping2_WebM) {
2230 ASSERT_EQ(
2231 PIPELINE_OK,
2232 Start("bear-opus-end-trimming-11ch-channelmapping2.webm", kClockless));
2233 Play();
2234 ASSERT_TRUE(WaitUntilOnEnded());
2235 }
2236
2201 // Verify that VP9 video in WebM containers can be played back. 2237 // Verify that VP9 video in WebM containers can be played back.
2202 TEST_F(PipelineIntegrationTest, BasicPlayback_VideoOnly_VP9_WebM) { 2238 TEST_F(PipelineIntegrationTest, BasicPlayback_VideoOnly_VP9_WebM) {
2203 ASSERT_EQ(PIPELINE_OK, Start("bear-vp9.webm")); 2239 ASSERT_EQ(PIPELINE_OK, Start("bear-vp9.webm"));
2204 Play(); 2240 Play();
2205 ASSERT_TRUE(WaitUntilOnEnded()); 2241 ASSERT_TRUE(WaitUntilOnEnded());
2206 } 2242 }
2207 2243
2208 // Verify that VP9 video and Opus audio in the same WebM container can be played 2244 // Verify that VP9 video and Opus audio in the same WebM container can be played
2209 // back. 2245 // back.
2210 TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Opus_WebM) { 2246 TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Opus_WebM) {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
2358 2394
2359 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2395 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2360 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2396 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2361 Play(); 2397 Play();
2362 ASSERT_TRUE(WaitUntilOnEnded()); 2398 ASSERT_TRUE(WaitUntilOnEnded());
2363 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2399 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2364 demuxer_->GetStartTime()); 2400 demuxer_->GetStartTime());
2365 } 2401 }
2366 2402
2367 } // namespace media 2403 } // namespace media
OLDNEW
« no previous file with comments | « media/test/data/bear-opus-end-trimming-4ch-channelmapping2.webm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698