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

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

Issue 23702007: Render inband text tracks in the media pipeline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: incorporate aaron's comments (9/28) Created 7 years, 2 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
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 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) { 1065 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) {
1066 EXPECT_CALL(*this, OnSetOpaque(false)).Times(AnyNumber()); 1066 EXPECT_CALL(*this, OnSetOpaque(false)).Times(AnyNumber());
1067 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8a.webm"), 1067 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8a.webm"),
1068 PIPELINE_OK)); 1068 PIPELINE_OK));
1069 Play(); 1069 Play();
1070 ASSERT_TRUE(WaitUntilOnEnded()); 1070 ASSERT_TRUE(WaitUntilOnEnded());
1071 EXPECT_EQ(last_video_frame_format_, VideoFrame::YV12A); 1071 EXPECT_EQ(last_video_frame_format_, VideoFrame::YV12A);
1072 } 1072 }
1073 1073
1074 // Verify that VP8 video with inband text track can be played back. 1074 // Verify that VP8 video with inband text track can be played back.
1075 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) { 1075 TEST_F(PipelineIntegrationTest,
1076 DISABLED_BasicPlayback_VP8_WebVTT_WebM) {
acolwell GONE FROM CHROMIUM 2013/10/08 15:45:24 nit: enable test
Matthew Heaney (Chromium) 2013/10/13 05:30:17 Done.
1076 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), 1077 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
1077 PIPELINE_OK)); 1078 PIPELINE_OK));
1078 Play(); 1079 Play();
1079 ASSERT_TRUE(WaitUntilOnEnded()); 1080 ASSERT_TRUE(WaitUntilOnEnded());
1080 } 1081 }
1081 1082
1082 } // namespace media 1083 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698