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

Side by Side Diff: webkit/glue/webmediaplayer_impl.h

Issue 7566054: Revert 95542 - Plumb media data from renderers up to MediaInternals in the browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « media/media.gyp ('k') | webkit/glue/webmediaplayer_impl.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains PipelineImpl which is the actual media player pipeline, it glues 6 // It contains PipelineImpl which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // PipelineImpl would creates multiple threads and access some public methods 8 // PipelineImpl would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 #include "ui/gfx/rect.h" 70 #include "ui/gfx/rect.h"
71 #include "ui/gfx/size.h" 71 #include "ui/gfx/size.h"
72 #include "webkit/glue/media/web_data_source.h" 72 #include "webkit/glue/media/web_data_source.h"
73 73
74 class GURL; 74 class GURL;
75 75
76 namespace WebKit { 76 namespace WebKit {
77 class WebFrame; 77 class WebFrame;
78 } 78 }
79 79
80 namespace media {
81 class MediaLog;
82 }
83
84 namespace webkit_glue { 80 namespace webkit_glue {
85 81
86 class MediaResourceLoaderBridgeFactory; 82 class MediaResourceLoaderBridgeFactory;
87 class MediaStreamClient; 83 class MediaStreamClient;
88 class WebVideoRenderer; 84 class WebVideoRenderer;
89 85
90 class WebMediaPlayerImpl 86 class WebMediaPlayerImpl
91 : public WebKit::WebMediaPlayer, 87 : public WebKit::WebMediaPlayer,
92 public MessageLoop::DestructionObserver { 88 public MessageLoop::DestructionObserver {
93 public: 89 public:
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // provided by WebKit to perform renderering. The simple data source does 201 // provided by WebKit to perform renderering. The simple data source does
206 // resource loading by loading the whole resource object into memory. Null 202 // resource loading by loading the whole resource object into memory. Null
207 // audio renderer is a fake audio device that plays silence. Provider of the 203 // audio renderer is a fake audio device that plays silence. Provider of the
208 // |collection| can override the default filters by adding extra filters to 204 // |collection| can override the default filters by adding extra filters to
209 // |collection| before calling this method. 205 // |collection| before calling this method.
210 // 206 //
211 // Callers must call |Initialize()| before they can use the object. 207 // Callers must call |Initialize()| before they can use the object.
212 WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client, 208 WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
213 media::FilterCollection* collection, 209 media::FilterCollection* collection,
214 media::MessageLoopFactory* message_loop_factory, 210 media::MessageLoopFactory* message_loop_factory,
215 MediaStreamClient* media_stream_client, 211 MediaStreamClient* media_stream_client);
216 media::MediaLog* media_log);
217 virtual ~WebMediaPlayerImpl(); 212 virtual ~WebMediaPlayerImpl();
218 213
219 // Finalizes initialization of the object. 214 // Finalizes initialization of the object.
220 bool Initialize( 215 bool Initialize(
221 WebKit::WebFrame* frame, 216 WebKit::WebFrame* frame,
222 bool use_simple_data_source, 217 bool use_simple_data_source,
223 scoped_refptr<WebVideoRenderer> web_video_renderer); 218 scoped_refptr<WebVideoRenderer> web_video_renderer);
224 219
225 virtual void load(const WebKit::WebURL& url); 220 virtual void load(const WebKit::WebURL& url);
226 virtual void cancelLoad(); 221 virtual void cancelLoad();
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 WebKit::WebMediaPlayerClient* client_; 354 WebKit::WebMediaPlayerClient* client_;
360 355
361 scoped_refptr<Proxy> proxy_; 356 scoped_refptr<Proxy> proxy_;
362 357
363 MediaStreamClient* media_stream_client_; 358 MediaStreamClient* media_stream_client_;
364 359
365 #if WEBKIT_USING_CG 360 #if WEBKIT_USING_CG
366 scoped_ptr<skia::PlatformCanvas> skia_canvas_; 361 scoped_ptr<skia::PlatformCanvas> skia_canvas_;
367 #endif 362 #endif
368 363
369 scoped_refptr<media::MediaLog> media_log_;
370
371 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 364 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
372 }; 365 };
373 366
374 } // namespace webkit_glue 367 } // namespace webkit_glue
375 368
376 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 369 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | webkit/glue/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698