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

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

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
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 WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define WEBKIT_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 "cc/layers/video_frame_provider.h" 12 #include "cc/layers/video_frame_provider.h"
13 #include "content/common/content_export.h"
13 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
14 #include "media/filters/skcanvas_video_renderer.h" 15 #include "media/filters/skcanvas_video_renderer.h"
15 #include "skia/ext/platform_canvas.h" 16 #include "skia/ext/platform_canvas.h"
16 #include "third_party/WebKit/public/web/WebMediaPlayer.h" 17 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
17 18
18 namespace WebKit { 19 namespace WebKit {
19 class WebFrame; 20 class WebFrame;
20 class WebMediaPlayerClient; 21 class WebMediaPlayerClient;
21 } 22 }
22 23
23 namespace media { 24 namespace media {
24 class MediaLog; 25 class MediaLog;
25 } 26 }
26 27
27 namespace webkit { 28 namespace webkit {
28 class WebLayerImpl; 29 class WebLayerImpl;
29 } 30 }
30 31
31 namespace webkit_media { 32 namespace content {
32
33 class MediaStreamAudioRenderer; 33 class MediaStreamAudioRenderer;
34 class MediaStreamClient; 34 class MediaStreamClient;
35 class VideoFrameProvider; 35 class VideoFrameProvider;
36 class WebMediaPlayerDelegate; 36 class WebMediaPlayerDelegate;
37 37
38 // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to 38 // WebMediaPlayerMS delegates calls from WebCore::MediaPlayerPrivate to
39 // Chrome's media player when "src" is from media stream. 39 // Chrome's media player when "src" is from media stream.
40 // 40 //
41 // WebMediaPlayerMS works with multiple objects, the most important ones are: 41 // WebMediaPlayerMS works with multiple objects, the most important ones are:
42 // 42 //
43 // VideoFrameProvider 43 // VideoFrameProvider
44 // provides video frames for rendering. 44 // provides video frames for rendering.
45 // 45 //
46 // TODO(wjia): add AudioPlayer. 46 // TODO(wjia): add AudioPlayer.
47 // AudioPlayer 47 // AudioPlayer
48 // plays audio streams. 48 // plays audio streams.
49 // 49 //
50 // WebKit::WebMediaPlayerClient 50 // WebKit::WebMediaPlayerClient
51 // WebKit client of this media player object. 51 // WebKit client of this media player object.
52 class WebMediaPlayerMS 52 class CONTENT_EXPORT WebMediaPlayerMS
53 : public WebKit::WebMediaPlayer, 53 : public WebKit::WebMediaPlayer,
54 public cc::VideoFrameProvider, 54 public cc::VideoFrameProvider,
55 public base::SupportsWeakPtr<WebMediaPlayerMS> { 55 public base::SupportsWeakPtr<WebMediaPlayerMS> {
56 public: 56 public:
57 // Construct a WebMediaPlayerMS with reference to the client, and 57 // Construct a WebMediaPlayerMS with reference to the client, and
58 // a MediaStreamClient which provides VideoFrameProvider. 58 // a MediaStreamClient which provides VideoFrameProvider.
59 WebMediaPlayerMS(WebKit::WebFrame* frame, 59 WebMediaPlayerMS(WebKit::WebFrame* frame,
60 WebKit::WebMediaPlayerClient* client, 60 WebKit::WebMediaPlayerClient* client,
61 base::WeakPtr<WebMediaPlayerDelegate> delegate, 61 base::WeakPtr<WebMediaPlayerDelegate> delegate,
62 MediaStreamClient* media_stream_client, 62 MediaStreamClient* media_stream_client,
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 WebKit::WebTimeRanges buffered_; 146 WebKit::WebTimeRanges buffered_;
147 147
148 // Used for DCHECKs to ensure methods calls executed in the correct thread. 148 // Used for DCHECKs to ensure methods calls executed in the correct thread.
149 base::ThreadChecker thread_checker_; 149 base::ThreadChecker thread_checker_;
150 150
151 WebKit::WebMediaPlayerClient* client_; 151 WebKit::WebMediaPlayerClient* client_;
152 152
153 base::WeakPtr<WebMediaPlayerDelegate> delegate_; 153 base::WeakPtr<WebMediaPlayerDelegate> delegate_;
154 154
155 MediaStreamClient* media_stream_client_; 155 MediaStreamClient* media_stream_client_;
156 scoped_refptr<webkit_media::VideoFrameProvider> video_frame_provider_; 156 scoped_refptr<content::VideoFrameProvider> video_frame_provider_;
157 bool paused_; 157 bool paused_;
158 158
159 // |current_frame_| is updated only on main thread. The object it holds 159 // |current_frame_| is updated only on main thread. The object it holds
160 // can be freed on the compositor thread if it is the last to hold a 160 // can be freed on the compositor thread if it is the last to hold a
161 // reference but media::VideoFrame is a thread-safe ref-pointer. 161 // reference but media::VideoFrame is a thread-safe ref-pointer.
162 scoped_refptr<media::VideoFrame> current_frame_; 162 scoped_refptr<media::VideoFrame> current_frame_;
163 // |current_frame_used_| is updated on both main and compositing thread. 163 // |current_frame_used_| is updated on both main and compositing thread.
164 // It's used to track whether |current_frame_| was painted for detecting 164 // It's used to track whether |current_frame_| was painted for detecting
165 // when to increase |dropped_frame_count_|. 165 // when to increase |dropped_frame_count_|.
166 bool current_frame_used_; 166 bool current_frame_used_;
(...skipping 13 matching lines...) Expand all
180 unsigned dropped_frame_count_; 180 unsigned dropped_frame_count_;
181 media::SkCanvasVideoRenderer video_renderer_; 181 media::SkCanvasVideoRenderer video_renderer_;
182 182
183 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; 183 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;
184 184
185 scoped_refptr<media::MediaLog> media_log_; 185 scoped_refptr<media::MediaLog> media_log_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 187 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
188 }; 188 };
189 189
190 } // namespace webkit_media 190 } // namespace content
191 191
192 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 192 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698