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

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

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

Powered by Google App Engine
This is Rietveld 408576698