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

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

Issue 10834183: Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed CR comments Created 8 years, 4 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
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/media/webmediaplayer_proxy.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_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>
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void set_data_source(const scoped_refptr<BufferedDataSource>& data_source) { 53 void set_data_source(const scoped_refptr<BufferedDataSource>& data_source) {
54 data_source_ = data_source; 54 data_source_ = data_source;
55 } 55 }
56 56
57 // TODO(scherkus): remove this once VideoRendererBase::PaintCB passes 57 // TODO(scherkus): remove this once VideoRendererBase::PaintCB passes
58 // ownership of the VideoFrame http://crbug.com/108435 58 // ownership of the VideoFrame http://crbug.com/108435
59 void set_frame_provider(media::VideoRendererBase* frame_provider) { 59 void set_frame_provider(media::VideoRendererBase* frame_provider) {
60 frame_provider_ = frame_provider; 60 frame_provider_ = frame_provider;
61 } 61 }
62 62
63 void set_video_decoder(
64 const scoped_refptr<media::FFmpegVideoDecoder>& video_decoder) {
65 video_decoder_ = video_decoder;
66 }
67 const scoped_refptr<media::FFmpegVideoDecoder>& video_decoder() {
68 return video_decoder_;
69 }
70
71 // Methods for Filter -> WebMediaPlayerImpl communication. 63 // Methods for Filter -> WebMediaPlayerImpl communication.
72 void Repaint(); 64 void Repaint();
73 void SetOpaque(bool opaque); 65 void SetOpaque(bool opaque);
74 66
75 // Methods for WebMediaPlayerImpl -> Filter communication. 67 // Methods for WebMediaPlayerImpl -> Filter communication.
76 void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect, uint8_t alpha); 68 void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect, uint8_t alpha);
77 void Detach(); 69 void Detach();
78 void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out); 70 void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out);
79 void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame); 71 void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame);
80 bool HasSingleOrigin(); 72 bool HasSingleOrigin();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 scoped_array<uint8> init_data, 165 scoped_array<uint8> init_data,
174 int init_data_size); 166 int init_data_size);
175 167
176 // The render message loop where WebKit lives. 168 // The render message loop where WebKit lives.
177 scoped_refptr<base::MessageLoopProxy> render_loop_; 169 scoped_refptr<base::MessageLoopProxy> render_loop_;
178 WebMediaPlayerImpl* webmediaplayer_; 170 WebMediaPlayerImpl* webmediaplayer_;
179 171
180 scoped_refptr<BufferedDataSource> data_source_; 172 scoped_refptr<BufferedDataSource> data_source_;
181 scoped_refptr<media::VideoRendererBase> frame_provider_; 173 scoped_refptr<media::VideoRendererBase> frame_provider_;
182 SkCanvasVideoRenderer video_renderer_; 174 SkCanvasVideoRenderer video_renderer_;
183 scoped_refptr<media::FFmpegVideoDecoder> video_decoder_;
184 175
185 base::Lock lock_; 176 base::Lock lock_;
186 int outstanding_repaints_; 177 int outstanding_repaints_;
187 178
188 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 179 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
189 180
190 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); 181 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);
191 }; 182 };
192 183
193 } // namespace webkit_media 184 } // namespace webkit_media
194 185
195 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_ 186 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
OLDNEW
« no previous file with comments | « webkit/media/webmediaplayer_impl.cc ('k') | webkit/media/webmediaplayer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698