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

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

Issue 2723253005: Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq (Closed)
Patch Set: Created 3 years, 9 months 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
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
11 /* 11 /*
12 * This file generates databases with information about all supported audio 12 * This file generates databases with information about all supported audio
13 * codecs. 13 * codecs.
14 */ 14 */
15 15
16 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ 16 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_
17 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ 17 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_
18 18
19 #include "webrtc/common_types.h" 19 #include "webrtc/common_types.h"
20 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 20 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
21 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
22 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 namespace acm2 { 25 namespace acm2 {
27 26
28 // TODO(tlegrand): replace class ACMCodecDB with a namespace. 27 // TODO(tlegrand): replace class ACMCodecDB with a namespace.
29 class ACMCodecDB { 28 class ACMCodecDB {
30 public: 29 public:
31 // kMaxNumCodecs - Maximum number of codecs that can be activated in one 30 // kMaxNumCodecs - Maximum number of codecs that can be activated in one
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 static const CodecInst database_[kMaxNumCodecs]; 73 static const CodecInst database_[kMaxNumCodecs];
75 static const CodecSettings codec_settings_[kMaxNumCodecs]; 74 static const CodecSettings codec_settings_[kMaxNumCodecs];
76 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs]; 75 static const NetEqDecoder neteq_decoders_[kMaxNumCodecs];
77 }; 76 };
78 77
79 } // namespace acm2 78 } // namespace acm2
80 79
81 } // namespace webrtc 80 } // namespace webrtc
82 81
83 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_ 82 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_CODEC_DATABASE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/BUILD.gn ('k') | webrtc/modules/audio_coding/acm2/acm_codec_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698