Revert of Remove RTPPayloadStrategy and simplify RTPPayloadRegistry

webrtc/modules/rtp_rtcp/include/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.
  */
 
 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
 
 #include <map>
 #include <memory>
 #include <set>
 
 #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"
 
 namespace webrtc {
 
 struct CodecInst;
 class VideoCodec;
 
-// TODO(magjed): Remove once external code is updated.
+// This strategy deals with the audio/video-specific aspects
+// of payload handling.
 class RTPPayloadStrategy {
  public:
-  static RTPPayloadStrategy* CreateStrategy(bool handling_audio) {
-    return nullptr;
-  }
+  virtual ~RTPPayloadStrategy() {}
+
+  virtual bool CodecsMustBeUnique() const = 0;
+
+  virtual bool PayloadIsCompatible(const RtpUtility::Payload& payload,
+                                   uint32_t frequency,
+                                   size_t channels,
+                                   uint32_t rate) const = 0;
+
+  virtual void UpdatePayloadRate(RtpUtility::Payload* payload,
+                                 uint32_t rate) const = 0;
+
+  virtual RtpUtility::Payload* CreatePayloadType(const char* payload_name,
+                                                 int8_t payload_type,
+                                                 uint32_t frequency,
+                                                 size_t channels,
+                                                 uint32_t rate) const = 0;
+
+  virtual int GetPayloadTypeFrequency(
+      const RtpUtility::Payload& payload) const = 0;
+
+  static RTPPayloadStrategy* CreateStrategy(bool handling_audio);
+
+ protected:
+  RTPPayloadStrategy() {}
 };
 
 class RTPPayloadRegistry {
  public:
-  RTPPayloadRegistry();
+  // The registry takes ownership of the strategy.
+  explicit RTPPayloadRegistry(RTPPayloadStrategy* rtp_payload_strategy);
   ~RTPPayloadRegistry();
-  // TODO(magjed): Remove once external code is updated.
-  explicit RTPPayloadRegistry(RTPPayloadStrategy* rtp_payload_strategy)
-      : RTPPayloadRegistry() {}
 
   // TODO(magjed): Split RTPPayloadRegistry into separate Audio and Video class
-  // and simplify the code. http://crbug/webrtc/6743.
+  // and remove RTPPayloadStrategy, RTPPayloadVideoStrategy,
+  // RTPPayloadAudioStrategy, and simplify the code. http://crbug/webrtc/6743.
   int32_t RegisterReceivePayload(const CodecInst& audio_codec,
                                  bool* created_new_payload_type);
   int32_t RegisterReceivePayload(const VideoCodec& video_codec);
 
   int32_t DeRegisterReceivePayload(int8_t payload_type);
 
   int32_t ReceivePayloadType(const CodecInst& audio_codec,
                              int8_t* payload_type) const;
   int32_t ReceivePayloadType(const VideoCodec& video_codec,
                              int8_t* payload_type) const;
@@ skipping 33 matching lines @@
   }
 
   // This sets the payload type of the packets being received from the network
   // on the media SSRC. For instance if packets are encapsulated with RED, this
   // payload type will be the RED payload type.
   void SetIncomingPayloadType(const RTPHeader& header);
 
   // Returns true if the new media payload type has not changed.
   bool ReportMediaPayloadType(uint8_t media_payload_type);
 
-  int8_t red_payload_type() const { return GetPayloadTypeWithName("red"); }
+  int8_t red_payload_type() const {
+    rtc::CritScope cs(&crit_sect_);
+    return red_payload_type_;
+  }
   int8_t ulpfec_payload_type() const {
-    return GetPayloadTypeWithName("ulpfec");
+    rtc::CritScope cs(&crit_sect_);
+    return ulpfec_payload_type_;
   }
   int8_t last_received_payload_type() const {
     rtc::CritScope cs(&crit_sect_);
     return last_received_payload_type_;
   }
   void set_last_received_payload_type(int8_t last_received_payload_type) {
     rtc::CritScope cs(&crit_sect_);
     last_received_payload_type_ = last_received_payload_type;
   }
 
   int8_t last_received_media_payload_type() const {
     rtc::CritScope cs(&crit_sect_);
     return last_received_media_payload_type_;
   }
 
   RTC_DEPRECATED void set_use_rtx_payload_mapping_on_restore(bool val) {}
 
  private:
+  int32_t RegisterReceivePayload(const char* payload_name,
+                                 int8_t payload_type,
+                                 uint32_t frequency,
+                                 size_t channels,
+                                 uint32_t rate,
+                                 bool* created_new_payload_type);
+
+  int32_t ReceivePayloadType(const char* payload_name,
+                             uint32_t frequency,
+                             size_t channels,
+                             uint32_t rate,
+                             int8_t* payload_type) const;
+
   // Prunes the payload type map of the specific payload type, if it exists.
   void DeregisterAudioCodecOrRedTypeRegardlessOfPayloadType(
-      const CodecInst& audio_codec);
+      const char* payload_name,
+      size_t payload_name_length,
+      uint32_t frequency,
+      size_t channels,
+      uint32_t rate);
 
   bool IsRtxInternal(const RTPHeader& header) const;
-  // Returns the payload type for the payload with name |payload_name|, or -1 if
-  // no such payload is registered.
-  int8_t GetPayloadTypeWithName(const char* payload_name) const;
 
   rtc::CriticalSection crit_sect_;
-  std::map<int, RtpUtility::Payload> payload_type_map_;
+  RtpUtility::PayloadTypeMap payload_type_map_;
+  std::unique_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_;
   // Mapping rtx_payload_type_map_[rtx] = associated.
   std::map<int, int> rtx_payload_type_map_;
   uint32_t ssrc_rtx_;
   // Only warn once per payload type, if an RTX packet is received but
   // no associated payload type found in |rtx_payload_type_map_|.
   std::set<int> payload_types_with_suppressed_warnings_ GUARDED_BY(crit_sect_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_