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

Side by Side Diff: media/mojo/clients/mojo_renderer_unittest.cc

Issue 2643743002: Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process (Closed)
Patch Set: Rebase and make sure to unbind mojom::DemuxerPtr on the bound thread during termination Created 3 years, 10 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
« no previous file with comments | « media/mojo/clients/mojo_renderer.cc ('k') | media/mojo/common/BUILD.gn » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/test/test_message_loop.h" 11 #include "base/test/test_message_loop.h"
12 #include "base/threading/platform_thread.h" 12 #include "base/threading/platform_thread.h"
13 #include "base/threading/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "base/timer/elapsed_timer.h" 14 #include "base/timer/elapsed_timer.h"
15 #include "media/base/audio_renderer_sink.h" 15 #include "media/base/audio_renderer_sink.h"
16 #include "media/base/cdm_config.h" 16 #include "media/base/cdm_config.h"
17 #include "media/base/cdm_context.h" 17 #include "media/base/cdm_context.h"
18 #include "media/base/gmock_callback_support.h" 18 #include "media/base/gmock_callback_support.h"
19 #include "media/base/mock_filters.h" 19 #include "media/base/mock_filters.h"
20 #include "media/base/test_helpers.h" 20 #include "media/base/test_helpers.h"
21 #include "media/base/video_renderer_sink.h" 21 #include "media/base/video_renderer_sink.h"
22 #include "media/cdm/default_cdm_factory.h" 22 #include "media/cdm/default_cdm_factory.h"
23 #include "media/mojo/clients/mojo_renderer.h" 23 #include "media/mojo/clients/mojo_renderer.h"
24 #include "media/mojo/common/media_type_converters.h" 24 #include "media/mojo/common/media_type_converters.h"
25 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 25 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
26 #include "media/mojo/interfaces/renderer.mojom.h" 26 #include "media/mojo/interfaces/renderer.mojom.h"
27 #include "media/mojo/services/mojo_cdm_service.h" 27 #include "media/mojo/services/mojo_cdm_service.h"
28 #include "media/mojo/services/mojo_cdm_service_context.h" 28 #include "media/mojo/services/mojo_cdm_service_context.h"
29 #include "media/mojo/services/mojo_demuxer_service_context.h"
29 #include "media/mojo/services/mojo_renderer_service.h" 30 #include "media/mojo/services/mojo_renderer_service.h"
30 #include "media/renderers/video_overlay_factory.h" 31 #include "media/renderers/video_overlay_factory.h"
31 #include "mojo/public/cpp/bindings/interface_request.h" 32 #include "mojo/public/cpp/bindings/interface_request.h"
32 #include "mojo/public/cpp/bindings/strong_binding.h" 33 #include "mojo/public/cpp/bindings/strong_binding.h"
33 #include "testing/gtest/include/gtest/gtest.h" 34 #include "testing/gtest/include/gtest/gtest.h"
34 35
35 using ::testing::_; 36 using ::testing::_;
36 using ::testing::DoAll; 37 using ::testing::DoAll;
37 using ::testing::Return; 38 using ::testing::Return;
38 using ::testing::SaveArg; 39 using ::testing::SaveArg;
(...skipping 19 matching lines...) Expand all
58 59
59 class MojoRendererTest : public ::testing::Test { 60 class MojoRendererTest : public ::testing::Test {
60 public: 61 public:
61 MojoRendererTest() { 62 MojoRendererTest() {
62 std::unique_ptr<StrictMock<MockRenderer>> mock_renderer( 63 std::unique_ptr<StrictMock<MockRenderer>> mock_renderer(
63 new StrictMock<MockRenderer>()); 64 new StrictMock<MockRenderer>());
64 mock_renderer_ = mock_renderer.get(); 65 mock_renderer_ = mock_renderer.get();
65 66
66 mojom::RendererPtr remote_renderer; 67 mojom::RendererPtr remote_renderer;
67 renderer_binding_ = MojoRendererService::Create( 68 renderer_binding_ = MojoRendererService::Create(
69 mojo_demuxer_service_context_.GetWeakPtr(),
68 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr, 70 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr,
69 std::move(mock_renderer), 71 std::move(mock_renderer),
70 MojoRendererService::InitiateSurfaceRequestCB(), 72 MojoRendererService::InitiateSurfaceRequestCB(),
71 mojo::MakeRequest(&remote_renderer)); 73 mojo::MakeRequest(&remote_renderer));
72 74
73 mojo_renderer_.reset( 75 mojo_renderer_.reset(
74 new MojoRenderer(message_loop_.task_runner(), 76 new MojoRenderer(message_loop_.task_runner(),
75 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr, 77 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr,
76 nullptr, std::move(remote_renderer))); 78 nullptr, std::move(remote_renderer)));
77 79
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 mojom::ContentDecryptionModulePtr remote_cdm_; 209 mojom::ContentDecryptionModulePtr remote_cdm_;
208 210
209 // Client side mock demuxer and demuxer streams. 211 // Client side mock demuxer and demuxer streams.
210 StrictMock<MockDemuxer> demuxer_; 212 StrictMock<MockDemuxer> demuxer_;
211 std::unique_ptr<StrictMock<MockDemuxerStream>> audio_stream_; 213 std::unique_ptr<StrictMock<MockDemuxerStream>> audio_stream_;
212 std::unique_ptr<StrictMock<MockDemuxerStream>> video_stream_; 214 std::unique_ptr<StrictMock<MockDemuxerStream>> video_stream_;
213 215
214 // Service side mocks and helpers. 216 // Service side mocks and helpers.
215 StrictMock<MockRenderer>* mock_renderer_; 217 StrictMock<MockRenderer>* mock_renderer_;
216 MojoCdmServiceContext mojo_cdm_service_context_; 218 MojoCdmServiceContext mojo_cdm_service_context_;
219 MojoDemuxerServiceContext mojo_demuxer_service_context_;
217 RendererClient* remote_renderer_client_; 220 RendererClient* remote_renderer_client_;
218 DefaultCdmFactory cdm_factory_; 221 DefaultCdmFactory cdm_factory_;
219 222
220 mojo::StrongBindingPtr<mojom::Renderer> renderer_binding_; 223 mojo::StrongBindingPtr<mojom::Renderer> renderer_binding_;
221 224
222 private: 225 private:
223 DISALLOW_COPY_AND_ASSIGN(MojoRendererTest); 226 DISALLOW_COPY_AND_ASSIGN(MojoRendererTest);
224 }; 227 };
225 228
226 TEST_F(MojoRendererTest, Initialize_Success) { 229 TEST_F(MojoRendererTest, Initialize_Success) {
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 Play(); 462 Play();
460 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE); 463 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE);
461 base::RunLoop().RunUntilIdle(); 464 base::RunLoop().RunUntilIdle();
462 465
463 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1); 466 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1);
464 mojo_renderer_->SetPlaybackRate(0.0); 467 mojo_renderer_->SetPlaybackRate(0.0);
465 Flush(); 468 Flush();
466 } 469 }
467 470
468 } // namespace media 471 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/clients/mojo_renderer.cc ('k') | media/mojo/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698