Move ACMCodecDB::ValidPayloadType to RentACodec

webrtc/modules/audio_coding/main/acm2/codec_manager.cc

 /*
  *  Copyright (c) 2015 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 28 matching lines @@
     return -1;
   }
 
   int codec_id = ACMCodecDB::CodecNumber(send_codec);
   if (codec_id < 0) {
     WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, dummy_id,
                  "Invalid codec setting for the send codec.");
     return -1;
   }
 
-  // TODO(tlegrand): Remove this check. Already taken care of in
-  // ACMCodecDB::CodecNumber().
-  // Check if the payload-type is valid
-  if (!ACMCodecDB::ValidPayloadType(send_codec.pltype)) {
-    WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, dummy_id,
-                 "Invalid payload-type %d for %s.", send_codec.pltype,
-                 send_codec.plname);
-    return -1;
-  }
-
   // Telephone-event cannot be a send codec.
   if (!STR_CASE_CMP(send_codec.plname, "telephone-event")) {
     WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, dummy_id,
                  "telephone-event cannot be a send codec");
     return -1;
   }
 
   const rtc::Maybe<bool> supported_num_channels = [codec_id, &send_codec] {
     auto cid = RentACodec::CodecIdFromIndex(codec_id);
     return cid ? RentACodec::IsSupportedNumChannels(*cid, send_codec.channels)
@@ skipping 122 matching lines @@
     return -1;
   }
 
   int dummy_id = 0;
   // RED can be registered with other payload type. If not registered a default
   // payload type is used.
   if (IsCodecRED(send_codec)) {
     // TODO(tlegrand): Remove this check. Already taken care of in
     // ACMCodecDB::CodecNumber().
     // Check if the payload-type is valid
-    if (!ACMCodecDB::ValidPayloadType(send_codec.pltype)) {
+    if (!RentACodec::IsPayloadTypeValid(send_codec.pltype)) {
       WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, dummy_id,
                    "Invalid payload-type %d for %s.", send_codec.pltype,
                    send_codec.plname);
       return -1;
     }
     // Set RED payload type.
     if (send_codec.plfreq == 8000) {
       red_nb_pltype_ = static_cast<uint8_t>(send_codec.pltype);
     } else {
       WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, dummy_id,
@@ skipping 249 matching lines @@
     case 48000:
       return -1;
     default:
       FATAL() << sample_rate_hz << " Hz is not supported";
       return -1;
   }
 }
 
 }  // namespace acm2
 }  // namespace webrtc