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

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

Issue 7203002: Adding ChunkDemuxer implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments Created 9 years, 6 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 (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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 #ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 53 #ifndef WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
54 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 54 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
55 55
56 #include "base/memory/ref_counted.h" 56 #include "base/memory/ref_counted.h"
57 #include "base/memory/scoped_ptr.h" 57 #include "base/memory/scoped_ptr.h"
58 #include "base/message_loop.h" 58 #include "base/message_loop.h"
59 #include "base/threading/thread.h" 59 #include "base/threading/thread.h"
60 #include "base/synchronization/lock.h" 60 #include "base/synchronization/lock.h"
61 #include "base/synchronization/waitable_event.h" 61 #include "base/synchronization/waitable_event.h"
62 #include "media/filters/chunk_demuxer.h"
62 #include "media/base/filters.h" 63 #include "media/base/filters.h"
63 #include "media/base/message_loop_factory.h" 64 #include "media/base/message_loop_factory.h"
64 #include "media/base/pipeline.h" 65 #include "media/base/pipeline.h"
65 #include "skia/ext/platform_canvas.h" 66 #include "skia/ext/platform_canvas.h"
66 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" 67 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
67 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h" 68 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"
68 #include "ui/gfx/rect.h" 69 #include "ui/gfx/rect.h"
69 #include "ui/gfx/size.h" 70 #include "ui/gfx/size.h"
70 #include "webkit/glue/media/web_data_source.h" 71 #include "webkit/glue/media/web_data_source.h"
71 72
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 WebKit::WebFrame* frame, 195 WebKit::WebFrame* frame,
195 bool use_simple_data_source, 196 bool use_simple_data_source,
196 scoped_refptr<WebVideoRenderer> web_video_renderer); 197 scoped_refptr<WebVideoRenderer> web_video_renderer);
197 198
198 virtual void load(const WebKit::WebURL& url); 199 virtual void load(const WebKit::WebURL& url);
199 virtual void cancelLoad(); 200 virtual void cancelLoad();
200 201
201 // Playback controls. 202 // Playback controls.
202 virtual void play(); 203 virtual void play();
203 virtual void pause(); 204 virtual void pause();
205 virtual bool addData(const unsigned char* data, unsigned length);
204 virtual bool supportsFullscreen() const; 206 virtual bool supportsFullscreen() const;
205 virtual bool supportsSave() const; 207 virtual bool supportsSave() const;
206 virtual void seek(float seconds); 208 virtual void seek(float seconds);
207 virtual void setEndTime(float seconds); 209 virtual void setEndTime(float seconds);
208 virtual void setRate(float rate); 210 virtual void setRate(float rate);
209 virtual void setVolume(float volume); 211 virtual void setVolume(float volume);
210 virtual void setVisible(bool visible); 212 virtual void setVisible(bool visible);
211 virtual void setPreload(WebKit::WebMediaPlayer::Preload preload); 213 virtual void setPreload(WebKit::WebMediaPlayer::Preload preload);
212 virtual bool totalBytesKnown(); 214 virtual bool totalBytesKnown();
213 virtual const WebKit::WebTimeRanges& buffered(); 215 virtual const WebKit::WebTimeRanges& buffered();
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 // SetPlaybackRate(0) is being executed. 321 // SetPlaybackRate(0) is being executed.
320 bool paused_; 322 bool paused_;
321 bool seeking_; 323 bool seeking_;
322 float playback_rate_; 324 float playback_rate_;
323 base::TimeDelta paused_time_; 325 base::TimeDelta paused_time_;
324 326
325 WebKit::WebMediaPlayerClient* client_; 327 WebKit::WebMediaPlayerClient* client_;
326 328
327 scoped_refptr<Proxy> proxy_; 329 scoped_refptr<Proxy> proxy_;
328 330
331 scoped_ptr<media::ChunkDemuxerFactory> chunk_demuxer_factory_;
332 scoped_ptr<media::MediaDataSink> media_data_sink_;
333
329 #if WEBKIT_USING_CG 334 #if WEBKIT_USING_CG
330 scoped_ptr<skia::PlatformCanvas> skia_canvas_; 335 scoped_ptr<skia::PlatformCanvas> skia_canvas_;
331 #endif 336 #endif
332 337
333 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 338 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
334 }; 339 };
335 340
336 } // namespace webkit_glue 341 } // namespace webkit_glue
337 342
338 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ 343 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698