| OLD | NEW | 
|---|
| 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/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" | 
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" | 
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" | 
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 257   } | 257   } | 
| 258 | 258 | 
| 259   void AppendAtTime(const base::TimeDelta& timestampOffset, | 259   void AppendAtTime(const base::TimeDelta& timestampOffset, | 
| 260                     const uint8* pData, int size) { | 260                     const uint8* pData, int size) { | 
| 261     CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, timestampOffset)); | 261     CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, timestampOffset)); | 
| 262     chunk_demuxer_->AppendData(kSourceId, pData, size); | 262     chunk_demuxer_->AppendData(kSourceId, pData, size); | 
| 263     CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, base::TimeDelta())); | 263     CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, base::TimeDelta())); | 
| 264   } | 264   } | 
| 265 | 265 | 
| 266   void EndOfStream() { | 266   void EndOfStream() { | 
| 267     chunk_demuxer_->EndOfStream(PIPELINE_OK); | 267     chunk_demuxer_->MarkEndOfStream(PIPELINE_OK); | 
| 268   } | 268   } | 
| 269 | 269 | 
| 270   void Abort() { | 270   void Abort() { | 
| 271     if (!chunk_demuxer_) | 271     if (!chunk_demuxer_) | 
| 272       return; | 272       return; | 
| 273     chunk_demuxer_->Shutdown(); | 273     chunk_demuxer_->Shutdown(); | 
| 274     chunk_demuxer_ = NULL; | 274     chunk_demuxer_ = NULL; | 
| 275   } | 275   } | 
| 276 | 276 | 
| 277   void DemuxerOpened() { | 277   void DemuxerOpened() { | 
| (...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 948 | 948 | 
| 949 // Verify that VP8 video with inband text track can be played back. | 949 // Verify that VP8 video with inband text track can be played back. | 
| 950 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) { | 950 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) { | 
| 951   ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), | 951   ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), | 
| 952                     PIPELINE_OK)); | 952                     PIPELINE_OK)); | 
| 953   Play(); | 953   Play(); | 
| 954   ASSERT_TRUE(WaitUntilOnEnded()); | 954   ASSERT_TRUE(WaitUntilOnEnded()); | 
| 955 } | 955 } | 
| 956 | 956 | 
| 957 }  // namespace media | 957 }  // namespace media | 
| OLD | NEW | 
|---|