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

Side by Side Diff: webkit/media/webmediaplayer_proxy.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/webmediaplayer_ms.cc ('k') | no next file » | 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_PROXY_H_ 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/synchronization/lock.h" 13 #include "base/synchronization/lock.h"
14 #include "media/base/decryptor_client.h" 14 #include "media/base/decryptor_client.h"
15 #include "media/base/pipeline.h" 15 #include "media/base/pipeline.h"
16 #include "media/filters/chunk_demuxer.h" 16 #include "media/filters/chunk_demuxer.h"
17 #include "media/filters/ffmpeg_video_decoder.h" 17 #include "media/filters/ffmpeg_video_decoder.h"
18 #include "media/filters/skcanvas_video_renderer.h"
18 #include "webkit/media/buffered_data_source.h" 19 #include "webkit/media/buffered_data_source.h"
19 #include "webkit/media/skcanvas_video_renderer.h"
20 20
21 class SkCanvas; 21 class SkCanvas;
22 22
23 namespace base { 23 namespace base {
24 class MessageLoopProxy; 24 class MessageLoopProxy;
25 } 25 }
26 26
27 namespace gfx { 27 namespace gfx {
28 class Rect; 28 class Rect;
29 } 29 }
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 const std::string& session_id, 117 const std::string& session_id,
118 scoped_array<uint8> init_data, 118 scoped_array<uint8> init_data,
119 int init_data_size); 119 int init_data_size);
120 120
121 // The render message loop where WebKit lives. 121 // The render message loop where WebKit lives.
122 scoped_refptr<base::MessageLoopProxy> render_loop_; 122 scoped_refptr<base::MessageLoopProxy> render_loop_;
123 WebMediaPlayerImpl* webmediaplayer_; 123 WebMediaPlayerImpl* webmediaplayer_;
124 124
125 scoped_refptr<BufferedDataSource> data_source_; 125 scoped_refptr<BufferedDataSource> data_source_;
126 scoped_refptr<media::VideoRendererBase> frame_provider_; 126 scoped_refptr<media::VideoRendererBase> frame_provider_;
127 SkCanvasVideoRenderer video_renderer_; 127 media::SkCanvasVideoRenderer video_renderer_;
128 128
129 base::Lock lock_; 129 base::Lock lock_;
130 int outstanding_repaints_; 130 int outstanding_repaints_;
131 131
132 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); 132 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
133 }; 133 };
134 134
135 } // namespace webkit_media 135 } // namespace webkit_media
136 136
137 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 137 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_ms.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698