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

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

Issue 2016053003: Add audio_device_id in mojo media ServiceFactory CreateRenderer api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Minor changes according to the code review. Created 4 years, 6 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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 void SetUp() override { 679 void SetUp() override {
680 ShellTest::SetUp(); 680 ShellTest::SetUp();
681 InitializeMediaLibrary(); 681 InitializeMediaLibrary();
682 } 682 }
683 683
684 protected: 684 protected:
685 std::unique_ptr<Renderer> CreateRenderer() override { 685 std::unique_ptr<Renderer> CreateRenderer() override {
686 connector()->ConnectToInterface("mojo:media", &media_service_factory_); 686 connector()->ConnectToInterface("mojo:media", &media_service_factory_);
687 687
688 mojom::RendererPtr mojo_renderer; 688 mojom::RendererPtr mojo_renderer;
689 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); 689 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer),
690 std::string());
690 691
691 return base::WrapUnique(new MojoRendererImpl(message_loop_.task_runner(), 692 return base::WrapUnique(new MojoRendererImpl(message_loop_.task_runner(),
692 std::move(mojo_renderer))); 693 std::move(mojo_renderer)));
693 } 694 }
694 695
695 private: 696 private:
696 mojom::ServiceFactoryPtr media_service_factory_; 697 mojom::ServiceFactoryPtr media_service_factory_;
697 }; 698 };
698 #else 699 #else
699 class PipelineIntegrationTestHost : public testing::Test, 700 class PipelineIntegrationTestHost : public testing::Test,
(...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
2216 2217
2217 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2218 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2218 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2219 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2219 Play(); 2220 Play();
2220 ASSERT_TRUE(WaitUntilOnEnded()); 2221 ASSERT_TRUE(WaitUntilOnEnded());
2221 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2222 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2222 demuxer_->GetStartTime()); 2223 demuxer_->GetStartTime());
2223 } 2224 }
2224 2225
2225 } // namespace media 2226 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698