Delete old RTCVideoDecoder code path.

webkit/media/filter_helpers.cc

 // Copyright (c) 2012 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/media/filter_helpers.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #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"

[scherkus (not reviewing), 2013/02/27 06:00:16]

can we remove this?

[wuchengli, 2013/02/27 21:37:41]

Done.

 
 namespace webkit_media {
 
 // Constructs and adds the default audio/video decoders to |filter_collection|.
 // Note that decoders in the |filter_collection| are ordered. The first
 // audio/video decoder in the |filter_collection| that supports the input
 // audio/video stream will be selected as the audio/video decoder in the media
 // pipeline. This is done by trying to initialize the decoder with the input
 // stream. Some decoder may only accept certain types of streams.
 static void AddDefaultDecodersToCollection(
@@ skipping 15 matching lines @@
       new media::FFmpegVideoDecoder(message_loop);
   filter_collection->GetVideoDecoders()->push_back(ffmpeg_video_decoder);
 
   if (cmd_line->HasSwitch(switches::kEnableVp9Playback)) {
     scoped_refptr<media::VpxVideoDecoder> vpx_video_decoder =
         new media::VpxVideoDecoder(message_loop);
     filter_collection->GetVideoDecoders()->push_back(vpx_video_decoder);
   }
 }
 
-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,
     media::FilterCollection* filter_collection) {
   DCHECK(demuxer);
   filter_collection->SetDemuxer(demuxer);
 
   // Remove GPUVideoDecoder until it supports codec config changes.
   // TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
   DCHECK_LE(filter_collection->GetVideoDecoders()->size(), 1u);
   filter_collection->GetVideoDecoders()->clear();
 
   AddDefaultDecodersToCollection(message_loop, filter_collection);
 }
 
 void BuildDefaultCollection(
     const scoped_refptr<media::DataSource>& data_source,
     const scoped_refptr<base::MessageLoopProxy>& message_loop,
     media::FilterCollection* filter_collection) {
   filter_collection->SetDemuxer(new media::FFmpegDemuxer(
       message_loop, data_source));
 
   AddDefaultDecodersToCollection(message_loop, filter_collection);
 }
 
 }  // webkit_media