Exposing RtpSenders and RtpReceivers from PeerConnection.

talk/app/webrtc/peerconnection.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 11 matching lines @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TALK_APP_WEBRTC_PEERCONNECTION_H_
 #define TALK_APP_WEBRTC_PEERCONNECTION_H_
 
 #include <string>
+#include <utility>  // for std::pair
 
 #include "talk/app/webrtc/dtlsidentitystore.h"
 #include "talk/app/webrtc/mediastreamsignaling.h"
 #include "talk/app/webrtc/peerconnectionfactory.h"
 #include "talk/app/webrtc/peerconnectioninterface.h"
+#include "talk/app/webrtc/rtpreceiver.h"
+#include "talk/app/webrtc/rtpsender.h"
 #include "talk/app/webrtc/statscollector.h"
 #include "talk/app/webrtc/streamcollection.h"
 #include "talk/app/webrtc/webrtcsession.h"
 #include "webrtc/base/scoped_ptr.h"
 
 namespace webrtc {
-class MediaStreamHandlerContainer;
 
 typedef std::vector<PortAllocatorFactoryInterface::StunConfiguration>
     StunConfigurations;
 typedef std::vector<PortAllocatorFactoryInterface::TurnConfiguration>
     TurnConfigurations;
 
-// PeerConnectionImpl implements the PeerConnection interface.
+// PeerConnection implements the PeerConnectionInterface interface.
 // It uses MediaStreamSignaling and WebRtcSession to implement
 // the PeerConnection functionality.
 class PeerConnection : public PeerConnectionInterface,
                        public MediaStreamSignalingObserver,
                        public IceObserver,
                        public rtc::MessageHandler,
                        public sigslot::has_slots<> {
  public:
   explicit PeerConnection(PeerConnectionFactory* factory);
 
   bool Initialize(
       const PeerConnectionInterface::RTCConfiguration& configuration,
       const MediaConstraintsInterface* constraints,
       PortAllocatorFactoryInterface* allocator_factory,
       rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
       PeerConnectionObserver* observer);
   virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams();
   virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams();
   virtual bool AddStream(MediaStreamInterface* local_stream);
   virtual void RemoveStream(MediaStreamInterface* local_stream);
 
   virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
       AudioTrackInterface* track);
 
+  RtpSenderRefptrs GetSenders() const override;
+  RtpReceiverRefptrs GetReceivers() const override;
+
   virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
       const std::string& label,
       const DataChannelInit* config);
   virtual bool GetStats(StatsObserver* observer,
                         webrtc::MediaStreamTrackInterface* track,
                         StatsOutputLevel level);
 
   virtual SignalingState signaling_state();
 
   // TODO(bemasc): Remove ice_state() when callers are removed.
@@ skipping 76 matching lines @@
     return factory_->signaling_thread();
   }
 
   void PostSetSessionDescriptionFailure(SetSessionDescriptionObserver* observer,
                                         const std::string& error);
 
   bool IsClosed() const {
     return signaling_state_ == PeerConnectionInterface::kClosed;
   }
 
+  typedef std::pair<rtc::scoped_refptr<BaseRtpSender>,
+                    rtc::scoped_refptr<RtpSenderInterface>> RtpSenderPair;
+  typedef std::pair<rtc::scoped_refptr<BaseRtpReceiver>,
+                    rtc::scoped_refptr<RtpReceiverInterface>> RtpReceiverPair;

[pthatcher1, 2015/09/23 14:47:39]

This seems a bit too complicated.  Can we just move Stop/Detach into the
RtpReceiverInterface and then not have to have a
rtc::scoped_refptr<BaseRtpReceiver> and then just have a
rtc::scoped_refptr<RtpReceiverInterface>?  That seems like it would be much more
simple.

+  typedef std::vector<RtpSenderPair> RtpSenderPairList;
+  typedef std::vector<RtpReceiverPair> RtpReceiverPairList;
+
+  void AddRtpSender(BaseRtpSender* sender);
+  void AddRtpReceiver(BaseRtpReceiver* receiver);
+
+  RtpSenderPairList::iterator FindRtpSenderPairForTrack(
+      MediaStreamTrackInterface* track);
+  RtpReceiverPairList::iterator FindRtpReceiverPairForTrack(
+      MediaStreamTrackInterface* track);
+
   // 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
   // PeerConnectionFactoryInteface 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<WebRtcSession> session_;
   rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_;
-  rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_;
   rtc::scoped_ptr<StatsCollector> stats_;
+
+  // Store pairs of base pointers and pointers to proxy objects, so that when
+  // GetSenders/GetReceivers is called, we can return the same proxy objects
+  // each time.
+  RtpSenderPairList rtp_sender_pairs_;
+  RtpReceiverPairList rtp_receiver_pairs_;

[pthatcher1, 2015/09/23 14:47:39]

***

[pthatcher1, 2015/09/23 14:59:09]

This was a not to myself to come back and say "Why can't this just be
std::vector<rtc::scoped_refptr<RtpReceiver>> receivers_"?   Why can't we return
the same RtpReceiver objects every time?  

 };
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_PEERCONNECTION_H_