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

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

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

Powered by Google App Engine
This is Rietveld 408576698