Chromium Code Reviews| Index: media/base/pipeline_impl.cc |
| =================================================================== |
| --- media/base/pipeline_impl.cc (revision 89408) |
| +++ media/base/pipeline_impl.cc (working copy) |
| @@ -14,7 +14,6 @@ |
| #include "base/compiler_specific.h" |
| #include "base/stl_util-inl.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" |
| @@ -90,7 +89,8 @@ |
| // Creates the PipelineInternal and calls it's start method. |
| bool PipelineImpl::Start(FilterCollection* collection, |
| const std::string& url, |
| - PipelineStatusCallback* start_callback) { |
| + PipelineStatusCallback* start_callback, |
| + bool raw_video) { |
| base::AutoLock auto_lock(lock_); |
| scoped_ptr<PipelineStatusCallback> callback(start_callback); |
| scoped_ptr<FilterCollection> filter_collection(collection); |
| @@ -112,7 +112,8 @@ |
| &PipelineImpl::StartTask, |
| filter_collection.release(), |
| url, |
| - callback.release())); |
| + callback.release(), |
| + raw_video)); |
| return true; |
| } |
| @@ -605,7 +606,8 @@ |
| void PipelineImpl::StartTask(FilterCollection* filter_collection, |
| const std::string& url, |
| - PipelineStatusCallback* start_callback) { |
| + PipelineStatusCallback* start_callback, |
| + bool raw_video) { |
| DCHECK_EQ(MessageLoop::current(), message_loop_); |
| DCHECK_EQ(kCreated, state_); |
| filter_collection_.reset(filter_collection); |
| @@ -617,7 +619,7 @@ |
| pipeline_init_state_->composite_ = new CompositeFilter(message_loop_); |
| pipeline_init_state_->composite_->set_host(this); |
| - if (RTCVideoDecoder::IsUrlSupported(url)) { |
| + if (raw_video) { |
|
scherkus (not reviewing)
2011/06/17 00:31:46
this raw_video thing is kind of hacky....
can we
acolwell GONE FROM CHROMIUM
2011/06/24 17:11:27
I agree. I think we could put a kRawVideoScheme st
Ronghua
2011/06/24 21:08:51
Done.
Ronghua
2011/06/24 21:08:51
Done.
|
| set_state(kInitVideoDecoder); |
| InitializeVideoDecoder(NULL); |
| } else { |