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

webrtc/api/peerconnection.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.
  */
 
 #ifndef WEBRTC_API_PEERCONNECTION_H_
 #define WEBRTC_API_PEERCONNECTION_H_
 
 #include <string>
 
 #include "webrtc/api/dtlsidentitystore.h"
+#include "webrtc/api/mediaconstraintsinterface.h"
 #include "webrtc/api/peerconnectionfactory.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
 #include "webrtc/api/statscollector.h"
 #include "webrtc/api/streamcollection.h"
 #include "webrtc/api/webrtcsession.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 
 namespace webrtc {
 
 class MediaStreamObserver;
 class RemoteMediaStreamFactory;
 
 // Populates |session_options| from |rtc_options|, and returns true if options
 // are valid.
 // |session_options|->transport_options map entries must exist in order for
@@ skipping 33 matching lines @@
   rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
   rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
   bool AddStream(MediaStreamInterface* local_stream) override;
   void RemoveStream(MediaStreamInterface* local_stream) override;
 
   rtc::scoped_refptr<RtpSenderInterface> AddTrack(
       MediaStreamTrackInterface* track,
       std::vector<MediaStreamInterface*> streams) override;
   bool RemoveTrack(RtpSenderInterface* sender) override;
 
-  virtual WebRtcSession* session() { return session_.get(); }
+  // This is virtual so it can be mocked.
+  virtual WebRtcSession* session();
 
   rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
       AudioTrackInterface* track) override;
 
   rtc::scoped_refptr<RtpSenderInterface> CreateSender(
       const std::string& kind,
       const std::string& stream_id) override;
 
   std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders()
       const override;
@@ skipping 55 matching lines @@
     bool operator==(const TrackInfo& other) {
       return this->stream_label == other.stream_label &&
              this->track_id == other.track_id && this->ssrc == other.ssrc;
     }
     std::string stream_label;
     std::string track_id;
     uint32_t ssrc;
   };
   typedef std::vector<TrackInfo> TrackInfos;
 
+  class StoredConstraints;
+  class LiveSession;
+
   // Implements MessageHandler.
   void OnMessage(rtc::Message* msg) override;
 
   void CreateAudioReceiver(MediaStreamInterface* stream,
                            AudioTrackInterface* audio_track,
                            uint32_t ssrc);
   void CreateVideoReceiver(MediaStreamInterface* stream,
                            VideoTrackInterface* video_track,
                            uint32_t ssrc);
   void DestroyAudioReceiver(MediaStreamInterface* stream,
@@ skipping 159 matching lines @@
   TrackInfos* GetRemoteTracks(cricket::MediaType media_type);
   TrackInfos* GetLocalTracks(cricket::MediaType media_type);
   const TrackInfo* FindTrackInfo(const TrackInfos& infos,
                                  const std::string& stream_label,
                                  const std::string track_id) const;
 
   // Returns the specified SCTP DataChannel in sctp_data_channels_,
   // or nullptr if not found.
   DataChannel* FindDataChannelBySid(int sid) const;
 
+  void CreateLiveSession();
+  void DestroyLiveSession();
+  const WebRtcSession* session() const;
+  RemoteMediaStreamFactory* remote_stream_factory();
+  StatsCollector* stats();
+
   // Storing the factory as a scoped reference pointer ensures that the memory
   // in the PeerConnectionFactoryImpl remains available as long as the
   // PeerConnection is running. It is passed to PeerConnection as a raw pointer.
   // However, since the reference counting is done in the
   // PeerConnectionFactoryInterface all instances created using the raw pointer
   // will refer to the same reference count.
   rtc::scoped_refptr<PeerConnectionFactory> factory_;
   PeerConnectionObserver* observer_;
   UMAObserver* uma_observer_;
   SignalingState signaling_state_;
   // TODO(bemasc): Remove ice_state_.
   IceState ice_state_;
   IceConnectionState ice_connection_state_;
   IceGatheringState ice_gathering_state_;
 
   rtc::scoped_ptr<cricket::PortAllocator> port_allocator_;
-  rtc::scoped_ptr<MediaControllerInterface> media_controller_;
 
   // Streams added via AddStream.
   rtc::scoped_refptr<StreamCollection> local_streams_;
   // Streams created as a result of SetRemoteDescription.
   rtc::scoped_refptr<StreamCollection> remote_streams_;
 
   std::vector<rtc::scoped_ptr<MediaStreamObserver>> stream_observers_;
 
   // These lists store track info seen in local/remote descriptions.
   TrackInfos remote_audio_tracks_;
   TrackInfos remote_video_tracks_;
   TrackInfos local_audio_tracks_;
   TrackInfos local_video_tracks_;
 
   SctpSidAllocator sid_allocator_;
   // label -> DataChannel
   std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_;
   std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_;
   std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
 
   bool remote_peer_supports_msid_ = false;
-  rtc::scoped_ptr<RemoteMediaStreamFactory> remote_stream_factory_;
 
   std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_;
   std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_;
 
-  // The session_ scoped_ptr is declared at the bottom of PeerConnection
+  cricket::MediaConfig media_config_;
+  PeerConnectionInterface::RTCConfiguration configuration_;
+  rtc::scoped_ptr<StoredConstraints> constraints_;
+  rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store_;
+
+  // The live_session_ scoped_ptr is declared at the bottom of PeerConnection
   // because its destruction fires signals (such as VoiceChannelDestroyed)
   // which will trigger some final actions in PeerConnection...
-  rtc::scoped_ptr<WebRtcSession> session_;
-  // ... But stats_ depends on session_ so it should be destroyed even earlier.
-  rtc::scoped_ptr<StatsCollector> stats_;
+  rtc::scoped_ptr<LiveSession> live_session_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(PeerConnection);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_PEERCONNECTION_H_