OLD | NEW |
---|---|
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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
236 // TODO(scherkus): since SetPlaybackRate(0) is asynchronous and we don't want | 236 // TODO(scherkus): since SetPlaybackRate(0) is asynchronous and we don't want |
237 // to hang the render thread during pause(), we record the time at the same | 237 // to hang the render thread during pause(), we record the time at the same |
238 // time we pause and then return that value in currentTime(). Otherwise our | 238 // time we pause and then return that value in currentTime(). Otherwise our |
239 // clock can creep forward a little bit while the asynchronous | 239 // clock can creep forward a little bit while the asynchronous |
240 // SetPlaybackRate(0) is being executed. | 240 // SetPlaybackRate(0) is being executed. |
241 bool paused_; | 241 bool paused_; |
242 bool seeking_; | 242 bool seeking_; |
243 float playback_rate_; | 243 float playback_rate_; |
244 base::TimeDelta paused_time_; | 244 base::TimeDelta paused_time_; |
245 | 245 |
246 bool pending_seek_; | |
247 float pending_seek_seconds_; | |
Ami GONE FROM CHROMIUM
2011/09/13 20:12:58
Add a comment to the effect that this is the *last
SeRya
2011/09/13 22:14:21
Done.
| |
248 | |
246 WebKit::WebMediaPlayerClient* client_; | 249 WebKit::WebMediaPlayerClient* client_; |
247 | 250 |
248 scoped_refptr<WebMediaPlayerProxy> proxy_; | 251 scoped_refptr<WebMediaPlayerProxy> proxy_; |
249 | 252 |
250 MediaStreamClient* media_stream_client_; | 253 MediaStreamClient* media_stream_client_; |
251 | 254 |
252 #if WEBKIT_USING_CG | 255 #if WEBKIT_USING_CG |
253 scoped_ptr<skia::PlatformCanvas> skia_canvas_; | 256 scoped_ptr<skia::PlatformCanvas> skia_canvas_; |
254 #endif | 257 #endif |
255 | 258 |
256 scoped_refptr<media::MediaLog> media_log_; | 259 scoped_refptr<media::MediaLog> media_log_; |
257 | 260 |
258 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 261 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
259 }; | 262 }; |
260 | 263 |
261 } // namespace webkit_glue | 264 } // namespace webkit_glue |
262 | 265 |
263 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ | 266 #endif // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_ |
OLD | NEW |