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

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

Issue 83023005: Add VideoTrackSink interface to content/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added AddToVideoTrack Created 7 years, 1 month 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 c6c1454c5caf21ab4268052fcaa7e6f40ba2d845..a27b30b50a86459984e28afeacbcf03ac5a23eb6 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -242,11 +242,12 @@ MediaStreamImpl::GetVideoFrameProvider(
DVLOG(1) << "MediaStreamImpl::GetVideoFrameProvider stream:"
<< UTF16ToUTF8(web_stream.id());
- webrtc::MediaStreamInterface* stream = GetNativeMediaStream(web_stream);
- if (stream)
- return CreateVideoFrameProvider(stream, error_cb, repaint_cb);
- NOTREACHED();
- return NULL;
+ blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
+ web_stream.videoTracks(video_tracks);
+ if (video_tracks.isEmpty())
+ return NULL;
+
+ return new RTCVideoRenderer(video_tracks[0], error_cb, repaint_cb);
}
scoped_refptr<MediaStreamAudioRenderer>
@@ -756,23 +757,6 @@ void MediaStreamImpl::StopUnreferencedSources(bool notify_dispatcher) {
}
}
-scoped_refptr<VideoFrameProvider>
-MediaStreamImpl::CreateVideoFrameProvider(
- webrtc::MediaStreamInterface* stream,
- const base::Closure& error_cb,
- const VideoFrameProvider::RepaintCB& repaint_cb) {
- if (stream->GetVideoTracks().empty())
- return NULL;
-
- DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoFrameProvider label:"
- << stream->label();
-
- return new RTCVideoRenderer(
- stream->GetVideoTracks()[0],
- error_cb,
- repaint_cb);
-}
-
scoped_refptr<WebRtcAudioRenderer> MediaStreamImpl::CreateRemoteAudioRenderer(
webrtc::MediaStreamInterface* stream) {
if (stream->GetAudioTracks().empty())

Powered by Google App Engine
This is Rietveld 408576698