Separating internal and external methods of RtpSender/RtpReceiver.

webrtc/api/rtpsender.h

Index: webrtc/api/rtpsender.h
diff --git a/webrtc/api/rtpsender.h b/webrtc/api/rtpsender.h
index 86de7658c9818b5852fc6423938fde5a731fc9cd..3b2de7ab75813b96eaa24a388937b7009edbaa38 100644
--- a/webrtc/api/rtpsender.h
+++ b/webrtc/api/rtpsender.h
@@ -28,6 +28,22 @@
 
 namespace webrtc {
 
+// Internal interface used by PeerConnection.
+class RtpSender : public RtpSenderInterface {
+ public:
+  // Used to set the SSRC of the sender, once a local description has been set.
+  // If |ssrc| is 0, this indiates that the sender should disconnect from the
+  // underlying transport (this occurs if the sender isn't seen in a local
+  // description).
+  virtual void SetSsrc(uint32_t ssrc) = 0;
+
+  // TODO(deadbeef): Support one sender having multiple stream ids.
+  virtual void set_stream_id(const std::string& stream_id) = 0;
+  virtual std::string stream_id() const = 0;
+
+  virtual void Stop() = 0;
+};
+
 // LocalAudioSinkAdapter receives data callback as a sink to the local
 // AudioTrack, and passes the data to the sink of AudioSource.
 class LocalAudioSinkAdapter : public AudioTrackSinkInterface,
@@ -53,7 +69,7 @@ class LocalAudioSinkAdapter : public AudioTrackSinkInterface,
 };
 
 class AudioRtpSender : public ObserverInterface,
-                       public rtc::RefCountedObject<RtpSenderInterface> {
+                       public rtc::RefCountedObject<RtpSender> {
  public:
   // StatsCollector provided so that Add/RemoveLocalAudioTrack can be called
   // at the appropriate times.
@@ -78,11 +94,9 @@ class AudioRtpSender : public ObserverInterface,
   // RtpSenderInterface implementation
   bool SetTrack(MediaStreamTrackInterface* track) override;
   rtc::scoped_refptr<MediaStreamTrackInterface> track() const override {
-    return track_.get();
+    return track_;
   }
 
-  void SetSsrc(uint32_t ssrc) override;
-
   uint32_t ssrc() const override { return ssrc_; }
 
   cricket::MediaType media_type() const override {
@@ -91,6 +105,17 @@ class AudioRtpSender : public ObserverInterface,
 
   std::string id() const override { return id_; }
 
+  std::vector<std::string> stream_ids() const override {
+    std::vector<std::string> ret = {stream_id_};
+    return ret;
+  }
+
+  RtpParameters GetParameters() const override;
+  bool SetParameters(const RtpParameters& parameters) override;
+  
+  // RtpSender implementation
+  void SetSsrc(uint32_t ssrc) override;
+
   void set_stream_id(const std::string& stream_id) override {
     stream_id_ = stream_id;
   }
@@ -98,9 +123,6 @@ class AudioRtpSender : public ObserverInterface,
 
   void Stop() override;
 
-  RtpParameters GetParameters() const override;
-  bool SetParameters(const RtpParameters& parameters) override;
-
  private:
   // TODO(nisse): Since SSRC == 0 is technically valid, figure out
   // some other way to test if we have a valid SSRC.
@@ -124,7 +146,7 @@ class AudioRtpSender : public ObserverInterface,
 };
 
 class VideoRtpSender : public ObserverInterface,
-                       public rtc::RefCountedObject<RtpSenderInterface> {
+                       public rtc::RefCountedObject<RtpSender> {
  public:
   VideoRtpSender(VideoTrackInterface* track,
                  const std::string& stream_id,
@@ -144,11 +166,9 @@ class VideoRtpSender : public ObserverInterface,
   // RtpSenderInterface implementation
   bool SetTrack(MediaStreamTrackInterface* track) override;
   rtc::scoped_refptr<MediaStreamTrackInterface> track() const override {
-    return track_.get();
+    return track_;
   }
 
-  void SetSsrc(uint32_t ssrc) override;
-
   uint32_t ssrc() const override { return ssrc_; }
 
   cricket::MediaType media_type() const override {
@@ -157,6 +177,17 @@ class VideoRtpSender : public ObserverInterface,
 
   std::string id() const override { return id_; }
 
+  std::vector<std::string> stream_ids() const override {
+    std::vector<std::string> ret = {stream_id_};
+    return ret;
+  }
+
+  RtpParameters GetParameters() const override;
+  bool SetParameters(const RtpParameters& parameters) override;
+
+  // RtpSender implementation
+  void SetSsrc(uint32_t ssrc) override;
+
   void set_stream_id(const std::string& stream_id) override {
     stream_id_ = stream_id;
   }
@@ -164,9 +195,6 @@ class VideoRtpSender : public ObserverInterface,
 
   void Stop() override;
 
-  RtpParameters GetParameters() const override;
-  bool SetParameters(const RtpParameters& parameters) override;
-
  private:
   bool can_send_track() const { return track_ && ssrc_; }
   // Helper function to construct options for