Use RtxReceiveStream.

webrtc/call/rtx_receive_stream.h

Index: webrtc/call/rtx_receive_stream.h
diff --git a/webrtc/call/rtx_receive_stream.h b/webrtc/call/rtx_receive_stream.h
index 2830dd31f50ec72e7c0a7a76217b3e39b6828332..df125ab75b93967f09f7f0b5ae18d20680df31f1 100644
--- a/webrtc/call/rtx_receive_stream.h
+++ b/webrtc/call/rtx_receive_stream.h
@@ -17,10 +17,15 @@
 
 namespace webrtc {
 
+// TODO(nisse): Consider renaming, RtxReceiveStream looks similar to

[danilchap, 2017/08/29 13:33:06]

I doubt these kind of TODOs belong to code and even less to CL with current
description:
"Use TODO comments for code that is temporary, a short-term solution, or
good-enough but not perfect."
but this TODO is about name, not code.

It might be better to have here (non-TODO) comment that describe the class.

[nisse-webrtc, 2017/08/29 13:51:35]

Rasmus wanted a TODO...

+// VideoReceiveStream which is associated with Call. This class
+// belongs to a different level, so RtxStreamReceiver might be a
+// better name, more similar to RtpVideoStreamReceiver which belongs
+// to the same level, and processes the media packets.
 class RtxReceiveStream : public RtpPacketSinkInterface {
  public:
   RtxReceiveStream(RtpPacketSinkInterface* media_sink,
-                   std::map<int, int> rtx_payload_type_map,
+                   std::map<int, int> associated_payload_types,

[danilchap, 2017/08/29 13:33:06]

are these renames needed to use the RtxReceiveStream?

[nisse-webrtc, 2017/08/29 13:51:35]

Not strictly necessary, they're for consistency with the variable used to set
this value.

                    uint32_t media_ssrc);
   ~RtxReceiveStream() override;
   // RtpPacketSinkInterface.
@@ -28,8 +33,8 @@ class RtxReceiveStream : public RtpPacketSinkInterface {
 
  private:
   RtpPacketSinkInterface* const media_sink_;
-  // Mapping rtx_payload_type_map_[rtx] = associated.
-  const std::map<int, int> rtx_payload_type_map_;
+  // Map from rtx payload type -> media payload type.
+  const std::map<int, int> associated_payload_types_;
   // TODO(nisse): Ultimately, the media receive stream shouldn't care about the
   // ssrc, and we should delete this.
   const uint32_t media_ssrc_;