ACMCodecDB: Remove unused stuff, and move private stuff to anonymous namespace

webrtc/modules/audio_coding/main/acm2/acm_codec_database.h

 /*
  *  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 106 matching lines @@
 
   // Codec specific settings
   //
   // num_packet_sizes     - number of allowed packet sizes.
   // packet_sizes_samples - list of the allowed packet sizes.
   // basic_block_samples  - assigned a value different from 0 if the codec
   //                        requires to be fed with a specific number of samples
   //                        that can be different from packet size.
   // channel_support      - number of channels supported to encode;
   //                        1 = mono, 2 = stereo, etc.
-  // owns_decoder         - if true, it means that the codec should own the
-  //                        decoder instance. In this case, the codec should
-  //                        implement ACMGenericCodec::Decoder(), which returns
-  //                        a pointer to AudioDecoder. This pointer is injected
-  //                        into NetEq when this codec is registered as receive
-  //                        codec. DEPRECATED.
   struct CodecSettings {
     int num_packet_sizes;
     int packet_sizes_samples[kMaxNumPacketSize];
     int basic_block_samples;
     int channel_support;
-    bool owns_decoder;
   };
 
   // Gets codec information from database at the position in database given by
   // [codec_id].
   // Input:
   //   [codec_id] - number that specifies at what position in the database to
   //                get the information.
   // Output:
   //   [codec_inst] - filled with information about the codec.
   // Return:
@@ skipping 16 matching lines @@
   // database.
   // TODO(tlegrand): Check if function is needed, or if we can change
   // to access database directly.
   // Input:
   //   [codec_id] - number that specifies at what position in the database to
   //                get the information.
   // Return:
   //   codec sampling frequency if successful, otherwise -1.
   static int CodecFreq(int codec_id);
 
-  // Return the codec's basic coding block size in samples.
-  // TODO(tlegrand): Check if function is needed, or if we can change
-  // to access database directly.
-  // Input:
-  //   [codec_id] - number that specifies at what position in the database to
-  //                get the information.
-  // Return:
-  //   codec basic block size if successful, otherwise -1.
-  static int BasicCodingBlock(int codec_id);
-
-  // Returns the NetEQ decoder database.
-  static const NetEqDecoder* NetEQDecoders();
-
-  // Specifies if the codec specified by |codec_id| MUST own its own decoder.
-  // This is the case for codecs which *should* share a single codec instance
-  // between encoder and decoder. Or for codecs which ACM should have control
-  // over the decoder. For instance iSAC is such a codec that encoder and
-  // decoder share the same codec instance.
-  static bool OwnsDecoder(int codec_id);
-
-  // Checks if the bitrate is valid for the codec.
-  // Input:
-  //   [codec_id] - number that specifies codec's position in the database.
-  //   [rate] - bitrate to check.
-  //   [frame_size_samples] - (used for iLBC) specifies which frame size to go
-  //                          with the rate.
-  static bool IsRateValid(int codec_id, int rate);
-  static bool IsISACRateValid(int rate);
-  static bool IsILBCRateValid(int rate, int frame_size_samples);
-  static bool IsAMRRateValid(int rate);
-  static bool IsAMRwbRateValid(int rate);
-  static bool IsG7291RateValid(int rate);
-  static bool IsSpeexRateValid(int rate);
-  static bool IsOpusRateValid(int rate);
-
   // Check if the payload type is valid, meaning that it is in the valid range
   // of 0 to 127.
   // Input:
   //   [payload_type] - payload type.
   static bool ValidPayloadType(int payload_type);
 
   // Databases with information about the supported codecs
   // database_ - stored information about all codecs: payload type, name,
   //             sampling frequency, packet size in samples, default channel
   //             support, and default rate.
   // codec_settings_ - stored codec settings: number of allowed packet sizes,
   //                   a vector with the allowed packet sizes, basic block
   //                   samples, and max number of channels that are supported.
   // neteq_decoders_ - list of supported decoders in NetEQ.
   static const CodecInst database_[kMaxNumCodecs];
   static const CodecSettings codec_settings_[kMaxNumCodecs];
   static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
 };
 
 }  // namespace acm2
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_