Delete old RTCVideoDecoder code path.

Remove leftover codepath from the pre-WebMediaPlayerMS days.

BUG=chromium:177572
TEST=Try apprtc.appspot.com/?debug=loopback on link.

Review URL: https://chromiumcodereview.appspot.com/12320078

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

10 files changed, 2 insertions, 95 deletions

diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 63013b3..4308f9a 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -9,14 +9,12 @@
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/filters/chunk_demuxer.h"
-#include "media/filters/dummy_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
-#include "webkit/media/media_stream_client.h"
 
 namespace webkit_media {
 
@@ -56,30 +54,6 @@ static void AddDefaultDecodersToCollection(
 #endif  // defined(MEDIA_USE_LIBVPX)
 }
 
-bool BuildMediaStreamCollection(
-    const WebKit::WebURL& url,
-    MediaStreamClient* client,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection) {
-  if (!client)
-    return false;
-
-  scoped_refptr<media::VideoDecoder> video_decoder = client->GetVideoDecoder(
-      url, message_loop);
-  if (!video_decoder)
-    return false;
-
-  // Remove all other decoders and just use the MediaStream one.
-  // NOTE: http://crbug.com/110800 is about replacing this ad-hockery with
-  // something more designed.
-  filter_collection->GetVideoDecoders()->clear();
-  filter_collection->GetVideoDecoders()->push_back(video_decoder);
-
-  filter_collection->SetDemuxer(new media::DummyDemuxer(true, false));
-
-  return true;
-}
-
 void BuildMediaSourceCollection(
     const scoped_refptr<media::ChunkDemuxer>& demuxer,
     const scoped_refptr<base::MessageLoopProxy>& message_loop,
diff --git a/webkit/media/filter_helpers.h b/webkit/media/filter_helpers.h
index f5104f1..bfa8b89 100644
--- a/webkit/media/filter_helpers.h
+++ b/webkit/media/filter_helpers.h
@@ -19,24 +19,8 @@ class FFmpegVideoDecoder;
 class FilterCollection;
 }
 
-namespace WebKit {
-class WebURL;
-}
-
 namespace webkit_media {
 
-class MediaStreamClient;
-
-// Builds the required filters for handling media stream URLs and adds them to
-// |filter_collection| returning true if successful.
-//
-// |filter_collection| is not modified if this method returns false.
-bool BuildMediaStreamCollection(
-    const WebKit::WebURL& url,
-    MediaStreamClient* client,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    media::FilterCollection* filter_collection);
-
 // Builds the required filters for handling media source URLs, adds them to
 // |filter_collection|.
 void BuildMediaSourceCollection(
diff --git a/webkit/media/media_stream_client.h b/webkit/media/media_stream_client.h
index e895c4e..23a5ada 100644
--- a/webkit/media/media_stream_client.h
+++ b/webkit/media/media_stream_client.h
@@ -11,14 +11,6 @@
 
 class GURL;
 
-namespace base {
-class MessageLoopProxy;
-}
-
-namespace media {
-class VideoDecoder;
-}
-
 namespace webkit_media {
 
 class MediaStreamAudioRenderer;
@@ -35,10 +27,6 @@ class MediaStreamClient {
       const base::Closure& error_cb,
       const VideoFrameProvider::RepaintCB& repaint_cb) = 0;
 
-  virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
-      const GURL& url,
-      const scoped_refptr<base::MessageLoopProxy>& message_loop) = 0;
-
   virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
       const GURL& url) = 0;
 
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index ff6172e..31e0e5d 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -135,7 +135,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       client_(client),
       proxy_(new WebMediaPlayerProxy(main_loop_, this)),
       delegate_(delegate),
-      media_stream_client_(params.media_stream_client()),
       media_log_(params.media_log()),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
@@ -269,15 +268,6 @@ void WebMediaPlayerImpl::load(const WebKit::WebURL& url, CORSMode cors_mode) {
   SetReadyState(WebMediaPlayer::ReadyStateHaveNothing);
   media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec()));
 
-  // Media streams pipelines can start immediately.
-  if (BuildMediaStreamCollection(url, media_stream_client_,
-                                 media_thread_.message_loop_proxy(),
-                                 filter_collection_.get())) {
-    supports_save_ = false;
-    StartPipeline();
-    return;
-  }
-
   // Media source pipelines can start immediately.
   if (!url.isEmpty() && url == GetClient()->sourceURL()) {
     chunk_demuxer_ = new media::ChunkDemuxer(
diff --git a/webkit/media/webmediaplayer_params.cc b/webkit/media/webmediaplayer_params.cc
index 1f24625..6f013b6 100644
--- a/webkit/media/webmediaplayer_params.cc
+++ b/webkit/media/webmediaplayer_params.cc
@@ -12,11 +12,9 @@ namespace webkit_media {
 WebMediaPlayerParams::WebMediaPlayerParams(
     const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
     const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories,
-    MediaStreamClient* media_stream_client,
     const scoped_refptr<media::MediaLog>& media_log)
     : audio_renderer_sink_(audio_renderer_sink),
       gpu_factories_(gpu_factories),
-      media_stream_client_(media_stream_client),
       media_log_(media_log) {
   DCHECK(media_log_);
 }
diff --git a/webkit/media/webmediaplayer_params.h b/webkit/media/webmediaplayer_params.h
index 577d04c..5fb2de9 100644
--- a/webkit/media/webmediaplayer_params.h
+++ b/webkit/media/webmediaplayer_params.h
@@ -15,8 +15,6 @@ class MediaLog;
 
 namespace webkit_media {
 
-class MediaStreamClient;
-
 // Holds parameters for constructing WebMediaPlayerImpl without having
 // to plumb arguments through various abstraction layers.
 class WebMediaPlayerParams {
@@ -25,7 +23,6 @@ class WebMediaPlayerParams {
   WebMediaPlayerParams(
       const scoped_refptr<media::AudioRendererSink>& audio_renderer_sink,
       const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories,
-      MediaStreamClient* media_stream_client,
       const scoped_refptr<media::MediaLog>& media_log);
   ~WebMediaPlayerParams();
 
@@ -38,10 +35,6 @@ class WebMediaPlayerParams {
     return gpu_factories_;
   }
 
-  MediaStreamClient* media_stream_client() const {
-    return media_stream_client_;
-  }
-
   const scoped_refptr<media::MediaLog>& media_log() const {
     return media_log_;
   }
@@ -49,7 +42,6 @@ class WebMediaPlayerParams {
  private:
   scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
   scoped_refptr<media::GpuVideoDecoder::Factories> gpu_factories_;
-  MediaStreamClient* media_stream_client_;
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc
index 69df55a..cd729b4 100644
--- a/webkit/support/test_media_stream_client.cc
+++ b/webkit/support/test_media_stream_client.cc
@@ -6,7 +6,6 @@
 
 #include "googleurl/src/gurl.h"
 #include "media/base/pipeline.h"
-#include "media/filters/video_frame_generator.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
@@ -59,21 +58,6 @@ TestMediaStreamClient::GetVideoFrameProvider(
       repaint_cb);
 }
 
-scoped_refptr<media::VideoDecoder> TestMediaStreamClient::GetVideoDecoder(
-    const GURL& url,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop) {
-  // This class is installed in a chain of possible VideoDecoder creators
-  // which are called in order until one returns an object.
-  // Make sure we are dealing with a Mock MediaStream. If not, bail out.
-  if (!IsMockMediaStreamWithVideo(url))
-    return NULL;
-
-  return new media::VideoFrameGenerator(
-      message_loop,
-      gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
-      base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs));
-}
-
 scoped_refptr<webkit_media::MediaStreamAudioRenderer>
 TestMediaStreamClient::GetAudioRenderer(const GURL& url) {
   return NULL;
diff --git a/webkit/support/test_media_stream_client.h b/webkit/support/test_media_stream_client.h
index 92f1500..ada2d3b 100644
--- a/webkit/support/test_media_stream_client.h
+++ b/webkit/support/test_media_stream_client.h
@@ -30,9 +30,6 @@ class TestMediaStreamClient : public webkit_media::MediaStreamClient {
       const GURL& url,
       const base::Closure& error_cb,
       const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
-  virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
-      const GURL& url,
-      const scoped_refptr<base::MessageLoopProxy>& message_loop) OVERRIDE;
   virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
       GetAudioRenderer(const GURL& url) OVERRIDE;
 };
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 042126f..ef455d0 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -443,7 +443,7 @@ WebKit::WebMediaPlayer* CreateMediaPlayer(
       true);
 #else
   webkit_media::WebMediaPlayerParams params(
-      NULL, NULL, NULL, new media::MediaLog());
+      NULL, NULL, new media::MediaLog());
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 1fb12e0..4cec3a4c 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -532,7 +532,7 @@ WebPlugin* TestWebViewDelegate::createPlugin(WebFrame* frame,
 WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
     WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
   webkit_media::WebMediaPlayerParams params(
-      NULL, NULL, NULL, new media::MediaLog());
+      NULL, NULL, new media::MediaLog());
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,