Chromium Code Reviews

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: incorporated more of aaron's comments Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 1016 matching lines...)
1027 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) { 1027 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) {
1028 EXPECT_CALL(*this, OnSetOpaque(false)).Times(AnyNumber()); 1028 EXPECT_CALL(*this, OnSetOpaque(false)).Times(AnyNumber());
1029 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8a.webm"), 1029 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8a.webm"),
1030 PIPELINE_OK)); 1030 PIPELINE_OK));
1031 Play(); 1031 Play();
1032 ASSERT_TRUE(WaitUntilOnEnded()); 1032 ASSERT_TRUE(WaitUntilOnEnded());
1033 EXPECT_EQ(last_video_frame_format_, VideoFrame::YV12A); 1033 EXPECT_EQ(last_video_frame_format_, VideoFrame::YV12A);
1034 } 1034 }
1035 1035
1036 // Verify that VP8 video with inband text track can be played back. 1036 // Verify that VP8 video with inband text track can be played back.
1037 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) { 1037 TEST_F(PipelineIntegrationTest,
1038 DISABLED_BasicPlayback_VP8_WebVTT_WebM) {
1038 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), 1039 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
1039 PIPELINE_OK)); 1040 PIPELINE_OK));
1040 Play(); 1041 Play();
1041 ASSERT_TRUE(WaitUntilOnEnded()); 1042 ASSERT_TRUE(WaitUntilOnEnded());
1042 } 1043 }
1043 1044
1044 } // namespace media 1045 } // namespace media
OLDNEW

Powered by Google App Engine