| 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 "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/stl_util.h" | 8 #include "base/stl_util.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 bool ShouldCreateDefaultRunLoop() override { return false; } | 630 bool ShouldCreateDefaultRunLoop() override { return false; } |
| 631 | 631 |
| 632 void SetUp() override { | 632 void SetUp() override { |
| 633 ApplicationTestBase::SetUp(); | 633 ApplicationTestBase::SetUp(); |
| 634 if (!IsMediaLibraryInitialized()) | 634 if (!IsMediaLibraryInitialized()) |
| 635 InitializeMediaLibraryForTesting(); | 635 InitializeMediaLibraryForTesting(); |
| 636 } | 636 } |
| 637 | 637 |
| 638 protected: | 638 protected: |
| 639 scoped_ptr<Renderer> CreateRenderer() override { | 639 scoped_ptr<Renderer> CreateRenderer() override { |
| 640 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
| 641 request->url = mojo::String::From("mojo:media"); |
| 640 mojo::ServiceProvider* service_provider = | 642 mojo::ServiceProvider* service_provider = |
| 641 application_impl() | 643 application_impl() |
| 642 ->ConnectToApplication("mojo://media") | 644 ->ConnectToApplication(request.Pass()) |
| 643 ->GetServiceProvider(); | 645 ->GetServiceProvider(); |
| 644 | 646 |
| 645 mojo::MediaRendererPtr mojo_media_renderer; | 647 mojo::MediaRendererPtr mojo_media_renderer; |
| 646 mojo::ConnectToService(service_provider, &mojo_media_renderer); | 648 mojo::ConnectToService(service_provider, &mojo_media_renderer); |
| 647 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(), | 649 return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(), |
| 648 mojo_media_renderer.Pass())); | 650 mojo_media_renderer.Pass())); |
| 649 } | 651 } |
| 650 }; | 652 }; |
| 651 #else | 653 #else |
| 652 class PipelineIntegrationTestHost : public testing::Test, | 654 class PipelineIntegrationTestHost : public testing::Test, |
| (...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1734 | 1736 |
| 1735 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 1737 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
| 1736 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 1738 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
| 1737 Play(); | 1739 Play(); |
| 1738 ASSERT_TRUE(WaitUntilOnEnded()); | 1740 ASSERT_TRUE(WaitUntilOnEnded()); |
| 1739 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 1741 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
| 1740 demuxer_->GetStartTime()); | 1742 demuxer_->GetStartTime()); |
| 1741 } | 1743 } |
| 1742 | 1744 |
| 1743 } // namespace media | 1745 } // namespace media |
| OLD | NEW |