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 /media/base/pipeline_impl.cc | |
| 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 'media/base/pipeline_impl.cc')
| -rw-r--r-- | media/base/pipeline_impl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index 809463e..bfeda09 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -13,14 +13,16 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/stl_util-inl.h" +#include "base/string_util.h" #include "base/synchronization/condition_variable.h" -#include "media/filters/rtc_video_decoder.h" #include "media/base/clock.h" #include "media/base/filter_collection.h" #include "media/base/media_format.h" namespace media { +const char kRawMediaScheme[] = "x-raw-media"; + PipelineStatusNotification::PipelineStatusNotification() : cv_(&lock_), status_(PIPELINE_OK), notified_(false) { callback_.reset(NewCallback(this, &PipelineStatusNotification::Notify)); @@ -617,7 +619,9 @@ void PipelineImpl::StartTask(FilterCollection* filter_collection, pipeline_init_state_->composite_ = new CompositeFilter(message_loop_); pipeline_init_state_->composite_->set_host(this); - if (RTCVideoDecoder::IsUrlSupported(url)) { + bool raw_media = (base::strncasecmp(url.c_str(), kRawMediaScheme, + strlen(kRawMediaScheme)) == 0); + if (raw_media) { set_state(kInitVideoDecoder); InitializeVideoDecoder(NULL); } else { |