Index: webkit/glue/webmediaplayer_impl.cc |
=================================================================== |
--- webkit/glue/webmediaplayer_impl.cc (revision 89408) |
+++ webkit/glue/webmediaplayer_impl.cc (working copy) |
@@ -9,6 +9,7 @@ |
#include "base/callback.h" |
#include "base/command_line.h" |
+#include "content/renderer/media/rtc_video_decoder.h" |
scherkus (not reviewing)
2011/06/17 00:31:46
webkit glue can't depend on content
AFAIK you'll
Ronghua
2011/06/24 21:08:51
Done.
|
#include "media/base/composite_data_source_factory.h" |
#include "media/base/filter_collection.h" |
#include "media/base/limits.h" |
@@ -20,7 +21,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" |
@@ -373,6 +373,7 @@ |
DCHECK(MessageLoop::current() == main_loop_); |
DCHECK(proxy_); |
+ bool raw_video = false; |
if (media::RTCVideoDecoder::IsUrlSupported(url.spec())) { |
// Remove the default decoder |
scoped_refptr<media::VideoDecoder> old_videodecoder; |
@@ -382,6 +383,7 @@ |
message_loop_factory_->GetMessageLoop("VideoDecoderThread"), |
url.spec()); |
filter_collection_->AddVideoDecoder(rtc_video_decoder); |
+ raw_video = true; |
} |
// Handle any volume changes that occured before load(). |
@@ -396,7 +398,8 @@ |
filter_collection_.release(), |
url.spec(), |
NewCallback(proxy_.get(), |
- &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback)); |
+ &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback), |
+ raw_video); |
} |
void WebMediaPlayerImpl::cancelLoad() { |