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

Unified Diff: webrtc/engine_configurations.h

Issue 1368933002: Revert of Don't link with audio codecs that we don't use (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-clean
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/build/common.gypi ('k') | webrtc/modules/audio_coding/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/engine_configurations.h
diff --git a/webrtc/engine_configurations.h b/webrtc/engine_configurations.h
index c832d9acb39ec0e79ac1ccbd7136fcb3e654a797..f59fd3ec26b6c6a4c1a8bfe42dcdb6b1b3baa8ed 100644
--- a/webrtc/engine_configurations.h
+++ b/webrtc/engine_configurations.h
@@ -16,6 +16,27 @@
// ============================================================================
// Voice and Video
// ============================================================================
+
+// ----------------------------------------------------------------------------
+// [Voice] Codec settings
+// ----------------------------------------------------------------------------
+
+// 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
+
+// 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_RED
+#endif // !WEBRTC_CHROMIUM_BUILD && !WEBRTC_MOZILLA_BUILD
// ----------------------------------------------------------------------------
// [Video] Codec settings
« no previous file with comments | « webrtc/build/common.gypi ('k') | webrtc/modules/audio_coding/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698