| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 MockMediaSource(const std::string& filename, | 473 MockMediaSource(const std::string& filename, |
| 474 const std::string& mimetype, | 474 const std::string& mimetype, |
| 475 size_t initial_append_size) | 475 size_t initial_append_size) |
| 476 : current_position_(0), | 476 : current_position_(0), |
| 477 initial_append_size_(initial_append_size), | 477 initial_append_size_(initial_append_size), |
| 478 mimetype_(mimetype), | 478 mimetype_(mimetype), |
| 479 chunk_demuxer_(new ChunkDemuxer( | 479 chunk_demuxer_(new ChunkDemuxer( |
| 480 base::Bind(&MockMediaSource::DemuxerOpened, base::Unretained(this)), | 480 base::Bind(&MockMediaSource::DemuxerOpened, base::Unretained(this)), |
| 481 base::Bind(&MockMediaSource::OnEncryptedMediaInitData, | 481 base::Bind(&MockMediaSource::OnEncryptedMediaInitData, |
| 482 base::Unretained(this)), | 482 base::Unretained(this)), |
| 483 scoped_refptr<MediaLog>(new MediaLog()), | 483 scoped_refptr<MediaLog>(new MediaLog()))), |
| 484 true)), | |
| 485 owned_chunk_demuxer_(chunk_demuxer_) { | 484 owned_chunk_demuxer_(chunk_demuxer_) { |
| 486 file_data_ = ReadTestDataFile(filename); | 485 file_data_ = ReadTestDataFile(filename); |
| 487 | 486 |
| 488 if (initial_append_size_ == kAppendWholeFile) | 487 if (initial_append_size_ == kAppendWholeFile) |
| 489 initial_append_size_ = file_data_->data_size(); | 488 initial_append_size_ = file_data_->data_size(); |
| 490 | 489 |
| 491 DCHECK_GT(initial_append_size_, 0u); | 490 DCHECK_GT(initial_append_size_, 0u); |
| 492 DCHECK_LE(initial_append_size_, file_data_->data_size()); | 491 DCHECK_LE(initial_append_size_, file_data_->data_size()); |
| 493 } | 492 } |
| 494 | 493 |
| (...skipping 1882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2377 | 2376 |
| 2378 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2377 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
| 2379 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2378 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
| 2380 Play(); | 2379 Play(); |
| 2381 ASSERT_TRUE(WaitUntilOnEnded()); | 2380 ASSERT_TRUE(WaitUntilOnEnded()); |
| 2382 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2381 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
| 2383 demuxer_->GetStartTime()); | 2382 demuxer_->GetStartTime()); |
| 2384 } | 2383 } |
| 2385 | 2384 |
| 2386 } // namespace media | 2385 } // namespace media |
| OLD | NEW |