Chromium Code Reviews| 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 c2f467af35bfdf1a3d1599c906385a4c61497bfe..a3a9fc15018c882365b9b5eeed1449c3916dd6fd 100644 |
| --- a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h |
| +++ b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h |
| @@ -11,6 +11,8 @@ |
| #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ |
| #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ |
| +#include <map> |
| + |
| #include "webrtc/base/scoped_ptr.h" |
| #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" |
| #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" |
| @@ -52,7 +54,7 @@ class RTPPayloadStrategy { |
| class RTPPayloadRegistry { |
| public: |
| // The registry takes ownership of the strategy. |
| - RTPPayloadRegistry(RTPPayloadStrategy* rtp_payload_strategy); |
| + explicit RTPPayloadRegistry(RTPPayloadStrategy* rtp_payload_strategy); |
| ~RTPPayloadRegistry(); |
| int32_t RegisterReceivePayload( |
| @@ -108,8 +110,13 @@ class RTPPayloadRegistry { |
| int GetPayloadTypeFrequency(uint8_t payload_type) const; |
| + // Depricated. |
|
mflodman
2015/12/09 09:19:13
Here and elsewhere:
s/depricated/deprecated
danilchap
2015/12/09 11:23:36
Done.
|
| bool PayloadTypeToPayload(const uint8_t payload_type, |
| - RtpUtility::Payload*& payload) const; |
| + RtpUtility::Payload*& payload) const { // NOLINT |
| + payload = PayloadTypeToPayload(payload_type); |
| + return (payload != nullptr); |
| + } |
| + RtpUtility::Payload* PayloadTypeToPayload(uint8_t payload_type) const; |
| void ResetLastReceivedPayloadTypes() { |
| CriticalSectionScoped cs(crit_sect_.get()); |
| @@ -145,7 +152,7 @@ class RTPPayloadRegistry { |
| 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()); |