Adding a skeleton MediaStreamCenter.

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_center.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/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"
@@ skipping 50 matching lines @@
     MediaStreamDispatcher* media_stream_dispatcher,
     content::P2PSocketDispatcher* p2p_socket_dispatcher,
     VideoCaptureImplManager* vc_manager,
     MediaStreamDependencyFactory* dependency_factory)
     : dependency_factory_(dependency_factory),
       media_stream_dispatcher_(media_stream_dispatcher),
       p2p_socket_dispatcher_(p2p_socket_dispatcher),
       network_manager_(NULL),
       vc_manager_(vc_manager),
       peer_connection_handler_(NULL),
+      media_stream_center_(NULL),
       message_loop_proxy_(base::MessageLoopProxy::current()),
       signaling_thread_(NULL),
       worker_thread_(NULL),
       chrome_worker_thread_("Chrome_libJingle_WorkerThread") {
 }
 
 MediaStreamImpl::~MediaStreamImpl() {
   DCHECK(!peer_connection_handler_);
   if (dependency_factory_.get())
     dependency_factory_->ReleasePeerConnectionFactory();
   if (network_manager_) {
     // The network manager needs to free its resources on the thread they were
     // created, which is the worked thread.
     if (chrome_worker_thread_.IsRunning()) {
       chrome_worker_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
           &MediaStreamImpl::DeleteIpcNetworkManager,
           base::Unretained(this)));
     } else {
       NOTREACHED() << "Worker thread not running.";
     }
   }
 }
 
 WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler(
     WebKit::WebPeerConnectionHandlerClient* client) {
   DCHECK(CalledOnValidThread());
   if (peer_connection_handler_) {
     DVLOG(1) << "A PeerConnection already exists";

[tommi (sloooow) - chröme, 2012/02/03 14:39:45]

should this be a NOTREACHED()? (a question for HenrikG)

[tommyw, 2012/02/03 14:58:25]

No, we need to support more than one PeerConnection per tab, this is just a
temporary limitation.

[Henrik Grunell, 2012/02/06 20:06:49]

Agree, furthermore WebKit should be allowed to call several times even if the
Chrome embedder has this limitation at the moment. Maybe the log message isn't
perfect but we will support several PCs pretty soon.

     return NULL;
   }
   EnsurePeerConnectionFactory();
 
   peer_connection_handler_ = new PeerConnectionHandler(
       client,
       this,
       dependency_factory_.get());
 
   return peer_connection_handler_;
 }
 
+WebKit::WebMediaStreamCenter* MediaStreamImpl::CreateMediaStreamCenter(
+    WebKit::WebMediaStreamCenterClient* client) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(!media_stream_center_);
+
+  media_stream_center_ = new MediaStreamCenter(client);

[tommi (sloooow) - chröme, 2012/02/03 14:39:45]

why do we hold on to the pointer?
Isn't the ownership passed to the caller?

[tommyw, 2012/02/03 14:58:25]

Eventually MediaStreamImpl (aka the glue code) need to use this pointer to send
messages to WebKit, so just future-proofing.

+  return media_stream_center_;
+}
+
 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)
     it->second->set_state(webrtc::MediaStreamTrackInterface::kEnded);
 }
@@ skipping 315 matching lines @@
 }
 
 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper() {}
 
 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {}
 
 void MediaStreamImpl::VideoRendererWrapper::SetVideoDecoder(
     RTCVideoDecoder* decoder) {
   rtc_video_decoder_ = decoder;
 }