New PeerConnection handler in Chrome to support latest PeerConnection draft

content/renderer/media/media_stream_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/child_thread.h"
 #include "content/renderer/media/capture_video_decoder.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_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"
 #include "content/renderer/p2p/ipc_network_manager.h"
 #include "content/renderer/p2p/ipc_socket_factory.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "media/base/message_loop_factory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 
 namespace {
 const int kVideoCaptureWidth = 640;
 const int kVideoCaptureHeight = 480;
 const int kVideoCaptureFramePerSecond = 30;
 
 // Helper enum used for histogramming calls to WebRTC APIs from JavaScript.
 enum JavaScriptAPIName {
   kWebkitGetUserMedia,
   kWebkitPeerConnection,
+  kWebkitRtcPeerConnection,
   kInvalidName
 };
 }  // namespace
 
 // Helper method used to collect information about the number of times
 // different WebRTC API:s are called from JavaScript.
 // The histogram can be viewed at chrome://histograms/WebRTC.webkitApiCount.
 static void UpdateWebRTCMethodCount(JavaScriptAPIName api_name) {
   UMA_HISTOGRAM_ENUMERATION("WebRTC.webkitApiCount", api_name, kInvalidName);
 }
@@ skipping 47 matching lines @@
   DCHECK(CalledOnValidThread());
   if (!EnsurePeerConnectionFactory())
     return NULL;
 
   PeerConnectionHandlerJsep* pc_handler = new PeerConnectionHandlerJsep(
       client,
       dependency_factory_.get());
   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";
 
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream.extraData());
   if (extra_data && extra_data->local_stream()) {
     media_stream_dispatcher_->StopStream(extra_data->local_stream()->label());
     local_media_streams_.erase(extra_data->local_stream()->label());
   } else {
@@ skipping 430 matching lines @@
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* remote_stream)
     : remote_stream_(remote_stream) {
 }
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::LocalMediaStreamInterface* local_stream)
     : local_stream_(local_stream) {
 }
 MediaStreamExtraData::~MediaStreamExtraData() {
 }