diff options
author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 19:52:08 +0000 |
---|---|---|
committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 19:52:08 +0000 |
commit | 7b268b7a549561344b59da31d58cbe3c6ca71dd8 (patch) | |
tree | b93d5a298c4e40b896026ed02a28efb999701d35 /webkit/media/webmediaplayer_proxy.h | |
parent | 49d633905b2467796aa6a4794f64001664358334 (diff) | |
download | chromium_src-7b268b7a549561344b59da31d58cbe3c6ca71dd8.zip chromium_src-7b268b7a549561344b59da31d58cbe3c6ca71dd8.tar.gz chromium_src-7b268b7a549561344b59da31d58cbe3c6ca71dd8.tar.bz2 |
Fire canplaythrough event at the proper time for audio/video
In this CL, the browser fires the canplaythrough event based on an
approximation of the download speed of the media instead of firing the
event right away.
BUG=73609
TEST=NONE
Review URL: http://codereview.chromium.org/8399023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_proxy.h')
-rw-r--r-- | webkit/media/webmediaplayer_proxy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h index a0d007b..00cff2a 100644 --- a/webkit/media/webmediaplayer_proxy.h +++ b/webkit/media/webmediaplayer_proxy.h @@ -9,6 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" +#include "media/base/pipeline.h" #include "media/filters/chunk_demuxer_client.h" #include "webkit/media/web_data_source.h" @@ -52,7 +53,7 @@ class WebMediaPlayerProxy void PipelineSeekCallback(media::PipelineStatus status); void PipelineEndedCallback(media::PipelineStatus status); void PipelineErrorCallback(media::PipelineStatus error); - void NetworkEventCallback(bool network_activity); + void NetworkEventCallback(media::NetworkEvent type); // ChunkDemuxerClient implementation. virtual void DemuxerOpened(media::ChunkDemuxer* demuxer) OVERRIDE; @@ -94,7 +95,7 @@ class WebMediaPlayerProxy void PipelineErrorTask(media::PipelineStatus error); // Notify |webmediaplayer_| that there's a network event. - void NetworkEventTask(bool network_activity); + void NetworkEventTask(media::NetworkEvent type); // The render message loop where WebKit lives. MessageLoop* render_loop_; |