Move rtc_video_decoder* from media/filter/ to content/renderer/media/.

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #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 have to add this filter inside of render_view.cc

[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"
 #include "media/base/media_format.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline_impl.h"
 #include "media/base/video_frame.h"
 #include "media/filters/adaptive_demuxer.h"
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 #include "webkit/glue/media/buffered_data_source.h"
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/media/web_video_renderer.h"
 #include "webkit/glue/webvideoframe_impl.h"
@@ skipping 332 matching lines @@
   // event.
   if (main_loop_) {
     main_loop_->RemoveDestructionObserver(this);
   }
 }
 
 void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
   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;
     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);
+    raw_video = true;
   }
 
   // Handle any volume changes that occured before load().
   setVolume(GetClient()->volume());
   // Get the preload value.
   setPreload(GetClient()->preload());
 
   // Initialize the pipeline.
   SetNetworkState(WebKit::WebMediaPlayer::Loading);
   SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
   pipeline_->Start(
       filter_collection_.release(),
       url.spec(),
       NewCallback(proxy_.get(),
-                  &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback));
+                  &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback),
+      raw_video);
 }
 
 void WebMediaPlayerImpl::cancelLoad() {
   DCHECK(MessageLoop::current() == main_loop_);
 }
 
 void WebMediaPlayerImpl::play() {
   DCHECK(MessageLoop::current() == main_loop_);
 
   paused_ = false;
@@ skipping 516 matching lines @@
   }
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_glue