Send audio and video codecs to 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 {
 

[danilchap, 2016/11/23 15:19:23]

forward declare CodecInst/VideoCodec and include webrtc/common_types.h in the
.cc file.
[or explicitly include webrtc/common_types.h here]

[magjed_webrtc, 2016/11/23 16:35:52]

Done.

 // This strategy deals with the audio/video-specific aspects
 // of payload handling.
 class RTPPayloadStrategy {
  public:
   virtual ~RTPPayloadStrategy() {}
 
   virtual bool CodecsMustBeUnique() const = 0;
 
   virtual bool PayloadIsCompatible(const RtpUtility::Payload& payload,
                                    uint32_t frequency,
@@ skipping 17 matching lines @@
  protected:
   RTPPayloadStrategy() {}
 };
 
 class RTPPayloadRegistry {
  public:
   // The registry takes ownership of the strategy.
   explicit RTPPayloadRegistry(RTPPayloadStrategy* rtp_payload_strategy);
   ~RTPPayloadRegistry();
 
-  int32_t RegisterReceivePayload(const char* payload_name,
-                                 int8_t payload_type,
-                                 uint32_t frequency,
-                                 size_t channels,
-                                 uint32_t rate,
+  // TODO(magjed): Split RTPPayloadRegistry into separate Audio and Video class
+  // 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,
                                  bool* created_new_payload_type);
 
   int32_t DeRegisterReceivePayload(int8_t payload_type);
 
-  int32_t ReceivePayloadType(const char* payload_name,
-                             uint32_t frequency,
-                             size_t channels,
-                             uint32_t rate,
+  int32_t ReceivePayloadType(const CodecInst& audio_codec,
+                             int8_t* payload_type) const;
+  int32_t ReceivePayloadType(const VideoCodec& video_codec,
                              int8_t* payload_type) const;
 
   bool RtxEnabled() const;
 
   void SetRtxSsrc(uint32_t ssrc);
 
   bool GetRtxSsrc(uint32_t* ssrc) const;
 
   void SetRtxPayloadType(int payload_type, int associated_payload_type);
 
@@ skipping 49 matching lines @@
   }
 
   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 char* payload_name,
       size_t payload_name_length,
       uint32_t frequency,
       size_t channels,
       uint32_t rate);
 
   bool IsRtxInternal(const RTPHeader& header) const;
 
@@ skipping 10 matching lines @@
   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_