diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 16:45:55 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-07 16:45:55 +0000 |
| commit | 4990cf2cb2302f7313564348e36fd0ffebdfaf07 (patch) | |
| tree | ff2156fe4369150df4e5c86ae038daf3ab964ad2 /webkit/glue | |
| parent | b1bf6fb646bbca873ba3586ce8a7bacce4d1dfbc (diff) | |
| download | chromium_src-4990cf2cb2302f7313564348e36fd0ffebdfaf07.zip chromium_src-4990cf2cb2302f7313564348e36fd0ffebdfaf07.tar.gz chromium_src-4990cf2cb2302f7313564348e36fd0ffebdfaf07.tar.bz2 | |
The RTCVideoDecoder will eventially need to depend on third_party lib (webrtc, libjinle etc), which is not allowed in media. So move rtc_video_decoder* from media/filter/ to content/renderer/media/.
patch by ronghuawu@google.com
BUG=none
TEST=unit_tests, media_unittests
Review URL: http://codereview.chromium.org/7193001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 611e339..3832440 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -20,7 +20,6 @@ #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer_factory.h" #include "media/filters/ffmpeg_video_decoder.h" -#include "media/filters/rtc_video_decoder.h" #include "media/filters/null_audio_renderer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" @@ -378,17 +377,6 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { DCHECK(MessageLoop::current() == main_loop_); DCHECK(proxy_); - if (media::RTCVideoDecoder::IsUrlSupported(url.spec())) { - // Remove the default decoder - scoped_refptr<media::VideoDecoder> old_videodecoder; - filter_collection_->SelectVideoDecoder(&old_videodecoder); - media::RTCVideoDecoder* rtc_video_decoder = - new media::RTCVideoDecoder( - message_loop_factory_->GetMessageLoop("VideoDecoderThread"), - url.spec()); - filter_collection_->AddVideoDecoder(rtc_video_decoder); - } - if (chunk_demuxer_factory_.get() && chunk_demuxer_factory_->IsUrlSupported(url.spec())) { media_data_sink_.reset(chunk_demuxer_factory_->CreateMediaDataSink()); |