Hide ACMCodecDB::database_ behind accessors

webrtc/modules/audio_coding/main/acm2/acm_codec_database.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 11 matching lines @@
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_common_defs.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 namespace acm2 {
 
 namespace {
 
-// Checks if the bitrate is valid for the codec.
-bool IsRateValid(int codec_id, int rate) {
-  return ACMCodecDB::database_[codec_id].rate == rate;
-}
-
 // Checks if the bitrate is valid for iSAC.
 bool IsISACRateValid(int rate) {
   return (rate == -1) || ((rate <= 56000) && (rate >= 10000));
 }
 
 // Checks if the bitrate is valid for iLBC.
 bool IsILBCRateValid(int rate, int frame_size_samples) {
   if (((frame_size_samples == 240) || (frame_size_samples == 480)) &&
       (rate == 13300)) {
     return true;
@@ skipping 244 matching lines @@
   if (STR_CASE_CMP("isac", codec_inst.plname) == 0) {
     return IsISACRateValid(codec_inst.rate) ? codec_id : kInvalidRate;
   } else if (STR_CASE_CMP("ilbc", codec_inst.plname) == 0) {
     return IsILBCRateValid(codec_inst.rate, codec_inst.pacsize)
         ? codec_id : kInvalidRate;
   } else if (STR_CASE_CMP("opus", codec_inst.plname) == 0) {
     return IsOpusRateValid(codec_inst.rate)
         ? codec_id : kInvalidRate;
   }
 
-  return IsRateValid(codec_id, codec_inst.rate) ?
-      codec_id : kInvalidRate;
+  return database_[codec_id].rate == codec_inst.rate ? codec_id : kInvalidRate;
 }
 
 // Looks for a matching payload name, frequency, and channels in the
 // codec list. Need to check all three since some codecs have several codec
 // entries with different frequencies and/or channels.
 // Does not check other codec settings, such as payload type and packet size.
 // Returns the id of the codec, or -1 if no match is found.
 int ACMCodecDB::CodecId(const CodecInst& codec_inst) {
   return (CodecId(codec_inst.plname, codec_inst.plfreq,
                   codec_inst.channels));
@@ skipping 42 matching lines @@
 }
 
 // Checks if the payload type is in the valid range.
 bool ACMCodecDB::ValidPayloadType(int payload_type) {
   return (payload_type >= 0) && (payload_type <= 127);
 }
 
 }  // namespace acm2
 
 }  // namespace webrtc