Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1863)

Unified Diff: content/renderer/media/media_stream_impl.cc

Issue 12320078: Delete old RTCVideoDecoder code path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 43a1fbeecbf9e0147d7b123341b97ee230f03fec..fe7da26ef3268d052f46674daa0661cffb483596 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -14,13 +14,13 @@
#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"
@@ -251,19 +251,6 @@ MediaStreamImpl::GetVideoFrameProvider(
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;
}
@@ -537,22 +524,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())

Powered by Google App Engine
This is Rietveld 408576698