Index: content/renderer/media/media_stream_impl.cc |
=================================================================== |
--- content/renderer/media/media_stream_impl.cc (revision 154837) |
+++ content/renderer/media/media_stream_impl.cc (working copy) |
@@ -15,10 +15,12 @@ |
#include "base/utf_string_conversions.h" |
#include "content/common/child_thread.h" |
#include "content/renderer/media/capture_video_decoder.h" |
+#include "content/renderer/media/local_video_capture.h" |
#include "content/renderer/media/media_stream_extra_data.h" |
#include "content/renderer/media/media_stream_dependency_factory.h" |
#include "content/renderer/media/media_stream_dispatcher.h" |
#include "content/renderer/media/peer_connection_handler_jsep.h" |
+#include "content/renderer/media/rtc_video_render.h" |
#include "content/renderer/media/video_capture_impl_manager.h" |
#include "content/renderer/media/video_capture_module_impl.h" |
#include "content/renderer/media/webrtc_audio_device_impl.h" |
@@ -199,6 +201,53 @@ |
return WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url); |
} |
+bool MediaStreamImpl::IsMediaStream(const GURL& url) { |
+ DCHECK(CalledOnValidThread()); |
+ WebKit::WebMediaStreamDescriptor descriptor(GetMediaStream(url)); |
+ |
+ // TODO(wjia): remove this to switch to VideoFrameProvier. |
scherkus (not reviewing)
2012/09/07 11:44:03
I'd rather see this disabling w/ TODO + link to bu
wjia(left Chromium)
2012/09/13 01:22:07
Done.
|
+ return false; |
+ |
+ if (descriptor.isNull() || !descriptor.extraData()) |
+ return false; // This is not a valid stream. |
+ |
+ MediaStreamExtraData* extra_data = |
+ static_cast<MediaStreamExtraData*>(descriptor.extraData()); |
+ webrtc::MediaStreamInterface* stream = extra_data->local_stream(); |
+ if (stream && stream->video_tracks() && stream->video_tracks()->count() > 0) |
+ return true; |
+ stream = extra_data->remote_stream(); |
+ if (stream && stream->video_tracks() && stream->video_tracks()->count() > 0) |
+ return true; |
+ return false; |
+} |
+ |
+scoped_refptr<webkit_media::VideoFrameProvider> |
+MediaStreamImpl::GetVideoFrameProvider( |
+ const GURL& url, |
+ const base::Closure& error_cb, |
+ const webkit_media::RepaintCB& repaint_cb) { |
+ DCHECK(CalledOnValidThread()); |
+ WebKit::WebMediaStreamDescriptor descriptor(GetMediaStream(url)); |
+ |
+ if (descriptor.isNull() || !descriptor.extraData()) |
+ return NULL; // This is not a valid stream. |
+ |
+ DVLOG(1) << "MediaStreamImpl::GetVideoFrameProvider stream:" |
+ << UTF16ToUTF8(descriptor.label()); |
+ |
+ MediaStreamExtraData* extra_data = |
+ static_cast<MediaStreamExtraData*>(descriptor.extraData()); |
+ if (extra_data->local_stream()) |
+ return CreateLocalVideoFrameProvider(extra_data->local_stream(), |
+ error_cb, repaint_cb); |
+ if (extra_data->remote_stream()) |
+ return CreateRemoteVideoFrameProvider(extra_data->remote_stream(), |
+ error_cb, repaint_cb); |
+ NOTREACHED(); |
+ return NULL; |
+} |
+ |
scoped_refptr<media::VideoDecoder> MediaStreamImpl::GetVideoDecoder( |
const GURL& url, |
media::MessageLoopFactory* message_loop_factory) { |
@@ -466,6 +515,52 @@ |
} |
} |
+scoped_refptr<webkit_media::VideoFrameProvider> |
+MediaStreamImpl::CreateLocalVideoFrameProvider( |
+ webrtc::MediaStreamInterface* stream, |
+ const base::Closure& error_cb, |
+ const webkit_media::RepaintCB& repaint_cb) { |
+ if (!stream->video_tracks() || stream->video_tracks()->count() == 0) |
+ return NULL; |
+ |
+ int video_session_id = |
+ media_stream_dispatcher_->video_session_id(stream->label(), 0); |
+ media::VideoCaptureCapability capability; |
+ capability.width = kVideoCaptureWidth; |
+ capability.height = kVideoCaptureHeight; |
+ capability.frame_rate = kVideoCaptureFramePerSecond; |
+ capability.color = media::VideoCaptureCapability::kI420; |
+ capability.expected_capture_delay = 0; |
+ capability.interlaced = false; |
+ |
+ DVLOG(1) << "MediaStreamImpl::CreateLocalVideoFrameProvider video_session_id:" |
+ << video_session_id; |
+ |
+ return new LocalVideoCapture( |
+ video_session_id, |
+ vc_manager_.get(), |
+ capability, |
+ error_cb, |
+ repaint_cb); |
+} |
+ |
+scoped_refptr<webkit_media::VideoFrameProvider> |
+MediaStreamImpl::CreateRemoteVideoFrameProvider( |
+ webrtc::MediaStreamInterface* stream, |
+ const base::Closure& error_cb, |
+ const webkit_media::RepaintCB& repaint_cb) { |
+ if (!stream->video_tracks() || stream->video_tracks()->count() == 0) |
+ return NULL; |
+ |
+ DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoFrameProvider label:" |
+ << stream->label(); |
+ |
+ return new RTCVideoRender( |
+ stream->video_tracks()->at(0), |
+ error_cb, |
+ repaint_cb); |
+} |
+ |
scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateLocalVideoDecoder( |
webrtc::MediaStreamInterface* stream, |
media::MessageLoopFactory* message_loop_factory) { |