Remove RED/RTX workaround from sender/receiver and VideoEngine2.

webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

Index: webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
index b0975a05bdb6e360a98970072a87ae7eacda6158..7aab5b7a91a5aad0eb336228e8d27c1375fd1dcc 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
@@ -15,6 +15,7 @@
 #include <memory>
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/deprecation.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
@@ -137,15 +138,7 @@ class RTPPayloadRegistry {
     return last_received_media_payload_type_;
   }
 
-  bool use_rtx_payload_mapping_on_restore() const {
-    rtc::CritScope cs(&crit_sect_);
-    return use_rtx_payload_mapping_on_restore_;
-  }
-
-  void set_use_rtx_payload_mapping_on_restore(bool val) {
-    rtc::CritScope cs(&crit_sect_);
-    use_rtx_payload_mapping_on_restore_ = val;
-  }
+  RTC_DEPRECATED void set_use_rtx_payload_mapping_on_restore(bool val) {}
 
  private:
   // Prunes the payload type map of the specific payload type, if it exists.
@@ -167,14 +160,8 @@ class RTPPayloadRegistry {
   int8_t last_received_payload_type_;
   int8_t last_received_media_payload_type_;
   bool rtx_;
-  // TODO(changbin): Remove rtx_payload_type_ once interop with old clients that
-  // only understand one RTX PT is no longer needed.
-  int rtx_payload_type_;
   // Mapping rtx_payload_type_map_[rtx] = associated.
   std::map<int, int> rtx_payload_type_map_;
-  // When true, use rtx_payload_type_map_ when restoring RTX packets to get the

[danilchap, 2016/11/02 13:56:52]

When false, still use rtx_payload_type_map_.
Nice to see unused confusing variables removed.

-  // correct payload type.
-  bool use_rtx_payload_mapping_on_restore_;
   uint32_t ssrc_rtx_;
 };