| 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 } | 310 } |
| 311 | 311 |
| 312 void DemuxerNeedKey(const std::string& type, | 312 void DemuxerNeedKey(const std::string& type, |
| 313 scoped_array<uint8> init_data, int init_data_size) { | 313 scoped_array<uint8> init_data, int init_data_size) { |
| 314 DCHECK(init_data.get()); | 314 DCHECK(init_data.get()); |
| 315 DCHECK_GT(init_data_size, 0); | 315 DCHECK_GT(init_data_size, 0); |
| 316 need_key_cb_.Run("", "", type, init_data.Pass(), init_data_size); | 316 need_key_cb_.Run("", "", type, init_data.Pass(), init_data_size); |
| 317 } | 317 } |
| 318 | 318 |
| 319 private: | 319 private: |
| 320 FilePath file_path_; | 320 base::FilePath file_path_; |
| 321 scoped_refptr<DecoderBuffer> file_data_; | 321 scoped_refptr<DecoderBuffer> file_data_; |
| 322 int current_position_; | 322 int current_position_; |
| 323 int initial_append_size_; | 323 int initial_append_size_; |
| 324 std::string mimetype_; | 324 std::string mimetype_; |
| 325 scoped_refptr<ChunkDemuxer> chunk_demuxer_; | 325 scoped_refptr<ChunkDemuxer> chunk_demuxer_; |
| 326 NeedKeyCB need_key_cb_; | 326 NeedKeyCB need_key_cb_; |
| 327 }; | 327 }; |
| 328 | 328 |
| 329 class PipelineIntegrationTest | 329 class PipelineIntegrationTest |
| 330 : public testing::Test, | 330 : public testing::Test, |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 // back. | 867 // back. |
| 868 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333 | 868 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333 |
| 869 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { | 869 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { |
| 870 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), | 870 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), |
| 871 PIPELINE_OK)); | 871 PIPELINE_OK)); |
| 872 Play(); | 872 Play(); |
| 873 ASSERT_TRUE(WaitUntilOnEnded()); | 873 ASSERT_TRUE(WaitUntilOnEnded()); |
| 874 } | 874 } |
| 875 | 875 |
| 876 } // namespace media | 876 } // namespace media |
| OLD | NEW |