| 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 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 public: | 655 public: |
| 656 bool ShouldCreateDefaultRunLoop() override { return false; } | 656 bool ShouldCreateDefaultRunLoop() override { return false; } |
| 657 | 657 |
| 658 void SetUp() override { | 658 void SetUp() override { |
| 659 ApplicationTestBase::SetUp(); | 659 ApplicationTestBase::SetUp(); |
| 660 InitializeMediaLibrary(); | 660 InitializeMediaLibrary(); |
| 661 } | 661 } |
| 662 | 662 |
| 663 protected: | 663 protected: |
| 664 scoped_ptr<Renderer> CreateRenderer() override { | 664 scoped_ptr<Renderer> CreateRenderer() override { |
| 665 shell()->ConnectToInterface("mojo:media", &media_service_factory_); | 665 connector()->ConnectToInterface("mojo:media", &media_service_factory_); |
| 666 | 666 |
| 667 interfaces::RendererPtr mojo_renderer; | 667 interfaces::RendererPtr mojo_renderer; |
| 668 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); | 668 media_service_factory_->CreateRenderer(mojo::GetProxy(&mojo_renderer)); |
| 669 | 669 |
| 670 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(), | 670 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(), |
| 671 std::move(mojo_renderer))); | 671 std::move(mojo_renderer))); |
| 672 } | 672 } |
| 673 | 673 |
| 674 private: | 674 private: |
| 675 interfaces::ServiceFactoryPtr media_service_factory_; | 675 interfaces::ServiceFactoryPtr media_service_factory_; |
| (...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2020 | 2020 |
| 2021 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2021 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
| 2022 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2022 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
| 2023 Play(); | 2023 Play(); |
| 2024 ASSERT_TRUE(WaitUntilOnEnded()); | 2024 ASSERT_TRUE(WaitUntilOnEnded()); |
| 2025 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2025 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
| 2026 demuxer_->GetStartTime()); | 2026 demuxer_->GetStartTime()); |
| 2027 } | 2027 } |
| 2028 | 2028 |
| 2029 } // namespace media | 2029 } // namespace media |
| OLD | NEW |