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

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

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added unit test and mock. Removed old bad mock. Created 8 years, 4 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 b68d34d2a4ecc375730cbc1efdef9117d22b74c4..dc903a6d6b23e2bee7a9c241c2f66242832f01ab 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -19,6 +19,7 @@
#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_peer_connection_handler.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"
@@ -43,6 +44,7 @@ const int kVideoCaptureFramePerSecond = 30;
enum JavaScriptAPIName {
kWebkitGetUserMedia,
kWebkitPeerConnection,
+ kWebkitRtcPeerConnection,
kInvalidName
};
} // namespace
@@ -110,6 +112,23 @@ MediaStreamImpl::CreatePeerConnectionHandlerJsep(
return pc_handler;
}
+WebKit::WebRTCPeerConnectionHandler*
+MediaStreamImpl::CreateRTCPeerConnectionHandler(
+ WebKit::WebRTCPeerConnectionHandlerClient* client) {
wjia(left Chromium) 2012/08/12 17:06:52 indent.
perkj_chrome 2012/08/13 07:35:46 Done.
+ // Save histogram data so we can see how much PeerConnetion is used.
+ // The histogram counts the number of calls to the JS API
+ // webKitRTCPeerConnection.
+ UpdateWebRTCMethodCount(kWebkitRtcPeerConnection);
+ DCHECK(CalledOnValidThread());
+ if (!EnsurePeerConnectionFactory())
+ return NULL;
+
+ RTCPeerConnectionHandler* pc_handler = new RTCPeerConnectionHandler(
+ client,
+ dependency_factory_.get());
+ return pc_handler;
+}
+
void MediaStreamImpl::StopLocalMediaStream(
const WebKit::WebMediaStreamDescriptor& stream) {
DVLOG(1) << "MediaStreamImpl::StopLocalMediaStream";

Powered by Google App Engine
This is Rietveld 408576698