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

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

Issue 2282633002: Integrate Surface requests with MediaPlayerRenderer (Closed)
Patch Set: Fixed MojoRenderService constructor 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
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
(...skipping 19 matching lines...) Expand all
30 class MojoCdmServiceContext; 30 class MojoCdmServiceContext;
31 class Renderer; 31 class Renderer;
32 class VideoRendererSink; 32 class VideoRendererSink;
33 33
34 // A mojom::Renderer implementation that use a media::Renderer to render 34 // A mojom::Renderer implementation that use a media::Renderer to render
35 // media streams. 35 // media streams.
36 class MEDIA_MOJO_EXPORT MojoRendererService 36 class MEDIA_MOJO_EXPORT MojoRendererService
37 : NON_EXPORTED_BASE(public mojom::Renderer), 37 : NON_EXPORTED_BASE(public mojom::Renderer),
38 public RendererClient { 38 public RendererClient {
39 public: 39 public:
40 using InitiateSurfaceRequestCB = base::Callback<uint64_t()>;
41
40 // |mojo_cdm_service_context| can be used to find the CDM to support 42 // |mojo_cdm_service_context| can be used to find the CDM to support
41 // encrypted media. If null, encrypted media is not supported. 43 // encrypted media. If null, encrypted media is not supported.
42 MojoRendererService( 44 MojoRendererService(
43 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context, 45 base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
44 scoped_refptr<AudioRendererSink> audio_sink, 46 scoped_refptr<AudioRendererSink> audio_sink,
45 std::unique_ptr<VideoRendererSink> video_sink, 47 std::unique_ptr<VideoRendererSink> video_sink,
46 std::unique_ptr<media::Renderer> renderer, 48 std::unique_ptr<media::Renderer> renderer,
47 mojo::InterfaceRequest<mojom::Renderer> request); 49 mojo::InterfaceRequest<mojom::Renderer> request,
50 InitiateSurfaceRequestCB initiate_surface_request_cb);
48 ~MojoRendererService() final; 51 ~MojoRendererService() final;
49 52
50 // mojom::Renderer implementation. 53 // mojom::Renderer implementation.
51 void Initialize(mojom::RendererClientPtr client, 54 void Initialize(mojom::RendererClientPtr client,
52 mojom::DemuxerStreamPtr audio, 55 mojom::DemuxerStreamPtr audio,
53 mojom::DemuxerStreamPtr video, 56 mojom::DemuxerStreamPtr video,
54 const base::Optional<GURL>& url, 57 const base::Optional<GURL>& url,
55 const InitializeCallback& callback) final; 58 const InitializeCallback& callback) final;
56 void Flush(const FlushCallback& callback) final; 59 void Flush(const FlushCallback& callback) final;
57 void StartPlayingFrom(base::TimeDelta time_delta) final; 60 void StartPlayingFrom(base::TimeDelta time_delta) final;
58 void SetPlaybackRate(double playback_rate) final; 61 void SetPlaybackRate(double playback_rate) final;
59 void SetVolume(float volume) final; 62 void SetVolume(float volume) final;
60 void SetCdm(int32_t cdm_id, const SetCdmCallback& callback) final; 63 void SetCdm(int32_t cdm_id, const SetCdmCallback& callback) final;
64 void InitiateScopedSurfaceRequest(
65 const InitiateScopedSurfaceRequestCallback& callback) final;
61 66
62 private: 67 private:
63 enum State { 68 enum State {
64 STATE_UNINITIALIZED, 69 STATE_UNINITIALIZED,
65 STATE_INITIALIZING, 70 STATE_INITIALIZING,
66 STATE_FLUSHING, 71 STATE_FLUSHING,
67 STATE_PLAYING, 72 STATE_PLAYING,
68 STATE_ERROR 73 STATE_ERROR
69 }; 74 };
70 75
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // May be null if underlying |renderer_| does not use them. 127 // May be null if underlying |renderer_| does not use them.
123 scoped_refptr<AudioRendererSink> audio_sink_; 128 scoped_refptr<AudioRendererSink> audio_sink_;
124 std::unique_ptr<VideoRendererSink> video_sink_; 129 std::unique_ptr<VideoRendererSink> video_sink_;
125 130
126 // Note: Destroy |renderer_| first to avoid access violation into other 131 // Note: Destroy |renderer_| first to avoid access violation into other
127 // members, e.g. |stream_provider_|, |cdm_|, |audio_sink_|, and 132 // members, e.g. |stream_provider_|, |cdm_|, |audio_sink_|, and
128 // |video_sink_|. 133 // |video_sink_|.
129 // Must use "media::" because "Renderer" is ambiguous. 134 // Must use "media::" because "Renderer" is ambiguous.
130 std::unique_ptr<media::Renderer> renderer_; 135 std::unique_ptr<media::Renderer> renderer_;
131 136
137 // Registers a new request in the ScopedSurfaceRequestManager.
138 // Returns the token to be used to fulfill the request.
139 InitiateSurfaceRequestCB initiate_surface_request_cb_;
140
132 base::WeakPtr<MojoRendererService> weak_this_; 141 base::WeakPtr<MojoRendererService> weak_this_;
133 base::WeakPtrFactory<MojoRendererService> weak_factory_; 142 base::WeakPtrFactory<MojoRendererService> weak_factory_;
134 143
135 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); 144 DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
136 }; 145 };
137 146
138 } // namespace media 147 } // namespace media
139 148
140 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 149 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698