Fix RTPPayloadRegistry to correctly restore RTX, if a valid mapping exists.

webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 65 matching lines @@
   bool RtxEnabled() const;
 
   void SetRtxSsrc(uint32_t ssrc);
 
   bool GetRtxSsrc(uint32_t* ssrc) const;
 
   void SetRtxPayloadType(int payload_type, int associated_payload_type);
 
   bool IsRtx(const RTPHeader& header) const;
 
-  bool RestoreOriginalPacket(uint8_t** restored_packet,
+  bool RestoreOriginalPacket(uint8_t* restored_packet,
                              const uint8_t* packet,
                              size_t* packet_length,
                              uint32_t original_ssrc,
                              const RTPHeader& header) const;
 
   bool IsRed(const RTPHeader& header) const;
 
   // Returns true if the media of this RTP packet is encapsulated within an
   // extra header, such as RTX or RED.
   bool IsEncapsulated(const RTPHeader& header) const;
@@ skipping 34 matching lines @@
   void set_last_received_payload_type(int8_t last_received_payload_type) {
     CriticalSectionScoped cs(crit_sect_.get());
     last_received_payload_type_ = last_received_payload_type;
   }
 
   int8_t last_received_media_payload_type() const {
     CriticalSectionScoped cs(crit_sect_.get());
     return last_received_media_payload_type_;
   };
 
+  bool use_rtx_payload_mapping_on_restore() const {
+    CriticalSectionScoped cs(crit_sect_.get());
+    return use_rtx_payload_mapping_on_restore_;
+  }
+
+  void set_use_rtx_payload_mapping_on_restore(bool val) {
+    CriticalSectionScoped cs(crit_sect_.get());
+    use_rtx_payload_mapping_on_restore_ = val;
+  }
+
  private:
   // Prunes the payload type map of the specific payload type, if it exists.
   void DeregisterAudioCodecOrRedTypeRegardlessOfPayloadType(
       const char payload_name[RTP_PAYLOAD_NAME_SIZE],
       const size_t payload_name_length,
       const uint32_t frequency,
       const uint8_t channels,
       const uint32_t rate);
 
   bool IsRtxInternal(const RTPHeader& header) const;
 
   rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
   RtpUtility::PayloadTypeMap payload_type_map_;
   rtc::scoped_ptr<RTPPayloadStrategy> rtp_payload_strategy_;
   int8_t  red_payload_type_;
   int8_t ulpfec_payload_type_;
   int8_t incoming_payload_type_;
   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
+  // correct payload type.
+  bool use_rtx_payload_mapping_on_restore_;
   uint32_t ssrc_rtx_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_PAYLOAD_REGISTRY_H_