Late initialize MediaController, for less resource i.e. ProcessThread, usage by PeerConnection.

webrtc/api/webrtcsession.h

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 112 matching lines @@
     STATE_INPROGRESS,        // Offer/answer exchange completed.
     STATE_CLOSED,            // Close() was called.
   };
 
   enum Error {
     ERROR_NONE = 0,       // no error
     ERROR_CONTENT = 1,    // channel errors in SetLocalContent/SetRemoteContent
     ERROR_TRANSPORT = 2,  // transport error of some kind
   };
 
-  WebRtcSession(webrtc::MediaControllerInterface* media_controller,
-                rtc::Thread* signaling_thread,
+  WebRtcSession(rtc::Thread* signaling_thread,
                 rtc::Thread* worker_thread,
                 cricket::PortAllocator* port_allocator);
   virtual ~WebRtcSession();
 
   // These are const to allow them to be called from const methods.
   rtc::Thread* signaling_thread() const { return signaling_thread_; }
   rtc::Thread* worker_thread() const { return worker_thread_; }
   cricket::PortAllocator* port_allocator() const { return port_allocator_; }
 
   // The ID of this session.
   const std::string& id() const { return sid_; }
 
   bool Initialize(
       const PeerConnectionFactoryInterface::Options& options,
       const MediaConstraintsInterface* constraints,
       rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
       const PeerConnectionInterface::RTCConfiguration& rtc_configuration);
+  void LateInitialize(webrtc::MediaControllerInterface* media_controller);
   // Deletes the voice, video and data channel and changes the session state
   // to STATE_CLOSED.
   void Close();
 
   // Returns true if we were the initial offerer.
   bool initial_offerer() const { return initial_offerer_; }
 
   // Returns the current state of the session. See the enum above for details.
   // Each time the state changes, we will fire this signal.
   State state() const { return state_; }
@@ skipping 292 matching lines @@
   cricket::PortAllocator* const port_allocator_;
 
   State state_ = STATE_INIT;
   Error error_ = ERROR_NONE;
   std::string error_desc_;
 
   const std::string sid_;
   bool initial_offerer_ = false;
 
   rtc::scoped_ptr<cricket::TransportController> transport_controller_;
-  MediaControllerInterface* media_controller_;
+  MediaControllerInterface* media_controller_ = nullptr;

[tommi, 2016/02/22 15:22:05]

wonder if ownership should simply be here.

[the sun, 2016/02/23 14:14:03]

Ack. See comment peerconnection.cc.

   rtc::scoped_ptr<cricket::VoiceChannel> voice_channel_;
   rtc::scoped_ptr<cricket::VideoChannel> video_channel_;
   rtc::scoped_ptr<cricket::DataChannel> data_channel_;
-  cricket::ChannelManager* channel_manager_;
   IceObserver* ice_observer_;
   PeerConnectionInterface::IceConnectionState ice_connection_state_;
   bool ice_connection_receiving_;
   rtc::scoped_ptr<SessionDescriptionInterface> local_desc_;
   rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_;
   // If the remote peer is using a older version of implementation.
-  bool older_version_remote_peer_;
-  bool dtls_enabled_;
+  bool older_version_remote_peer_ = false;
+  bool dtls_enabled_ = false;
+  bool disable_encryption_ = false;
+  rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_;
   // Specifies which kind of data channel is allowed. This is controlled
   // by the chrome command-line flag and constraints:
   // 1. If chrome command-line switch 'enable-sctp-data-channels' is enabled,
   // constraint kEnableDtlsSrtp is true, and constaint kEnableRtpDataChannels is
   // not set or false, SCTP is allowed (DCT_SCTP);
   // 2. If constraint kEnableRtpDataChannels is true, RTP is allowed (DCT_RTP);
   // 3. If both 1&2 are false, data channel is not allowed (DCT_NONE).
   cricket::DataChannelType data_channel_type_;
   rtc::scoped_ptr<IceRestartAnswerLatch> ice_restart_latch_;
 
   rtc::scoped_ptr<WebRtcSessionDescriptionFactory>
       webrtc_session_desc_factory_;
 
   // Member variables for caching global options.
   cricket::AudioOptions audio_options_;
   cricket::VideoOptions video_options_;
   MetricsObserverInterface* metrics_observer_;
 
   // Declares the bundle policy for the WebRTCSession.
   PeerConnectionInterface::BundlePolicy bundle_policy_;
 
   // Declares the RTCP mux policy for the WebRTCSession.
   PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_WEBRTCSESSION_H_