Separating internal and external methods of RtpSender/RtpReceiver.

webrtc/api/rtpreceiver.h

Index: webrtc/api/rtpreceiver.h
diff --git a/webrtc/api/rtpreceiver.h b/webrtc/api/rtpreceiver.h
index 2e7339d4da448c60888fc0cba6f0bbfc1affd752..001264d7a761181f76380a6fc1b27e09569f9f60 100644
--- a/webrtc/api/rtpreceiver.h
+++ b/webrtc/api/rtpreceiver.h
@@ -26,9 +26,15 @@
 
 namespace webrtc {
 
+// Internal class used by PeerConnection.
+class RtpReceiverInternal : public RtpReceiverInterface {

[Taylor Brandstetter, 2016/06/01 20:04:26]

I called it "RtpReceiverInternal" because both "RtpReceiver" and
"RtpReceiverImpl" are taken... What should we do about this, long term? I know
we're trying to merge the "rtc", "cricket" and "webrtc" namespaces, but should
we think about having nested namespaces within "webrtc"?

[pthatcher1, 2016/06/03 23:05:49]

How about RtpSenderBase/RtpReceiverBase?

+ public:
+  virtual void Stop() = 0;
+};
+
 class AudioRtpReceiver : public ObserverInterface,
                          public AudioSourceInterface::AudioObserver,
-                         public rtc::RefCountedObject<RtpReceiverInterface> {
+                         public rtc::RefCountedObject<RtpReceiverInternal> {
  public:
   AudioRtpReceiver(MediaStreamInterface* stream,
                    const std::string& track_id,
@@ -54,11 +60,12 @@ class AudioRtpReceiver : public ObserverInterface,
 
   std::string id() const override { return id_; }
 
-  void Stop() override;
-
   RtpParameters GetParameters() const override;
   bool SetParameters(const RtpParameters& parameters) override;
 
+  // RtpReceiverInternal implementation.
+  void Stop() override;
+
  private:
   void Reconfigure();
 
@@ -69,7 +76,7 @@ class AudioRtpReceiver : public ObserverInterface,
   bool cached_track_enabled_;
 };
 
-class VideoRtpReceiver : public rtc::RefCountedObject<RtpReceiverInterface> {
+class VideoRtpReceiver : public rtc::RefCountedObject<RtpReceiverInternal> {
  public:
   VideoRtpReceiver(MediaStreamInterface* stream,
                    const std::string& track_id,
@@ -90,11 +97,12 @@ class VideoRtpReceiver : public rtc::RefCountedObject<RtpReceiverInterface> {
 
   std::string id() const override { return id_; }
 
-  void Stop() override;
-
   RtpParameters GetParameters() const override;
   bool SetParameters(const RtpParameters& parameters) override;
 
+  // RtpReceiverInternal implementation.
+  void Stop() override;
+
  private:
   std::string id_;
   uint32_t ssrc_;