Adding JSEP PeerConnection glue.

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/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/capture_video_decoder.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.h"
+#include "content/renderer/media/peer_connection_handler_jsep.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 "content/renderer/p2p/socket_dispatcher.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "media/base/message_loop_factory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
@@ skipping 84 matching lines @@
 WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler(
     WebKit::WebPeerConnectionHandlerClient* client) {
   DCHECK(CalledOnValidThread());
   if (peer_connection_handler_) {
     DVLOG(1) << "A PeerConnection already exists";
     return NULL;
   }
   if (!EnsurePeerConnectionFactory())
     return NULL;
 
-  peer_connection_handler_ = new PeerConnectionHandler(
+  PeerConnectionHandler* pc_handler = new PeerConnectionHandler(
+          client,

[tommi (sloooow) - chröme, 2012/03/15 12:31:52]

strange indent. run lint?

[Henrik Grunell, 2012/03/23 12:50:45]

Done.

+          this,
+          dependency_factory_.get());
+
+  peer_connection_handler_ = pc_handler;
+  return pc_handler;
+}
+
+WebKit::WebJSEPPeerConnectionHandler*
+MediaStreamImpl::CreatePeerConnectionHandlerJsep(
+    WebKit::WebJSEPPeerConnectionHandlerClient* client) {
+  DCHECK(CalledOnValidThread());
+  if (peer_connection_handler_) {
+    DVLOG(1) << "A PeerConnection already exists";
+    return NULL;
+  }
+  if (!EnsurePeerConnectionFactory())
+    return NULL;
+
+  PeerConnectionHandlerJsep* pc_handler = new PeerConnectionHandlerJsep(
       client,
       this,
       dependency_factory_.get());
 
-  return peer_connection_handler_;
+  peer_connection_handler_ = pc_handler;
+  return pc_handler;
 }
 
 void MediaStreamImpl::ClosePeerConnection() {
   DCHECK(CalledOnValidThread());
   video_renderer_ = NULL;
   peer_connection_handler_ = NULL;
   // TODO(grunell): This is a temporary workaround for an error in native
   // PeerConnection where added live tracks are not seen on the remote side.
   MediaStreamTrackPtrMap::const_iterator it = local_tracks_.begin();
   for (; it != local_tracks_.end(); ++it)
@@ skipping 334 matching lines @@
 }
 
 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper() {}
 
 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {}
 
 void MediaStreamImpl::VideoRendererWrapper::SetVideoDecoder(
     RTCVideoDecoder* decoder) {
   rtc_video_decoder_ = decoder;
 }