Revert of Make RTX pt/apt reconfigurable by calling WebRtcVideoChannel2::SetRecvParameters.

webrtc/video_receive_stream.h

Index: webrtc/video_receive_stream.h
diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h
index 511db3462cdcd0a349268be862e5b792ac5f690b..7d97a29c6926da638e175f918aa540ed6b9cebfd 100644
--- a/webrtc/video_receive_stream.h
+++ b/webrtc/video_receive_stream.h
@@ -117,7 +117,6 @@
 
       // Synchronization source (stream identifier) to be received.
       uint32_t remote_ssrc = 0;
-
       // Sender SSRC used for sending RTCP (such as receiver reports).
       uint32_t local_ssrc = 0;
 
@@ -143,12 +142,19 @@
       // See UlpfecConfig for description.
       UlpfecConfig ulpfec;
 
-      // SSRC for retransmissions.
-      uint32_t rtx_ssrc = 0;
-
-      // Map from video payload type (apt) -> RTX payload type (pt).
-      // For RTX to be enabled, both an SSRC and this mapping are needed.
-      std::map<int, int> rtx_payload_types;
+      // RTX settings for incoming video payloads that may be received. RTX is
+      // disabled if there's no config present.
+      struct Rtx {
+        // SSRCs to use for the RTX streams.
+        uint32_t ssrc = 0;
+
+        // Payload type to use for the RTX stream.
+        int payload_type = 0;
+      };
+
+      // Map from video RTP payload type -> RTX config.
+      typedef std::map<int, Rtx> RtxMap;
+      RtxMap rtx;
 
       // RTP header extensions used for the received stream.
       std::vector<RtpExtension> extensions;