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

Unified 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: fix compile errors 11/21 #6 Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/source_buffer_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 221e6418c4f97ffa68fb2a3f03f3c94e7a923110..86692979f027ae7ed1adab695a49eb12e9481577 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -240,8 +240,6 @@ class MockMediaSource {
base::Unretained(this)),
base::Bind(&MockMediaSource::DemuxerNeedKey,
base::Unretained(this)),
- base::Bind(&MockMediaSource::OnTextTrack,
- base::Unretained(this)),
LogCB())),
owned_chunk_demuxer_(chunk_demuxer_) {
@@ -343,12 +341,6 @@ class MockMediaSource {
need_key_cb_.Run(type, init_data);
}
- scoped_ptr<TextTrack> OnTextTrack(TextKind kind,
- const std::string& label,
- const std::string& language) {
- return scoped_ptr<TextTrack>();
- }
-
private:
base::FilePath file_path_;
scoped_refptr<DecoderBuffer> file_data_;
@@ -1087,7 +1079,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) {
}
// Verify that VP8 video with inband text track can be played back.
-TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) {
+TEST_F(PipelineIntegrationTest,
+ BasicPlayback_VP8_WebVTT_WebM) {
ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
PIPELINE_OK));
Play();
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/source_buffer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698