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

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

Issue 535253002: Add missing expectation for BasicPlayback_VP8_WebVTT_WebM test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | 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 "media/filters/pipeline_integration_test_base.h" 5 #include "media/filters/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 1486
1487 // Verify that VP9 video with odd width/height can be played back. 1487 // Verify that VP9 video with odd width/height can be played back.
1488 TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Odd_WebM) { 1488 TEST_F(PipelineIntegrationTest, BasicPlayback_VP9_Odd_WebM) {
1489 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-odd-dimensions.webm"), 1489 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-odd-dimensions.webm"),
1490 PIPELINE_OK)); 1490 PIPELINE_OK));
1491 Play(); 1491 Play();
1492 ASSERT_TRUE(WaitUntilOnEnded()); 1492 ASSERT_TRUE(WaitUntilOnEnded());
1493 } 1493 }
1494 1494
1495 // Verify that VP8 video with inband text track can be played back. 1495 // Verify that VP8 video with inband text track can be played back.
1496 TEST_F(PipelineIntegrationTest, 1496 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) {
1497 BasicPlayback_VP8_WebVTT_WebM) { 1497 EXPECT_CALL(*this, OnAddTextTrack(_, _));
1498 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), 1498 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
1499 PIPELINE_OK)); 1499 PIPELINE_OK));
1500 Play(); 1500 Play();
1501 ASSERT_TRUE(WaitUntilOnEnded()); 1501 ASSERT_TRUE(WaitUntilOnEnded());
1502 } 1502 }
1503 1503
1504 // Verify that VP9 video with 4:4:4 subsampling can be played back. 1504 // Verify that VP9 video with 4:4:4 subsampling can be played back.
1505 TEST_F(PipelineIntegrationTest, P444_VP9_WebM) { 1505 TEST_F(PipelineIntegrationTest, P444_VP9_WebM) {
1506 ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240-P444.webm"), 1506 ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240-P444.webm"),
1507 PIPELINE_OK)); 1507 PIPELINE_OK));
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 ASSERT_TRUE(Start(GetTestDataFilePath("bear_audio_shorter_than_video.ogv"), 1578 ASSERT_TRUE(Start(GetTestDataFilePath("bear_audio_shorter_than_video.ogv"),
1579 PIPELINE_OK)); 1579 PIPELINE_OK));
1580 // Audio track is 500ms. Video track is 1001ms. Duration should be higher of 1580 // Audio track is 500ms. Video track is 1001ms. Duration should be higher of
1581 // the two. 1581 // the two.
1582 EXPECT_EQ(1001, pipeline_->GetMediaDuration().InMilliseconds()); 1582 EXPECT_EQ(1001, pipeline_->GetMediaDuration().InMilliseconds());
1583 Play(); 1583 Play();
1584 ASSERT_TRUE(WaitUntilOnEnded()); 1584 ASSERT_TRUE(WaitUntilOnEnded());
1585 } 1585 }
1586 1586
1587 } // namespace media 1587 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698