Delete old RTCVideoDecoder code path.

content/renderer/media/media_stream_impl.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 "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_source_extra_data.h"
-#include "content/renderer/media/rtc_video_decoder.h"
 #include "content/renderer/media/rtc_video_renderer.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/media/webrtc_audio_capturer.h"
 #include "content/renderer/media/webrtc_audio_renderer.h"
 #include "content/renderer/media/webrtc_local_audio_renderer.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
+#include "media/base/video_decoder.h"

[Ami GONE FROM CHROMIUM, 2013/02/26 23:16:55]

drop if GVD() goes away below

[wuchengli, 2013/02/27 01:45:41]

Removed.

 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/media/media_stream_audio_renderer.h"
 
@@ skipping 207 matching lines @@
   DVLOG(1) << "MediaStreamImpl::GetVideoFrameProvider stream:"
            << UTF16ToUTF8(descriptor.label());
 
   webrtc::MediaStreamInterface* stream = GetNativeMediaStream(descriptor);
   if (stream)
     return CreateVideoFrameProvider(stream, error_cb, repaint_cb);
   NOTREACHED();
   return NULL;
 }
 
 scoped_refptr<media::VideoDecoder> MediaStreamImpl::GetVideoDecoder(

[Ami GONE FROM CHROMIUM, 2013/02/26 23:16:55]

Why not delete this method?

[wuchengli, 2013/02/27 01:45:41]

Removed.

     const GURL& url,
     const scoped_refptr<base::MessageLoopProxy>& message_loop) {
-  DCHECK(CalledOnValidThread());
-  WebKit::WebMediaStream descriptor(GetMediaStream(url));
-
-  if (descriptor.isNull() || !descriptor.extraData())
-    return NULL;  // This is not a valid stream.
-
-  DVLOG(1) << "MediaStreamImpl::GetVideoDecoder stream:"
-           << UTF16ToUTF8(descriptor.label());
-
-  webrtc::MediaStreamInterface* stream = GetNativeMediaStream(descriptor);
-  if (stream)
-    return CreateVideoDecoder(stream, message_loop);
-  NOTREACHED();
   return NULL;
 }
 
 scoped_refptr<webkit_media::MediaStreamAudioRenderer>
 MediaStreamImpl::GetAudioRenderer(const GURL& url) {
   DCHECK(CalledOnValidThread());
   WebKit::WebMediaStream descriptor(GetMediaStream(url));
 
   if (descriptor.isNull() || !descriptor.extraData())
     return NULL;  // This is not a valid stream.
@@ skipping 253 matching lines @@
 
   DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoFrameProvider label:"
            << stream->label();
 
   return new RTCVideoRenderer(
       stream->GetVideoTracks()[0],
       error_cb,
       repaint_cb);
 }
 
-scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateVideoDecoder(
-    webrtc::MediaStreamInterface* stream,
-    const scoped_refptr<base::MessageLoopProxy>& message_loop) {
-  if (stream->GetVideoTracks().empty())
-    return NULL;
-
-
-  DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoDecoder label:"
-           << stream->label();
-
-  return new RTCVideoDecoder(
-      message_loop,
-      base::MessageLoopProxy::current(),
-      stream->GetVideoTracks()[0].get());
-}
-
 scoped_refptr<WebRtcAudioRenderer> MediaStreamImpl::CreateRemoteAudioRenderer(
     webrtc::MediaStreamInterface* stream) {
   if (stream->GetAudioTracks().empty())
     return NULL;
 
   DVLOG(1) << "MediaStreamImpl::CreateRemoteAudioRenderer label:"
            << stream->label();
 
   return new WebRtcAudioRenderer(RenderViewObserver::routing_id());
 }
@@ skipping 43 matching lines @@
     const StreamStopCallback& stop_callback) {
   stream_stop_callback_ = stop_callback;
 }
 
 void MediaStreamExtraData::OnLocalStreamStop() {
   if (!stream_stop_callback_.is_null())
     stream_stop_callback_.Run(stream_->label());
 }
 
 }  // namespace content