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

Side by Side Diff: content/renderer/media/webmediaplayer_ms.h

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 public NON_EXPORTED_BASE(media::WebMediaPlayerDelegate::Observer), 66 public NON_EXPORTED_BASE(media::WebMediaPlayerDelegate::Observer),
67 public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>) { 67 public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>) {
68 public: 68 public:
69 // Construct a WebMediaPlayerMS with reference to the client, and 69 // Construct a WebMediaPlayerMS with reference to the client, and
70 // a MediaStreamClient which provides MediaStreamVideoRenderer. 70 // a MediaStreamClient which provides MediaStreamVideoRenderer.
71 // |delegate| must not be null. 71 // |delegate| must not be null.
72 WebMediaPlayerMS( 72 WebMediaPlayerMS(
73 blink::WebFrame* frame, 73 blink::WebFrame* frame,
74 blink::WebMediaPlayerClient* client, 74 blink::WebMediaPlayerClient* client,
75 media::WebMediaPlayerDelegate* delegate, 75 media::WebMediaPlayerDelegate* delegate,
76 media::MediaLog* media_log, 76 std::unique_ptr<media::MediaLog> media_log,
77 std::unique_ptr<MediaStreamRendererFactory> factory, 77 std::unique_ptr<MediaStreamRendererFactory> factory,
78 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_, 78 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_,
79 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner, 79 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner,
80 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner, 80 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
81 scoped_refptr<base::TaskRunner> worker_task_runner, 81 scoped_refptr<base::TaskRunner> worker_task_runner,
82 media::GpuVideoAcceleratorFactories* gpu_factories, 82 media::GpuVideoAcceleratorFactories* gpu_factories,
83 const blink::WebString& sink_id, 83 const blink::WebString& sink_id,
84 const blink::WebSecurityOrigin& security_origin); 84 const blink::WebSecurityOrigin& security_origin);
85 85
86 ~WebMediaPlayerMS() override; 86 ~WebMediaPlayerMS() override;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 scoped_refptr<MediaStreamVideoRenderer> video_frame_provider_; // Weak 226 scoped_refptr<MediaStreamVideoRenderer> video_frame_provider_; // Weak
227 227
228 std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_; 228 std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_;
229 229
230 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; // Weak 230 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; // Weak
231 media::SkCanvasVideoRenderer video_renderer_; 231 media::SkCanvasVideoRenderer video_renderer_;
232 232
233 bool paused_; 233 bool paused_;
234 media::VideoRotation video_rotation_; 234 media::VideoRotation video_rotation_;
235 235
236 scoped_refptr<media::MediaLog> media_log_; 236 std::unique_ptr<media::MediaLog> media_log_;
237 237
238 std::unique_ptr<MediaStreamRendererFactory> renderer_factory_; 238 std::unique_ptr<MediaStreamRendererFactory> renderer_factory_;
239 239
240 const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; 240 const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
241 const scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 241 const scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
242 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; 242 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
243 const scoped_refptr<base::TaskRunner> worker_task_runner_; 243 const scoped_refptr<base::TaskRunner> worker_task_runner_;
244 media::GpuVideoAcceleratorFactories* gpu_factories_; 244 media::GpuVideoAcceleratorFactories* gpu_factories_;
245 245
246 // Used for DCHECKs to ensure methods calls executed in the correct thread. 246 // Used for DCHECKs to ensure methods calls executed in the correct thread.
(...skipping 14 matching lines...) Expand all
261 // True if playback should be started upon the next call to OnShown(). Only 261 // True if playback should be started upon the next call to OnShown(). Only
262 // used on Android. 262 // used on Android.
263 bool should_play_upon_shown_; 263 bool should_play_upon_shown_;
264 264
265 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 265 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
266 }; 266 };
267 267
268 } // namespace content 268 } // namespace content
269 269
270 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 270 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW
« no previous file with comments | « content/renderer/media/render_media_log_unittest.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698