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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1053113002: Prime the landing pad for the new video rendering pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments. Revert canvas changes. Created 5 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
« media/base/video_renderer_sink.h ('K') | « media/renderers/video_renderer_impl_unittest.cc ('k') | media/test/pipeline_integration_test_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "media/base/cdm_callback_promise.h" 10 #include "media/base/cdm_callback_promise.h"
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 pipeline_->Start( 672 pipeline_->Start(
673 demuxer_.get(), CreateRenderer(), 673 demuxer_.get(), CreateRenderer(),
674 base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)), 674 base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
675 base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)), 675 base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
676 base::Bind(&PipelineIntegrationTest::OnStatusCallback, 676 base::Bind(&PipelineIntegrationTest::OnStatusCallback,
677 base::Unretained(this)), 677 base::Unretained(this)),
678 base::Bind(&PipelineIntegrationTest::OnMetadata, 678 base::Bind(&PipelineIntegrationTest::OnMetadata,
679 base::Unretained(this)), 679 base::Unretained(this)),
680 base::Bind(&PipelineIntegrationTest::OnBufferingStateChanged, 680 base::Bind(&PipelineIntegrationTest::OnBufferingStateChanged,
681 base::Unretained(this)), 681 base::Unretained(this)),
682 base::Bind(&PipelineIntegrationTest::OnVideoFramePaint,
683 base::Unretained(this)),
684 base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack, 682 base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack,
685 base::Unretained(this)), 683 base::Unretained(this)),
686 base::Bind(&PipelineIntegrationTest::OnWaitingForDecryptionKey, 684 base::Bind(&PipelineIntegrationTest::OnWaitingForDecryptionKey,
687 base::Unretained(this))); 685 base::Unretained(this)));
688 message_loop_.Run(); 686 message_loop_.Run();
689 EXPECT_EQ(PIPELINE_OK, pipeline_status_); 687 EXPECT_EQ(PIPELINE_OK, pipeline_status_);
690 } 688 }
691 689
692 void StartHashedPipelineWithMediaSource(MockMediaSource* source) { 690 void StartHashedPipelineWithMediaSource(MockMediaSource* source) {
693 hashing_enabled_ = true; 691 hashing_enabled_ = true;
(...skipping 24 matching lines...) Expand all
718 pipeline_->Start( 716 pipeline_->Start(
719 demuxer_.get(), CreateRenderer(), 717 demuxer_.get(), CreateRenderer(),
720 base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)), 718 base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
721 base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)), 719 base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
722 base::Bind(&PipelineIntegrationTest::OnStatusCallback, 720 base::Bind(&PipelineIntegrationTest::OnStatusCallback,
723 base::Unretained(this)), 721 base::Unretained(this)),
724 base::Bind(&PipelineIntegrationTest::OnMetadata, 722 base::Bind(&PipelineIntegrationTest::OnMetadata,
725 base::Unretained(this)), 723 base::Unretained(this)),
726 base::Bind(&PipelineIntegrationTest::OnBufferingStateChanged, 724 base::Bind(&PipelineIntegrationTest::OnBufferingStateChanged,
727 base::Unretained(this)), 725 base::Unretained(this)),
728 base::Bind(&PipelineIntegrationTest::OnVideoFramePaint,
729 base::Unretained(this)),
730 base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack, 726 base::Closure(), base::Bind(&PipelineIntegrationTest::OnAddTextTrack,
731 base::Unretained(this)), 727 base::Unretained(this)),
732 base::Bind(&PipelineIntegrationTest::OnWaitingForDecryptionKey, 728 base::Bind(&PipelineIntegrationTest::OnWaitingForDecryptionKey,
733 base::Unretained(this))); 729 base::Unretained(this)));
734 730
735 source->set_encrypted_media_init_data_cb( 731 source->set_encrypted_media_init_data_cb(
736 base::Bind(&FakeEncryptedMedia::OnEncryptedMediaInitData, 732 base::Bind(&FakeEncryptedMedia::OnEncryptedMediaInitData,
737 base::Unretained(encrypted_media))); 733 base::Unretained(encrypted_media)));
738 734
739 message_loop_.Run(); 735 message_loop_.Run();
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 1736
1741 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 1737 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
1742 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 1738 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
1743 Play(); 1739 Play();
1744 ASSERT_TRUE(WaitUntilOnEnded()); 1740 ASSERT_TRUE(WaitUntilOnEnded());
1745 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 1741 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
1746 demuxer_->GetStartTime()); 1742 demuxer_->GetStartTime());
1747 } 1743 }
1748 1744
1749 } // namespace media 1745 } // namespace media
OLDNEW
« media/base/video_renderer_sink.h ('K') | « 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