Reland of move RTPPayloadStrategy and simplify RTPPayloadRegistry

webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc

 /*
  *  Copyright (c) 2012 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 87 matching lines @@
     }
   }
   return result;
 }
 
 int32_t RtpReceiverImpl::RegisterReceivePayload(const VideoCodec& video_codec) {
   rtc::CritScope lock(&critical_section_rtp_receiver_);
   return rtp_payload_registry_->RegisterReceivePayload(video_codec);
 }
 
-// TODO(magjed): Remove once external code is updated.
-int32_t RtpReceiverImpl::RegisterReceivePayload(
-    const char payload_name[RTP_PAYLOAD_NAME_SIZE],
-    const int8_t payload_type,
-    const uint32_t frequency,
-    const size_t channels,
-    const uint32_t rate) {
-  CodecInst codec;
-  codec.pltype = payload_type;
-  strncpy(codec.plname, payload_name, RTP_PAYLOAD_NAME_SIZE);
-  codec.plfreq = frequency;
-  codec.channels = channels;
-  codec.rate = rate;
-  return RegisterReceivePayload(codec);
-}
-
 int32_t RtpReceiverImpl::DeRegisterReceivePayload(
     const int8_t payload_type) {
   rtc::CritScope lock(&critical_section_rtp_receiver_);
   return rtp_payload_registry_->DeRegisterReceivePayload(payload_type);
 }
 
 uint32_t RtpReceiverImpl::SSRC() const {
   rtc::CritScope lock(&critical_section_rtp_receiver_);
   return ssrc_;
 }
@@ skipping 337 matching lines @@
     // implementations might have CSRC 0 as a valid value.
     if (num_csrcs_diff > 0) {
       cb_rtp_feedback_->OnIncomingCSRCChanged(0, true);
     } else if (num_csrcs_diff < 0) {
       cb_rtp_feedback_->OnIncomingCSRCChanged(0, false);
     }
   }
 }
 
 }  // namespace webrtc