OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ | 54 #define WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ |
55 | 55 |
56 #include "base/message_loop.h" | 56 #include "base/message_loop.h" |
57 #include "base/ref_counted.h" | 57 #include "base/ref_counted.h" |
58 #include "base/scoped_ptr.h" | 58 #include "base/scoped_ptr.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/base/filters.h" | 62 #include "media/base/filters.h" |
63 #include "media/base/message_loop_factory.h" | 63 #include "media/base/message_loop_factory.h" |
64 #include "media/base/pipeline.h" | 64 #include "media/base/pipeline_impl.h" |
65 #include "skia/ext/platform_canvas.h" | 65 #include "skia/ext/platform_canvas.h" |
66 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" | 66 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" |
67 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h" | 67 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h" |
68 #include "ui/gfx/rect.h" | 68 #include "ui/gfx/rect.h" |
69 #include "ui/gfx/size.h" | 69 #include "ui/gfx/size.h" |
70 #include "webkit/glue/media/web_data_source.h" | 70 #include "webkit/glue/media/web_data_source.h" |
71 | 71 |
72 class GURL; | 72 class GURL; |
73 | 73 |
74 namespace WebKit { | 74 namespace WebKit { |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
295 WebKit::WebTimeRanges buffered_; | 295 WebKit::WebTimeRanges buffered_; |
296 | 296 |
297 // Message loops for posting tasks between Chrome's main thread. Also used | 297 // Message loops for posting tasks between Chrome's main thread. Also used |
298 // for DCHECKs so methods calls won't execute in the wrong thread. | 298 // for DCHECKs so methods calls won't execute in the wrong thread. |
299 MessageLoop* main_loop_; | 299 MessageLoop* main_loop_; |
300 | 300 |
301 // A collection of filters. | 301 // A collection of filters. |
302 scoped_ptr<media::FilterCollection> filter_collection_; | 302 scoped_ptr<media::FilterCollection> filter_collection_; |
303 | 303 |
304 // The actual pipeline and the thread it runs on. | 304 // The actual pipeline and the thread it runs on. |
305 scoped_refptr<media::Pipeline> pipeline_; | 305 scoped_refptr<media::PipelineImpl> pipeline_; |
acolwell GONE FROM CHROMIUM
2011/03/08 21:48:09
I don't think this will be needed once the demuxer
Ami GONE FROM CHROMIUM
2011/03/08 22:44:48
Done.
| |
306 | 306 |
307 scoped_ptr<media::MessageLoopFactory> message_loop_factory_; | 307 scoped_ptr<media::MessageLoopFactory> message_loop_factory_; |
308 | 308 |
309 // Playback state. | 309 // Playback state. |
310 // | 310 // |
311 // TODO(scherkus): we have these because Pipeline favours the simplicity of a | 311 // TODO(scherkus): we have these because Pipeline favours the simplicity of a |
312 // single "playback rate" over worrying about paused/stopped etc... It forces | 312 // single "playback rate" over worrying about paused/stopped etc... It forces |
313 // all clients to manage the pause+playback rate externally, but is that | 313 // all clients to manage the pause+playback rate externally, but is that |
314 // really a bad thing? | 314 // really a bad thing? |
315 // | 315 // |
(...skipping 17 matching lines...) Expand all Loading... | |
333 #if WEBKIT_USING_CG | 333 #if WEBKIT_USING_CG |
334 scoped_ptr<skia::PlatformCanvas> skia_canvas_; | 334 scoped_ptr<skia::PlatformCanvas> skia_canvas_; |
335 #endif | 335 #endif |
336 | 336 |
337 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 337 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
338 }; | 338 }; |
339 | 339 |
340 } // namespace webkit_glue | 340 } // namespace webkit_glue |
341 | 341 |
342 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ | 342 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ |
OLD | NEW |