modules/rtp_rtcp/include folder cleared of lint warnings

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 "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
 namespace webrtc {
 
 // This strategy deals with the audio/video-specific aspects
 // of payload handling.
 class RTPPayloadStrategy {
  public:
@@ skipping 21 matching lines @@
 
   static RTPPayloadStrategy* CreateStrategy(const bool handling_audio);
 
  protected:
   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(
       const char payload_name[RTP_PAYLOAD_NAME_SIZE],
       const int8_t payload_type,
       const uint32_t frequency,
       const uint8_t channels,
       const uint32_t rate,
       bool* created_new_payload_type);
 
@@ skipping 35 matching lines @@
   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;
 
   bool GetPayloadSpecifics(uint8_t payload_type, PayloadUnion* payload) const;
 
   int GetPayloadTypeFrequency(uint8_t payload_type) const;
 
+  // DEPRECATED. Use PayloadTypeToPayload below that returns const Payload*
+  // instead of taking output parameter.
+  // TODO(danilchap): Remove this when all callers have been updated.
   bool PayloadTypeToPayload(const uint8_t payload_type,
-                            RtpUtility::Payload*& payload) const;
+                            RtpUtility::Payload*& payload) const {  // NOLINT
+    payload =
+        const_cast<RtpUtility::Payload*>(PayloadTypeToPayload(payload_type));
+    return payload;

[mflodman, 2015/12/10 08:24:23]

Here I'd still prefer to return != nullptr to clerly show it's a bool, but let's
discuss if you disagree.

[danilchap, 2015/12/10 09:01:15]

I have arguments both for and against it, but both of them are week for a small
deprecated function.
So would go for payload != nullptr since you and my taste agree this for is more
clear.

+  }
+  const RtpUtility::Payload* PayloadTypeToPayload(uint8_t payload_type) const;
 
   void ResetLastReceivedPayloadTypes() {
     CriticalSectionScoped cs(crit_sect_.get());
     last_received_payload_type_ = -1;
     last_received_media_payload_type_ = -1;
   }
 
   // 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.
@@ skipping 15 matching lines @@
     return last_received_payload_type_;
   }
   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;
   }
@@ skipping 25 matching lines @@
   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_INCLUDE_RTP_PAYLOAD_REGISTRY_H_