Merge branch 'james34602:master' into extensions

Author: Tim Schneeberger

Main/libjamesdsp/jni/jamesdsp/Android.mk

@@ -28,6 +28,7 @@ LOCAL_SRC_FILES := \
 	jdsp/Effects/eel2/numericSys/libsamplerate/src_sinc.c \
 	jdsp/Effects/eel2/numericSys/FilterDesign/generalFdesign.c \
 	jdsp/Effects/eel2/numericSys/FilterDesign/cos_fib_paraunitary.c \
+	jdsp/Effects/eel2/numericSys/FilterDesign/polyphaseFilterbank.c \
 	jdsp/Effects/eel2/numericSys/FilterDesign/polyphaseASRC.c \
 	jdsp/Effects/eel2/numericSys/FilterDesign/eqnerror.c \
 	jdsp/Effects/eel2/numericSys/FilterDesign/firls.c \

Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/convolver1D.c

@@ -59,7 +59,7 @@ void Convolver1DProcessTwoStageFFTConvolver2x4x2(JamesDSPLib *jdsp, size_t n)
 {
 	TwoStageFFTConvolver2x4x2Process(jdsp->conv.conv1d2x4x2_T_S, jdsp->tmpBuffer[0], jdsp->tmpBuffer[1], jdsp->tmpBuffer[0], jdsp->tmpBuffer[1], (unsigned int)n);
 }
-int Convolver1DLoadImpulseResponse(JamesDSPLib *jdsp, float *tempImpulseFloat, unsigned int impChannels, unsigned int impulseLengthActual)
+int Convolver1DLoadImpulseResponse(JamesDSPLib *jdsp, float *tempImpulseFloat, unsigned int impChannels, size_t impulseLengthActual)
 {
 	jdsp->convolverEnabled = 0;
 	Convolver1DDestructor(jdsp, 0);

Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/dynamic.c

@@ -18,12 +18,7 @@ void JLimiterInit(JamesDSPLib *jdsp)
 #include <math.h>
 #include <float.h>
 #include "eel2/numericSys/codelet.h"
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
-#endif
+#include "eel2/ns-eel.h"
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif
@@ -77,7 +72,7 @@ unsigned LLRevBitsM(unsigned int x, unsigned int bits)
 void LLbitReversalTblM(unsigned *dst, unsigned int fftLen)
 {
 	unsigned int bits = LLIntegerLog2M(fftLen);
-	for (int i = 0; i < fftLen; ++i)
+	for (unsigned int i = 0; i < fftLen; ++i)
 		dst[i] = LLRevBitsM(i, bits);
 }
 void LLsinHalfTblFloatM(float *dst, unsigned int fftLen)
@@ -154,7 +149,7 @@ static float lerp1DNoExtrapo(float val, float *x, float *y, int n)
 void FFTCompressorSetSpectralFollowingRate(FFTDynamicRangeSquasher *comp, float fs, float fgt_facT)
 {
 	comp->spectralRate = fs / (float)comp->fftLen * (float)ANALYSIS_OVERLAP_DRS;
-	comp->fgt_fac = 1.0 - exp(-1.0 / (fgt_facT / 1000.0 * comp->spectralRate));
+	comp->fgt_fac = (float)(1.0 - exp(-1.0 / (fgt_facT / 1000.0 * comp->spectralRate)));
 }
 void FFTCompressorSetParam(FFTDynamicRangeSquasher *comp, float fs, float maxAtk, float maxRel, float adapt)
 {

Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/eel2/loose_eel.c

@@ -37,9 +37,11 @@ typedef unsigned long long WDL_UINT64;
 typedef intptr_t INT_PTR;
 typedef uintptr_t UINT_PTR;
 #endif
+#ifndef min
+#define min(x,y) ((x)<(y)?(x):(y))
+#endif
 #if !defined(max)
 #define max(x,y) ((x)<(y)?(y):(x))
-#define min(x,y) ((x)<(y)?(x):(y))
 #endif
 #ifndef _WIN32
 #ifndef strnicmp