diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 17:47:15 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 17:47:15 +0000 |
| commit | 583634b8cb62af00593258b64680bf6b2358d43d (patch) | |
| tree | ff7976bb94f6a607c919293045169c3f235d2fd9 /webkit/glue/webmediaplayer_impl.cc | |
| parent | dcf6c130ddd91d3349ec503203ea89d1600f2462 (diff) | |
| download | chromium_src-583634b8cb62af00593258b64680bf6b2358d43d.zip chromium_src-583634b8cb62af00593258b64680bf6b2358d43d.tar.gz chromium_src-583634b8cb62af00593258b64680bf6b2358d43d.tar.bz2 | |
Refactor Pipeline & PipelineImpl so WebMediaPlayerImpl references a Pipeline instead of PipelineImpl
BUG=54110
TEST=PipelineImplTest
Review URL: http://codereview.chromium.org/4664005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 919cf2e..02d98ca 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -11,6 +11,7 @@ #include "media/base/limits.h" #include "media/base/media_format.h" #include "media/base/media_switches.h" +#include "media/base/pipeline_impl.h" #include "media/base/video_frame.h" #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer.h" @@ -259,12 +260,13 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( proxy_->SetVideoRenderer(web_video_renderer); // Set our pipeline callbacks. - pipeline_->SetPipelineEndedCallback(NewCallback(proxy_.get(), - &WebMediaPlayerImpl::Proxy::PipelineEndedCallback)); - pipeline_->SetPipelineErrorCallback(NewCallback(proxy_.get(), - &WebMediaPlayerImpl::Proxy::PipelineErrorCallback)); - pipeline_->SetNetworkEventCallback(NewCallback(proxy_.get(), - &WebMediaPlayerImpl::Proxy::NetworkEventCallback)); + pipeline_->Init( + NewCallback(proxy_.get(), + &WebMediaPlayerImpl::Proxy::PipelineEndedCallback), + NewCallback(proxy_.get(), + &WebMediaPlayerImpl::Proxy::PipelineErrorCallback), + NewCallback(proxy_.get(), + &WebMediaPlayerImpl::Proxy::NetworkEventCallback)); // A simple data source that keeps all data in memory. scoped_refptr<SimpleDataSource> simple_data_source( |