| Index: content/renderer/media/media_stream_impl.cc
|
| diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
|
| index 88206a7575b5cd2830f66c6e642b8257aa22acc2..df4b10bfdbe234e7a21070608b2dabaeb2379eb3 100644
|
| --- a/content/renderer/media/media_stream_impl.cc
|
| +++ b/content/renderer/media/media_stream_impl.cc
|
| @@ -14,7 +14,6 @@
|
| #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"
|
| @@ -245,25 +244,6 @@ MediaStreamImpl::GetVideoFrameProvider(
|
| return NULL;
|
| }
|
|
|
| -scoped_refptr<media::VideoDecoder> MediaStreamImpl::GetVideoDecoder(
|
| - 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());
|
| @@ -534,22 +514,6 @@ MediaStreamImpl::CreateVideoFrameProvider(
|
| 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())
|
|
|