Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/acm_codec_database.h

Issue 1408773005: Remove ACMCodecDB::CodecFreq (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@rac-static
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // Input: 67 // Input:
68 // [codec_inst] - Information about the codec for which we require the 68 // [codec_inst] - Information about the codec for which we require the
69 // database id. 69 // database id.
70 // Return: 70 // Return:
71 // codec id if successful, otherwise < 0. 71 // codec id if successful, otherwise < 0.
72 static int CodecNumber(const CodecInst& codec_inst); 72 static int CodecNumber(const CodecInst& codec_inst);
73 static int CodecId(const CodecInst& codec_inst); 73 static int CodecId(const CodecInst& codec_inst);
74 static int CodecId(const char* payload_name, int frequency, int channels); 74 static int CodecId(const char* payload_name, int frequency, int channels);
75 static int ReceiverCodecNumber(const CodecInst& codec_inst); 75 static int ReceiverCodecNumber(const CodecInst& codec_inst);
76 76
77 // Returns the codec sampling frequency for codec with id = "codec_id" in
78 // database.
79 // TODO(tlegrand): Check if function is needed, or if we can change
80 // to access database directly.
81 // Input:
82 // [codec_id] - number that specifies at what position in the database to
83 // get the information.
84 // Return:
85 // codec sampling frequency if successful, otherwise -1.
86 static int CodecFreq(int codec_id);
87
88 private: 77 private:
89 // Databases with information about the supported codecs 78 // Databases with information about the supported codecs
90 // database_ - stored information about all codecs: payload type, name, 79 // database_ - stored information about all codecs: payload type, name,
91 // sampling frequency, packet size in samples, default channel 80 // sampling frequency, packet size in samples, default channel
92 // support, and default rate. 81 // support, and default rate.
93 // codec_settings_ - stored codec settings: number of allowed packet sizes, 82 // codec_settings_ - stored codec settings: number of allowed packet sizes,
94 // a vector with the allowed packet sizes, basic block 83 // a vector with the allowed packet sizes, basic block
95 // samples, and max number of channels that are supported. 84 // samples, and max number of channels that are supported.
96 // neteq_decoders_ - list of supported decoders in NetEQ. 85 // neteq_decoders_ - list of supported decoders in NetEQ.
97 static const CodecInst database_[kMaxNumCodecs]; 86 static const CodecInst database_[kMaxNumCodecs];
98 static const CodecSettings codec_settings_[kMaxNumCodecs]; 87 static const CodecSettings codec_settings_[kMaxNumCodecs];
99 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs]; 88 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
100 89
101 friend class RentACodec; 90 friend class RentACodec;
102 }; 91 };
103 92
104 } // namespace acm2 93 } // namespace acm2
105 94
106 } // namespace webrtc 95 } // namespace webrtc
107 96
108 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_ 97 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_CODEC_DATABASE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698