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

Side by Side Diff: webrtc/engine_configurations.h

Issue 1338283002: Remove the preprocessor symbol WEBRTC_CODEC_AVT (it was always defined) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifdef
Patch Set: rebase Created 5 years, 3 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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/acm_codec_database.h » ('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 13 matching lines...) Expand all
24 // iSAC and G722 are not included in the Mozilla build, but in all other builds. 24 // iSAC and G722 are not included in the Mozilla build, but in all other builds.
25 #ifndef WEBRTC_MOZILLA_BUILD 25 #ifndef WEBRTC_MOZILLA_BUILD
26 #ifdef WEBRTC_ARCH_ARM 26 #ifdef WEBRTC_ARCH_ARM
27 #define WEBRTC_CODEC_ISACFX // Fix-point iSAC implementation. 27 #define WEBRTC_CODEC_ISACFX // Fix-point iSAC implementation.
28 #else 28 #else
29 #define WEBRTC_CODEC_ISAC // Floating-point iSAC implementation (default). 29 #define WEBRTC_CODEC_ISAC // Floating-point iSAC implementation (default).
30 #endif // WEBRTC_ARCH_ARM 30 #endif // WEBRTC_ARCH_ARM
31 #define WEBRTC_CODEC_G722 31 #define WEBRTC_CODEC_G722
32 #endif // !WEBRTC_MOZILLA_BUILD 32 #endif // !WEBRTC_MOZILLA_BUILD
33 33
34 // AVT is included in all builds, along with G.711, NetEQ and CNG
35 // (which are mandatory and don't have any defines).
36 #define WEBRTC_CODEC_AVT
37
38 // iLBC and Redundancy coding are excluded from Chromium and Mozilla 34 // iLBC and Redundancy coding are excluded from Chromium and Mozilla
39 // builds to reduce binary size. 35 // builds to reduce binary size.
40 #if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_MOZILLA_BUILD) 36 #if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_MOZILLA_BUILD)
41 #define WEBRTC_CODEC_ILBC 37 #define WEBRTC_CODEC_ILBC
42 #define WEBRTC_CODEC_RED 38 #define WEBRTC_CODEC_RED
43 #endif // !WEBRTC_CHROMIUM_BUILD && !WEBRTC_MOZILLA_BUILD 39 #endif // !WEBRTC_CHROMIUM_BUILD && !WEBRTC_MOZILLA_BUILD
44 40
45 // ---------------------------------------------------------------------------- 41 // ----------------------------------------------------------------------------
46 // [Video] Codec settings 42 // [Video] Codec settings
47 // ---------------------------------------------------------------------------- 43 // ----------------------------------------------------------------------------
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #define EAGL_RENDERING 107 #define EAGL_RENDERING
112 #endif 108 #endif
113 109
114 // ---------------------------------------------------------------------------- 110 // ----------------------------------------------------------------------------
115 // Deprecated 111 // Deprecated
116 // ---------------------------------------------------------------------------- 112 // ----------------------------------------------------------------------------
117 113
118 // #define WEBRTC_DTMF_DETECTION 114 // #define WEBRTC_DTMF_DETECTION
119 115
120 #endif // WEBRTC_ENGINE_CONFIGURATIONS_H_ 116 #endif // WEBRTC_ENGINE_CONFIGURATIONS_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/main/acm2/acm_codec_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698