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 457649d97ef6bcdfb43cc7999fe44f5b8f66112d..a1dac1d6403b08ebc9a801eac19ccabd58015dd1 100644 |
--- a/content/renderer/media/media_stream_impl.cc |
+++ b/content/renderer/media/media_stream_impl.cc |
@@ -248,11 +248,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> |
@@ -766,23 +767,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()) |