From 7009c72234a42ee3893cd270669e5aee98fb4f59 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> Date: Fri, 29 Apr 2011 20:32:33 -0400 Subject: [PATCH] Getting fixed-point to work (I think) --- configure.ac | 2 +- silk/SKP_Silk_control_codec.c | 4 ++++ silk/SKP_Silk_enc_API.c | 3 +++ silk/SKP_Silk_init_encoder.c | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b6fff896e..eeed08c78 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,7 @@ ac_enable_fixed="no"; AC_ARG_ENABLE(fixed-point, [ --enable-fixed-point compile as fixed-point], [if test "$enableval" = yes; then ac_enable_fixed="yes"; - AC_DEFINE([FIXED_POINT], , [Compile as fixed-point]) + AC_DEFINE([FIXED_POINT], [1], [Compile as fixed-point]) else AC_DEFINE([FLOATING_POINT], , [Compile as floating-point]) fi], diff --git a/silk/SKP_Silk_control_codec.c b/silk/SKP_Silk_control_codec.c index 79ee49dd6..0beb24529 100644 --- a/silk/SKP_Silk_control_codec.c +++ b/silk/SKP_Silk_control_codec.c @@ -25,6 +25,10 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "SKP_Silk_tuning_parameters.h" #if FIXED_POINT #include "SKP_Silk_main_FIX.h" diff --git a/silk/SKP_Silk_enc_API.c b/silk/SKP_Silk_enc_API.c index 417253b2c..5c23d991f 100644 --- a/silk/SKP_Silk_enc_API.c +++ b/silk/SKP_Silk_enc_API.c @@ -25,6 +25,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "SKP_Silk_define.h" #include "SKP_Silk_SDK_API.h" diff --git a/silk/SKP_Silk_init_encoder.c b/silk/SKP_Silk_init_encoder.c index 7f2b7c353..3baf672d6 100644 --- a/silk/SKP_Silk_init_encoder.c +++ b/silk/SKP_Silk_init_encoder.c @@ -25,6 +25,10 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #if FIXED_POINT #include "SKP_Silk_main_FIX.h" #define SKP_Silk_encoder_state_Fxx SKP_Silk_encoder_state_FIX -- GitLab