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

Side by Side Diff: webkit/media/webmediaplayer_ms.h

Issue 11234071: Moved SkCanvasVideoRenderer to media/filters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added MEDIA_EXPORT. Created 8 years, 1 month 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
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | webkit/media/webmediaplayer_ms.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MEDIA_WEBMEDIAPLAYER_MS_H_ 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ 6 #define WEBKIT_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 "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
12 #include "media/filters/skcanvas_video_renderer.h"
12 #include "skia/ext/platform_canvas.h" 13 #include "skia/ext/platform_canvas.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
14 #include "webkit/media/skcanvas_video_renderer.h"
15 15
16 namespace WebKit { 16 namespace WebKit {
17 class WebFrame; 17 class WebFrame;
18 class WebMediaPlayerClient; 18 class WebMediaPlayerClient;
19 } 19 }
20 20
21 namespace media { 21 namespace media {
22 class MediaLog; 22 class MediaLog;
23 } 23 }
24 24
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 MediaStreamClient* media_stream_client_; 151 MediaStreamClient* media_stream_client_;
152 scoped_refptr<VideoFrameProvider> video_frame_provider_; 152 scoped_refptr<VideoFrameProvider> video_frame_provider_;
153 bool video_frame_provider_started_; 153 bool video_frame_provider_started_;
154 bool paused_; 154 bool paused_;
155 scoped_refptr<media::VideoFrame> current_frame_; 155 scoped_refptr<media::VideoFrame> current_frame_;
156 bool pending_repaint_; 156 bool pending_repaint_;
157 bool got_first_frame_; 157 bool got_first_frame_;
158 base::TimeDelta start_time_; 158 base::TimeDelta start_time_;
159 unsigned total_frame_count_; 159 unsigned total_frame_count_;
160 unsigned dropped_frame_count_; 160 unsigned dropped_frame_count_;
161 SkCanvasVideoRenderer video_renderer_; 161 media::SkCanvasVideoRenderer video_renderer_;
162 162
163 scoped_refptr<media::MediaLog> media_log_; 163 scoped_refptr<media::MediaLog> media_log_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 165 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
166 }; 166 };
167 167
168 } // namespace webkit_media 168 } // namespace webkit_media
169 169
170 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ 170 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | webkit/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698