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/string_util.h" | 9 #include "base/string_util.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 | 309 |
310 CHECK_EQ(chunk_demuxer_->AddId(kSourceId, type, codecs), ChunkDemuxer::kOk); | 310 CHECK_EQ(chunk_demuxer_->AddId(kSourceId, type, codecs), ChunkDemuxer::kOk); |
311 AppendData(initial_append_size_); | 311 AppendData(initial_append_size_); |
312 } | 312 } |
313 | 313 |
314 void DemuxerNeedKey(const std::string& type, | 314 void DemuxerNeedKey(const std::string& type, |
315 scoped_ptr<uint8[]> init_data, int init_data_size) { | 315 scoped_ptr<uint8[]> init_data, int init_data_size) { |
316 DCHECK(init_data.get()); | 316 DCHECK(init_data.get()); |
317 DCHECK_GT(init_data_size, 0); | 317 DCHECK_GT(init_data_size, 0); |
318 CHECK(!need_key_cb_.is_null()); | 318 CHECK(!need_key_cb_.is_null()); |
319 need_key_cb_.Run("", "", type, init_data.Pass(), init_data_size); | 319 need_key_cb_.Run( |
| 320 std::string(), std::string(), type, init_data.Pass(), init_data_size); |
320 } | 321 } |
321 | 322 |
322 private: | 323 private: |
323 base::FilePath file_path_; | 324 base::FilePath file_path_; |
324 scoped_refptr<DecoderBuffer> file_data_; | 325 scoped_refptr<DecoderBuffer> file_data_; |
325 int current_position_; | 326 int current_position_; |
326 int initial_append_size_; | 327 int initial_append_size_; |
327 std::string mimetype_; | 328 std::string mimetype_; |
328 scoped_refptr<ChunkDemuxer> chunk_demuxer_; | 329 scoped_refptr<ChunkDemuxer> chunk_demuxer_; |
329 NeedKeyCB need_key_cb_; | 330 NeedKeyCB need_key_cb_; |
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
916 // back. | 917 // back. |
917 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333 | 918 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333 |
918 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { | 919 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { |
919 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), | 920 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), |
920 PIPELINE_OK)); | 921 PIPELINE_OK)); |
921 Play(); | 922 Play(); |
922 ASSERT_TRUE(WaitUntilOnEnded()); | 923 ASSERT_TRUE(WaitUntilOnEnded()); |
923 } | 924 } |
924 | 925 |
925 } // namespace media | 926 } // namespace media |
OLD | NEW |