zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable G.722 for Chromium builds

Browse Source 
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
This commit is contained in:
henrik.lundin@webrtc.org
2014-10-29 08:32:44 +00:00
parent 1abc146aa5
commit cfe3845b66
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/engine_configurations.h
View File

@ -21,13 +21,14 @@
// [Voice] Codec settings // [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 #ifndef WEBRTC_MOZILLA_BUILD
#ifdef WEBRTC_ARCH_ARM #ifdef WEBRTC_ARCH_ARM
#define WEBRTC_CODEC_ISACFX // Fix-point iSAC implementation. #define WEBRTC_CODEC_ISACFX // Fix-point iSAC implementation.
#else #else
#define WEBRTC_CODEC_ISAC // Floating-point iSAC implementation (default). #define WEBRTC_CODEC_ISAC // Floating-point iSAC implementation (default).
#endif // WEBRTC_ARCH_ARM #endif // WEBRTC_ARCH_ARM
#define WEBRTC_CODEC_G722
#endif // !WEBRTC_MOZILLA_BUILD #endif // !WEBRTC_MOZILLA_BUILD
// AVT is included in all builds, along with G.711, NetEQ and CNG // 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. // PCM16 is useful for testing and incurs only a small binary size cost.
#define WEBRTC_CODEC_PCM16 #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. // builds to reduce binary size.
#if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_MOZILLA_BUILD) #if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_MOZILLA_BUILD)
#define WEBRTC_CODEC_ILBC #define WEBRTC_CODEC_ILBC
#define WEBRTC_CODEC_G722
#define WEBRTC_CODEC_RED #define WEBRTC_CODEC_RED
#endif // !WEBRTC_CHROMIUM_BUILD && !WEBRTC_MOZILLA_BUILD #endif // !WEBRTC_CHROMIUM_BUILD && !WEBRTC_MOZILLA_BUILD