From cfe3845b668d20b917d22d15ee3dd1b1e668d465 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Wed, 29 Oct 2014 08:32:44 +0000 Subject: [PATCH] Enable G.722 for Chromium builds BUG=3909 R=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/24989004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7555 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/engine_configurations.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webrtc/engine_configurations.h b/webrtc/engine_configurations.h index e9f23097f5..a91532fc2d 100644 --- a/webrtc/engine_configurations.h +++ b/webrtc/engine_configurations.h @@ -21,13 +21,14 @@ // [Voice] Codec settings // ---------------------------------------------------------------------------- -// iSAC is not included in the Mozilla build, but in all other builds. +// iSAC and G722 are not included in the Mozilla build, but in all other builds. #ifndef WEBRTC_MOZILLA_BUILD #ifdef WEBRTC_ARCH_ARM #define WEBRTC_CODEC_ISACFX // Fix-point iSAC implementation. #else #define WEBRTC_CODEC_ISAC // Floating-point iSAC implementation (default). #endif // WEBRTC_ARCH_ARM +#define WEBRTC_CODEC_G722 #endif // !WEBRTC_MOZILLA_BUILD // AVT is included in all builds, along with G.711, NetEQ and CNG @@ -37,11 +38,10 @@ // PCM16 is useful for testing and incurs only a small binary size cost. #define WEBRTC_CODEC_PCM16 -// iLBC, G.722, and Redundancy coding are excluded from Chromium and Mozilla +// iLBC and Redundancy coding are excluded from Chromium and Mozilla // builds to reduce binary size. #if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_MOZILLA_BUILD) #define WEBRTC_CODEC_ILBC -#define WEBRTC_CODEC_G722 #define WEBRTC_CODEC_RED #endif // !WEBRTC_CHROMIUM_BUILD && !WEBRTC_MOZILLA_BUILD