[Asterisk-code-review] Binaural synthesis (confbridge): Adds libfftw3 as dependency. (asterisk[master])

Frank Haase asteriskteam at digium.com
Fri Aug 12 11:33:27 CDT 2016


Frank Haase has uploaded a new change for review.

  https://gerrit.asterisk.org/3522

Change subject: Binaural synthesis (confbridge): Adds libfftw3 as dependency.
......................................................................

Binaural synthesis (confbridge): Adds libfftw3 as dependency.

Adds libfftw3 to the build chain that is is going to be used for binaural
synthesis by bridge_softmix.

ASTERISK-26292

Change-Id: Iedc2f174e4ccb39ae5d9e698e339c6a17155867b
---
M bridges/bridge_softmix.c
M build_tools/menuselect-deps.in
M configure.ac
M makeopts.in
4 files changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/22/3522/1

diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 0991e28..1392555 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<support_level>core</support_level>
+	<depend>FFTW3</depend>
  ***/
 
 #include "asterisk.h"
@@ -55,6 +56,14 @@
 #include "asterisk/timing.h"
 #include "asterisk/translate.h"
 
+#include <fftw3.h>
+
+#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
+#include <float.h>
+#else
+#include <values.h>
+#endif
+
 #define MAX_DATALEN 8096
 
 /*! The minimum sample rate of the bridge. */
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index f194482..91efb31 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -51,6 +51,7 @@
 PRI=@PBX_PRI@
 OPENR2=@PBX_OPENR2@
 RESAMPLE=@PBX_RESAMPLE@
+FFTW3=@PBX_FFTW3@
 RADIUS=@PBX_RADIUS@
 LAUNCHD=@PBX_LAUNCHD@
 SPANDSP=@PBX_SPANDSP@
diff --git a/configure.ac b/configure.ac
index ed6f8a8..2927386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,6 +516,7 @@
 # ------------------------------------^
 AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
 AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
+AST_EXT_LIB_SETUP([FFTW3], [LIBFFTW3], [fftw3])
 AST_EXT_LIB_SETUP([RESAMPLE], [LIBRESAMPLE], [resample])
 AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
 AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image], [SDL_image])
@@ -2247,6 +2248,7 @@
 # ------------------------------------^
 
 AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])
+AST_EXT_LIB_CHECK([FFTW3], [fftw3], [fftw_alloc_real], [fftw3.h], [-lfftw3])
 
 AST_C_COMPILE_CHECK([SPANDSP], [
 		#if SPANDSP_RELEASE_DATE < 20080516
diff --git a/makeopts.in b/makeopts.in
index d4347da..925954c 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -249,6 +249,9 @@
 RESAMPLE_INCLUDE=@RESAMPLE_INCLUDE@
 RESAMPLE_LIB=@RESAMPLE_LIB@
 
+FFTW3_INCLUDE=@FFTW3_INCLUDE@
+FFTW3_LIB=@FFTW3_LIB@
+
 RT_LIB=@RT_LIB@
 
 SS7_INCLUDE=@SS7_INCLUDE@

-- 
To view, visit https://gerrit.asterisk.org/3522
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedc2f174e4ccb39ae5d9e698e339c6a17155867b
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Frank Haase <fra.haase at googlemail.com>



More information about the asterisk-code-review mailing list