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

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

Issue 1481493004: audio_coding: remove "main" directory (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 5 years 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_COMMON_DEFS_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_COMMON_DEFS_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_COMMON_DEFS_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_COMMON_DEFS_H_
13 13
14 #include "webrtc/engine_configurations.h" 14 #include "webrtc/engine_configurations.h"
15 15
16 // Checks for enabled codecs, we prevent enabling codecs which are not 16 // Checks for enabled codecs, we prevent enabling codecs which are not
17 // compatible. 17 // compatible.
18 #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX)) 18 #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX))
19 #error iSAC and iSACFX codecs cannot be enabled at the same time 19 #error iSAC and iSACFX codecs cannot be enabled at the same time
20 #endif 20 #endif
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 // General codec specific defines 24 // General codec specific defines
25 const int kIsacWbDefaultRate = 32000; 25 const int kIsacWbDefaultRate = 32000;
26 const int kIsacSwbDefaultRate = 56000; 26 const int kIsacSwbDefaultRate = 56000;
27 const int kIsacPacSize480 = 480; 27 const int kIsacPacSize480 = 480;
28 const int kIsacPacSize960 = 960; 28 const int kIsacPacSize960 = 960;
29 29
30 } // namespace webrtc 30 } // namespace webrtc
31 31
32 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_COMMON_DEFS_H_ 32 #endif // WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_COMMON_DEFS_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_codec_database.cc ('k') | webrtc/modules/audio_coding/acm2/acm_neteq_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698