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

Side by Side Diff: media/mojo/services/mojo_renderer_service.h

Issue 2281843003: Move ownership of audio/video sinks to MojoRendererService. (Closed)
Patch Set: rebase Created 4 years, 3 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/services/mojo_media_client.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
17 #include "media/base/buffering_state.h" 17 #include "media/base/buffering_state.h"
18 #include "media/base/demuxer_stream_provider.h" 18 #include "media/base/demuxer_stream_provider.h"
19 #include "media/base/pipeline_status.h" 19 #include "media/base/pipeline_status.h"
20 #include "media/base/renderer_client.h" 20 #include "media/base/renderer_client.h"
21 #include "media/mojo/interfaces/renderer.mojom.h" 21 #include "media/mojo/interfaces/renderer.mojom.h"
22 #include "media/mojo/services/media_mojo_export.h" 22 #include "media/mojo/services/media_mojo_export.h"
23 #include "mojo/public/cpp/bindings/strong_binding.h" 23 #include "mojo/public/cpp/bindings/strong_binding.h"
24 24
25 namespace media { 25 namespace media {
26 26
27 class AudioRendererSink;
27 class DemuxerStreamProviderShim; 28 class DemuxerStreamProviderShim;
28 class MediaKeys; 29 class MediaKeys;
29 class MojoCdmServiceContext; 30 class MojoCdmServiceContext;
30 class Renderer; 31 class Renderer;
32 class VideoRendererSink;
31 33
32 // A mojom::Renderer implementation that use a media::Renderer to render 34 // A mojom::Renderer implementation that use a media::Renderer to render
33 // media streams. 35 // media streams.
34 class MEDIA_MOJO_EXPORT MojoRendererService 36 class MEDIA_MOJO_EXPORT MojoRendererService
35 : NON_EXPORTED_BASE(public mojom::Renderer), 37 : NON_EXPORTED_BASE(public mojom::Renderer),
36 public RendererClient { 38 public RendererClient {
37 public: 39 public:
38 // |mojo_cdm_service_context| can be used to find the CDM to support 40 // |mojo_cdm_service_context| can be used to find the CDM to support
39 // encrypted media. If null, encrypted media is not supported. 41 // encrypted media. If null, encrypted media is not supported.
40 MojoRendererService( 42 MojoRendererService(
41 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context, 43 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
44 scoped_refptr<AudioRendererSink> audio_sink,
45 std::unique_ptr<VideoRendererSink> video_sink,
42 std::unique_ptr<media::Renderer> renderer, 46 std::unique_ptr<media::Renderer> renderer,
43 mojo::InterfaceRequest<mojom::Renderer> request); 47 mojo::InterfaceRequest<mojom::Renderer> request);
44 ~MojoRendererService() final; 48 ~MojoRendererService() final;
45 49
46 // mojom::Renderer implementation. 50 // mojom::Renderer implementation.
47 void Initialize(mojom::RendererClientPtr client, 51 void Initialize(mojom::RendererClientPtr client,
48 mojom::DemuxerStreamPtr audio, 52 mojom::DemuxerStreamPtr audio,
49 mojom::DemuxerStreamPtr video, 53 mojom::DemuxerStreamPtr video,
50 const base::Optional<GURL>& url, 54 const base::Optional<GURL>& url,
51 const InitializeCallback& callback) final; 55 const InitializeCallback& callback) final;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 111
108 base::RepeatingTimer time_update_timer_; 112 base::RepeatingTimer time_update_timer_;
109 base::TimeDelta last_media_time_; 113 base::TimeDelta last_media_time_;
110 114
111 mojom::RendererClientPtr client_; 115 mojom::RendererClientPtr client_;
112 116
113 // Hold a reference to the CDM set on the |renderer_| so that the CDM won't be 117 // Hold a reference to the CDM set on the |renderer_| so that the CDM won't be
114 // destructed while the |renderer_| is still using it. 118 // destructed while the |renderer_| is still using it.
115 scoped_refptr<MediaKeys> cdm_; 119 scoped_refptr<MediaKeys> cdm_;
116 120
121 // Audio and Video sinks.
122 // May be null if underlying |renderer_| does not use them.
123 scoped_refptr<AudioRendererSink> audio_sink_;
124 std::unique_ptr<VideoRendererSink> video_sink_;
125
117 // Note: Destroy |renderer_| first to avoid access violation into other 126 // Note: Destroy |renderer_| first to avoid access violation into other
118 // members, e.g. |stream_provider_| and |cdm_|. 127 // members, e.g. |stream_provider_|, |cdm_|, |audio_sink_|, and
128 // |video_sink_|.
119 // Must use "media::" because "Renderer" is ambiguous. 129 // Must use "media::" because "Renderer" is ambiguous.
120 std::unique_ptr<media::Renderer> renderer_; 130 std::unique_ptr<media::Renderer> renderer_;
121 131
122 base::WeakPtr<MojoRendererService> weak_this_; 132 base::WeakPtr<MojoRendererService> weak_this_;
123 base::WeakPtrFactory<MojoRendererService> weak_factory_; 133 base::WeakPtrFactory<MojoRendererService> weak_factory_;
124 134
125 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); 135 DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
126 }; 136 };
127 137
128 } // namespace media 138 } // namespace media
129 139
130 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 140 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_client.cc ('k') | media/mojo/services/mojo_renderer_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698