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/string_util.h" | 8 #include "base/string_util.h" |
9 #include "media/base/decoder_buffer.h" | 9 #include "media/base/decoder_buffer.h" |
10 #include "media/base/decryptor_client.h" | 10 #include "media/base/decryptor_client.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 class MockMediaSource { | 37 class MockMediaSource { |
38 public: | 38 public: |
39 MockMediaSource(const std::string& filename, const std::string& mimetype, | 39 MockMediaSource(const std::string& filename, const std::string& mimetype, |
40 int initial_append_size) | 40 int initial_append_size) |
41 : file_path_(GetTestDataFilePath(filename)), | 41 : file_path_(GetTestDataFilePath(filename)), |
42 current_position_(0), | 42 current_position_(0), |
43 initial_append_size_(initial_append_size), | 43 initial_append_size_(initial_append_size), |
44 mimetype_(mimetype) { | 44 mimetype_(mimetype) { |
45 chunk_demuxer_ = new ChunkDemuxer( | 45 chunk_demuxer_ = new ChunkDemuxer( |
46 base::Bind(&MockMediaSource::DemuxerOpened, base::Unretained(this)), | 46 base::Bind(&MockMediaSource::DemuxerOpened, base::Unretained(this)), |
47 base::Bind(&MockMediaSource::DemuxerNeedKey, base::Unretained(this))); | 47 base::Bind(&MockMediaSource::DemuxerNeedKey, base::Unretained(this)), |
| 48 ErrorLogCB()); |
48 | 49 |
49 file_data_ = ReadTestDataFile(filename); | 50 file_data_ = ReadTestDataFile(filename); |
50 | 51 |
51 if (initial_append_size_ == kAppendWholeFile) | 52 if (initial_append_size_ == kAppendWholeFile) |
52 initial_append_size_ = file_data_->GetDataSize(); | 53 initial_append_size_ = file_data_->GetDataSize(); |
53 | 54 |
54 DCHECK_GT(initial_append_size_, 0); | 55 DCHECK_GT(initial_append_size_, 0); |
55 DCHECK_LE(initial_append_size_, file_data_->GetDataSize()); | 56 DCHECK_LE(initial_append_size_, file_data_->GetDataSize()); |
56 } | 57 } |
57 | 58 |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 // Verify video decoder & renderer can handle aborted demuxer reads. | 443 // Verify video decoder & renderer can handle aborted demuxer reads. |
443 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { | 444 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { |
444 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, | 445 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, |
445 32768, | 446 32768, |
446 base::TimeDelta::FromMilliseconds(200), | 447 base::TimeDelta::FromMilliseconds(200), |
447 base::TimeDelta::FromMilliseconds(1668), | 448 base::TimeDelta::FromMilliseconds(1668), |
448 0x1C896, 65536)); | 449 0x1C896, 65536)); |
449 } | 450 } |
450 | 451 |
451 } // namespace media | 452 } // namespace media |
OLD | NEW |