diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 16 | ||||
| -rw-r--r-- | webkit/support/webkit_support.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index bbf6172..02d98ca 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -278,18 +278,18 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( proxy_->SetDataSource(buffered_data_source); if (use_simple_data_source) { - filter_collection_->AddDataSource(simple_data_source); - filter_collection_->AddDataSource(buffered_data_source); + filter_collection_->AddFilter(simple_data_source); + filter_collection_->AddFilter(buffered_data_source); } else { - filter_collection_->AddDataSource(buffered_data_source); - filter_collection_->AddDataSource(simple_data_source); + filter_collection_->AddFilter(buffered_data_source); + filter_collection_->AddFilter(simple_data_source); } // Add in the default filter factories. - filter_collection_->AddDemuxer(new media::FFmpegDemuxer()); - filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder()); - filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL)); - filter_collection_->AddAudioRenderer(new media::NullAudioRenderer()); + filter_collection_->AddFilter(new media::FFmpegDemuxer()); + filter_collection_->AddFilter(new media::FFmpegAudioDecoder()); + filter_collection_->AddFilter(new media::FFmpegVideoDecoder(NULL)); + filter_collection_->AddFilter(new media::NullAudioRenderer()); } WebMediaPlayerImpl::~WebMediaPlayerImpl() { diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index eb839a1..b80c0af 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -292,7 +292,7 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame, scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( new webkit_glue::VideoRendererImpl(false)); - collection->AddVideoRenderer(video_renderer); + collection->AddFilter(video_renderer); return new webkit_glue::WebMediaPlayerImpl( client, collection.release(), bridge_factory_simple, diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index f5d30b7..3a42382 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -743,7 +743,7 @@ WebMediaPlayer* TestWebViewDelegate::createMediaPlayer( scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( new webkit_glue::VideoRendererImpl(false)); - collection->AddVideoRenderer(video_renderer); + collection->AddFilter(video_renderer); return new webkit_glue::WebMediaPlayerImpl( client, collection.release(), bridge_factory_simple, |