Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: media/test/pipeline_integration_test.cc

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 MockMediaSource(const std::string& filename, 449 MockMediaSource(const std::string& filename,
450 const std::string& mimetype, 450 const std::string& mimetype,
451 size_t initial_append_size) 451 size_t initial_append_size)
452 : current_position_(0), 452 : current_position_(0),
453 initial_append_size_(initial_append_size), 453 initial_append_size_(initial_append_size),
454 mimetype_(mimetype), 454 mimetype_(mimetype),
455 chunk_demuxer_(new ChunkDemuxer( 455 chunk_demuxer_(new ChunkDemuxer(
456 base::Bind(&MockMediaSource::DemuxerOpened, base::Unretained(this)), 456 base::Bind(&MockMediaSource::DemuxerOpened, base::Unretained(this)),
457 base::Bind(&MockMediaSource::OnEncryptedMediaInitData, 457 base::Bind(&MockMediaSource::OnEncryptedMediaInitData,
458 base::Unretained(this)), 458 base::Unretained(this)),
459 scoped_refptr<MediaLog>(new MediaLog()))), 459 &media_log_)),
460 owned_chunk_demuxer_(chunk_demuxer_) { 460 owned_chunk_demuxer_(chunk_demuxer_) {
461 file_data_ = ReadTestDataFile(filename); 461 file_data_ = ReadTestDataFile(filename);
462 462
463 if (initial_append_size_ == kAppendWholeFile) 463 if (initial_append_size_ == kAppendWholeFile)
464 initial_append_size_ = file_data_->data_size(); 464 initial_append_size_ = file_data_->data_size();
465 465
466 DCHECK_GT(initial_append_size_, 0u); 466 DCHECK_GT(initial_append_size_, 0u);
467 DCHECK_LE(initial_append_size_, file_data_->data_size()); 467 DCHECK_LE(initial_append_size_, file_data_->data_size());
468 } 468 }
469 469
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 for (const auto& track : tracks->tracks()) { 626 for (const auto& track : tracks->tracks()) {
627 EXPECT_EQ(track_ids.end(), track_ids.find(track->id())); 627 EXPECT_EQ(track_ids.end(), track_ids.find(track->id()));
628 track_ids.insert(track->id()); 628 track_ids.insert(track->id());
629 } 629 }
630 InitSegmentReceivedMock(tracks); 630 InitSegmentReceivedMock(tracks);
631 } 631 }
632 632
633 MOCK_METHOD1(InitSegmentReceivedMock, void(std::unique_ptr<MediaTracks>&)); 633 MOCK_METHOD1(InitSegmentReceivedMock, void(std::unique_ptr<MediaTracks>&));
634 634
635 private: 635 private:
636 MediaLog media_log_;
636 scoped_refptr<DecoderBuffer> file_data_; 637 scoped_refptr<DecoderBuffer> file_data_;
637 size_t current_position_; 638 size_t current_position_;
638 size_t initial_append_size_; 639 size_t initial_append_size_;
639 std::string mimetype_; 640 std::string mimetype_;
640 ChunkDemuxer* chunk_demuxer_; 641 ChunkDemuxer* chunk_demuxer_;
641 std::unique_ptr<Demuxer> owned_chunk_demuxer_; 642 std::unique_ptr<Demuxer> owned_chunk_demuxer_;
642 PipelineStatusCB demuxer_failure_cb_; 643 PipelineStatusCB demuxer_failure_cb_;
643 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_; 644 Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
644 base::TimeDelta last_timestamp_offset_; 645 base::TimeDelta last_timestamp_offset_;
645 }; 646 };
(...skipping 2025 matching lines...) Expand 10 before | Expand all | Expand 10 after
2671 2672
2672 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2673 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2673 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2674 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2674 Play(); 2675 Play();
2675 ASSERT_TRUE(WaitUntilOnEnded()); 2676 ASSERT_TRUE(WaitUntilOnEnded());
2676 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2677 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2677 demuxer_->GetStartTime()); 2678 demuxer_->GetStartTime());
2678 } 2679 }
2679 2680
2680 } // namespace media 2681 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/video_renderer_impl_unittest.cc ('k') | media/test/pipeline_integration_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698