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

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

Issue 1358883003: Use GpuMemoryBufferVideoFramePool for WebMediaPlayerMS and MediaStreamVideoRendererSink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@send-gmbs
Patch Set: Created 5 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 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 "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "base/synchronization/lock.h" 11 #include "base/synchronization/lock.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.h"
13 #include "cc/layers/video_frame_provider.h" 13 #include "cc/layers/video_frame_provider.h"
14 #include "media/blink/skcanvas_video_renderer.h" 14 #include "media/blink/skcanvas_video_renderer.h"
15 #include "media/blink/webmediaplayer_util.h" 15 #include "media/blink/webmediaplayer_util.h"
16 #include "media/renderers/gpu_video_accelerator_factories.h"
16 #include "skia/ext/platform_canvas.h" 17 #include "skia/ext/platform_canvas.h"
17 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 18 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
19 20
20 namespace blink { 21 namespace blink {
21 class WebFrame; 22 class WebFrame;
22 class WebGraphicsContext3D; 23 class WebGraphicsContext3D;
23 class WebMediaPlayerClient; 24 class WebMediaPlayerClient;
24 } 25 }
25 26
(...skipping 24 matching lines...) Expand all
50 // plays audio streams. 51 // plays audio streams.
51 // 52 //
52 // blink::WebMediaPlayerClient 53 // blink::WebMediaPlayerClient
53 // WebKit client of this media player object. 54 // WebKit client of this media player object.
54 class WebMediaPlayerMS 55 class WebMediaPlayerMS
55 : public blink::WebMediaPlayer, 56 : public blink::WebMediaPlayer,
56 public base::SupportsWeakPtr<WebMediaPlayerMS> { 57 public base::SupportsWeakPtr<WebMediaPlayerMS> {
57 public: 58 public:
58 // Construct a WebMediaPlayerMS with reference to the client, and 59 // Construct a WebMediaPlayerMS with reference to the client, and
59 // a MediaStreamClient which provides VideoFrameProvider. 60 // a MediaStreamClient which provides VideoFrameProvider.
60 WebMediaPlayerMS(blink::WebFrame* frame, 61 WebMediaPlayerMS(
61 blink::WebMediaPlayerClient* client, 62 blink::WebFrame* frame,
62 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, 63 blink::WebMediaPlayerClient* client,
63 media::MediaLog* media_log, 64 base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
64 scoped_ptr<MediaStreamRendererFactory> factory, 65 media::MediaLog* media_log,
65 const scoped_refptr<base::SingleThreadTaskRunner>& 66 scoped_ptr<MediaStreamRendererFactory> factory,
66 compositor_task_runner); 67 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
68 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
69 const scoped_refptr<base::TaskRunner>& worker_task_runner,
70 const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories);
67 71
68 virtual ~WebMediaPlayerMS(); 72 virtual ~WebMediaPlayerMS();
69 73
70 virtual void load(LoadType load_type, 74 virtual void load(LoadType load_type,
71 const blink::WebURL& url, 75 const blink::WebURL& url,
72 CORSMode cors_mode); 76 CORSMode cors_mode);
73 77
74 // Playback controls. 78 // Playback controls.
75 virtual void play(); 79 virtual void play();
76 virtual void pause(); 80 virtual void pause();
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 bool received_first_frame_; 228 bool received_first_frame_;
225 229
226 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; 230 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;
227 231
228 media::SkCanvasVideoRenderer video_renderer_; 232 media::SkCanvasVideoRenderer video_renderer_;
229 233
230 scoped_refptr<media::MediaLog> media_log_; 234 scoped_refptr<media::MediaLog> media_log_;
231 235
232 scoped_ptr<MediaStreamRendererFactory> renderer_factory_; 236 scoped_ptr<MediaStreamRendererFactory> renderer_factory_;
233 237
238 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
239 const scoped_refptr<base::TaskRunner> worker_task_runner_;
240 const scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
234 241
235 // Used for DCHECKs to ensure methods calls executed in the correct thread. 242 // Used for DCHECKs to ensure methods calls executed in the correct thread.
236 base::ThreadChecker thread_checker_; 243 base::ThreadChecker thread_checker_;
237 244
238 // WebMediaPlayerMS owns the Compositor instance, but the destructions of 245 // WebMediaPlayerMS owns the Compositor instance, but the destructions of
239 // compositor should take place on Compositor Thread. 246 // compositor should take place on Compositor Thread.
240 scoped_ptr<Compositor> compositor_; 247 scoped_ptr<Compositor> compositor_;
241 248
242 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 249 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
243 250
244 251
245 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 252 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
246 }; 253 };
247 254
248 } // namespace content 255 } // namespace content
249 256
250 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 257 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698