Revert 79149 - Build a raw video pipeline for the <video> with a special src attribute (media://...).

The raw video pipeline graph only has two filters - one pass-thru decoder filter and one renderer filter.

Contributed by ronghuawu@google.com

Original code reviews:
http://codereview.chromium.org/6658001/ (pipeline changes)
http://codereview.chromium.org/6621049/ (pass-thru filter)

BUG=none
TEST=media_unittests

Review URL: http://codereview.chromium.org/6726006

TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/6722031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79158 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 17 deletions

diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 54bc600..7ac8e76 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -5,7 +5,6 @@
 #include "webkit/glue/webmediaplayer_impl.h"
 
 #include <limits>
-#include <string>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -19,7 +18,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 "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
@@ -369,17 +367,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);
-  }
-
   // Handle any volume changes that occured before load().
   setVolume(GetClient()->volume());
 
@@ -700,28 +687,32 @@ WebKit::WebMediaPlayer::MovieLoadType
   return WebKit::WebMediaPlayer::Unknown;
 }
 
-unsigned WebMediaPlayerImpl::decodedFrameCount() const {
+unsigned WebMediaPlayerImpl::decodedFrameCount() const
+{
   DCHECK(MessageLoop::current() == main_loop_);
 
   media::PipelineStatistics stats = pipeline_->GetStatistics();
   return stats.video_frames_decoded;
 }
 
-unsigned WebMediaPlayerImpl::droppedFrameCount() const {
+unsigned WebMediaPlayerImpl::droppedFrameCount() const
+{
   DCHECK(MessageLoop::current() == main_loop_);
 
   media::PipelineStatistics stats = pipeline_->GetStatistics();
   return stats.video_frames_dropped;
 }
 
-unsigned WebMediaPlayerImpl::audioDecodedByteCount() const {
+unsigned WebMediaPlayerImpl::audioDecodedByteCount() const
+{
   DCHECK(MessageLoop::current() == main_loop_);
 
   media::PipelineStatistics stats = pipeline_->GetStatistics();
   return stats.audio_bytes_decoded;
 }
 
-unsigned WebMediaPlayerImpl::videoDecodedByteCount() const {
+unsigned WebMediaPlayerImpl::videoDecodedByteCount() const
+{
   DCHECK(MessageLoop::current() == main_loop_);
 
   media::PipelineStatistics stats = pipeline_->GetStatistics();