Merge pull request #135 from Audio4Linux/libjamesdsp_upgrade

Author: timschneeb

libjamesdsp/JdspImpResToolbox.c

@@ -258,7 +258,8 @@ void circshift(float *x, int n, int k)
     k < 0 ? shift(x, -k, n) : shift(x, n - k, n);
 }
 #define NUMPTS 15
-ierper pch1, pch2;
+#define NUMPTS_DRS (7)
+ierper pch1, pch2, pch3;
 __attribute__((constructor)) static void initialize(void)
 {
     if (decompressedCoefficients)
@@ -267,14 +268,16 @@ __attribute__((constructor)) static void initialize(void)
     decompressResamplerMQ(compressedCoeffMQ, decompressedCoefficients);
     initIerper(&pch1, NUMPTS + 2);
     initIerper(&pch2, NUMPTS + 2);
+    initIerper(&pch3, NUMPTS_DRS + 2);
 }
 __attribute__((destructor)) static void destruction(void)
 {
     free(decompressedCoefficients);
     decompressedCoefficients = 0;
     freeIerper(&pch1);
     freeIerper(&pch2);
-}
+    freeIerper(&pch3);
+ }
 static void JamesDSPOfflineResampling(float const *in, float *out, size_t lenIn, size_t lenOut, int channels, double src_ratio, int resampleQuality)
 {
     if (lenOut == lenIn && lenIn == 1)
@@ -534,3 +537,49 @@ int ComputeEqResponse(const double* jfreq, double* jgain, int interpolationMode,
     return 0;
 }
 
+int ComputeCompResponse(int n, const double* jfreq, const double* jgain, int queryPts, const double* dispFreq, float* response)
+{
+    double freqComp[NUMPTS_DRS + 2];
+    double gainComp[NUMPTS_DRS + 2];
+
+    memcpy(freqComp + 1, jfreq, NUMPTS_DRS * sizeof(double));
+    memcpy(gainComp + 1, jgain, NUMPTS_DRS * sizeof(double));
+
+    freqComp[0] = 0.0;
+    gainComp[0] = gainComp[1];
+    freqComp[NUMPTS_DRS + 1] = 24000.0;
+    gainComp[NUMPTS_DRS + 1] = gainComp[NUMPTS_DRS];
+    makima(&pch3, freqComp, gainComp, NUMPTS_DRS + 2, 1, 1);
+    ierper *lerpPtr = &pch3;
+    for (int i = 0; i < queryPts; i++)
+        response[i] = (float)getValueAt(&lerpPtr->cb, dispFreq[i]);
+    return 0;
+}
+
+void ComputeIIREqualizerCplx(int srate, int order, const double* freqs, double* gains, int nPts, const double* dispFreq, double* cplxRe, double* cplxIm)
+{
+    for (int i = 0; i < nPts; i++)
+    {
+        cplxRe[i] = 1;
+        cplxIm[i] = 0;
+    }
+
+    for (int i = 0; i < NUMPTS - 1; i++)
+    {
+        double dB = gains[i + 1] - gains[i];
+        double designFreq;
+        if (i)
+            designFreq = (freqs[i + 1] + freqs[i]) * 0.5;
+        else
+            designFreq = freqs[i];
+        double overallGain = i == 0 ? gains[i] : 0.0;
+        HSHOResponse(48000, designFreq, order, dB, overallGain, nPts, dispFreq, cplxRe, cplxIm);
+    }
+}
+
+void ComputeIIREqualizerResponse(int nPts, const double* cplxRe, const double* cplxIm, float* response)
+{
+    for(int i = 0; i < nPts; i++) {
+        response[i] = 20.0f * log10f(hypot(cplxRe[i], cplxIm[i]));
+    }
+}

libjamesdsp/JdspImpResToolbox.h

@@ -3,5 +3,7 @@
 
 extern float* ReadImpulseResponseToFloat(const char* mIRFileName, int targetSampleRate, int* jImpInfo, int convMode, int* javaAdvSetPtr);
 extern int ComputeEqResponse(const double* jfreq, double* jgain, int interpolationMode, int queryPts, double* dispFreq, float* response);
-
+extern int ComputeCompResponse(int n, const double* jfreq, const double* jgain, int queryPts, const double* dispFreq, float* response);
+extern void ComputeIIREqualizerCplx(int srate, int order, const double* freq, double* gains, int nPts, const double* dispFreq, double* cplxRe, double* cplxIm);
+extern void ComputeIIREqualizerResponse(int nPts, const double* cplxRe, const double* cplxIm, float* response);
 #endif // JDSPIMPRESTOOLBOX_H

libjamesdsp/PrintfStdOutExtension.c

@@ -0,0 +1,47 @@
+#include "PrintfStdOutExtension.h"
+#include <stdarg.h>
+
+static stdOutHandler _printfStdOutHandlerPtr = 0;
+static void* _printfStdOutHandlerUserPtr = 0;
+
+int redirected_printf(const char * format, ...) {
+    // Make formatted string.
+    char* outstr = 0;
+    va_list ap;
+    va_start(ap, format);
+    int result = vasprintf(&outstr, format, ap);
+    va_end(ap);
+    if(result < 0) // Error occurred and `outstr` undefined if result < 0.
+        return result;
+
+    if(_printfStdOutHandlerPtr != 0)
+    {
+        _printfStdOutHandlerPtr(outstr, _printfStdOutHandlerUserPtr);
+    }
+
+    free(outstr);
+    return result;
+}
+
+void __android_log_print(int severity, const char* tag, const char* msg) {
+    char *s;
+    if (asprintf(&s, "%s: %s", tag, msg) > 0 && s != 0)
+    {
+        if(_printfStdOutHandlerPtr != 0)
+        {
+            _printfStdOutHandlerPtr(s, _printfStdOutHandlerUserPtr);
+        }
+        free(s);
+    }
+}
+
+void setPrintfStdOutHandler(stdOutHandler funcPtr, void* userData)
+{
+    _printfStdOutHandlerPtr = funcPtr;
+    _printfStdOutHandlerUserPtr = userData;
+}
+
+int isPrintfStdOutHandlerSet()
+{
+    return _printfStdOutHandlerPtr != 0;
+}

libjamesdsp/PrintfStdOutExtension.h

@@ -0,0 +1,10 @@
+#ifndef EELSTDOUTEXTENSION_H
+#define EELSTDOUTEXTENSION_H
+
+typedef void (*stdOutHandler)(const char*, void*);
+
+
+extern void setPrintfStdOutHandler(stdOutHandler funcPtr, void* userData);
+extern int isPrintfStdOutHandlerSet();
+
+#endif // EELSTDOUTEXTENSION_H

libjamesdsp/libjamesdsp.pro

@@ -10,8 +10,12 @@ QMAKE_CFLAGS += -std=gnu11 -O2
 
 CONFIG += warn_off # Disable warnings for library
 
+# Enable liveprog logging redirection
 DEFINES += CUSTOM_CMD
 
+# Redirect printf & android logging to our custom handlers
+DEFINES += printf=redirected_printf ANDROID_LOG_INFO=0 DEBUG
+
 BASEPATH = $$PWD/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/
 
 INCLUDEPATH += $$BASEPATH \
@@ -50,6 +54,7 @@ HEADERS += \
     $$BASEPATH/generalDSP/spectralInterpolatorFloat.h \
     $$BASEPATH/jdsp_header.h \
     EELStdOutExtension.h \
+    PrintfStdOutExtension.h \
     JdspImpResToolbox.h
 
 SOURCES += \
@@ -84,7 +89,6 @@ SOURCES += \
     $$BASEPATH/Effects/eel2/numericSys/solvopt.c \
     $$BASEPATH/Effects/eel2/s_str.c \
     $$BASEPATH/Effects/eel2/y.tab.c \
-    $$BASEPATH/Effects/firEqualizer.c \
     $$BASEPATH/Effects/liveprogWrapper.c \
     $$BASEPATH/Effects/reverb.c \
     $$BASEPATH/Effects/stereoEnhancement.c \
@@ -99,7 +103,9 @@ SOURCES += \
     $$BASEPATH/generalDSP/spectralInterpolatorFloat.c \
     $$BASEPATH/jdspController.c \
     EELStdOutExtension.c \
-    JdspImpResToolbox.c
+    PrintfStdOutExtension.c \
+    JdspImpResToolbox.c \
+    subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/multimodalEQ.c
 
 unix {
     isEmpty(LIBDIR) {

libjamesdsp/subtree/Main/DSPManager/AndroidManifest.xml

@@ -11,7 +11,6 @@
 	<application
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:requestLegacyExternalStorage="true"
         android:persistent="true"
         android:allowBackup="true">
 		<activity

libjamesdsp/subtree/Main/DSPManager/jni/main/JdspImpResToolbox.c

@@ -398,7 +398,8 @@ void circshift(float *x, int n, int k)
 	k < 0 ? shift(x, -k, n) : shift(x, n - k, n);
 }
 #define NUMPTS 15
-ierper pch1, pch2;
+#define NUMPTS_DRS (7)
+ierper pch1, pch2, pch3;
 __attribute__((constructor)) static void initialize(void)
 {
 	if (decompressedCoefficients)
@@ -407,13 +408,15 @@ __attribute__((constructor)) static void initialize(void)
 	decompressResamplerMQ(compressedCoeffMQ, decompressedCoefficients);
 	initIerper(&pch1, NUMPTS + 2);
 	initIerper(&pch2, NUMPTS + 2);
+	initIerper(&pch3, NUMPTS_DRS + 2);
 }
 __attribute__((destructor)) static void destruction(void)
 {
 	free(decompressedCoefficients);
 	decompressedCoefficients = 0;
 	freeIerper(&pch1);
 	freeIerper(&pch2);
+	freeIerper(&pch3);
 }
 void JamesDSPOfflineResampling(float const *in, float *out, size_t lenIn, size_t lenOut, int channels, double src_ratio, int resampleQuality)
 {
@@ -680,9 +683,32 @@ JNIEXPORT jint JNICALL Java_james_dsp_activity_JdspImpResToolbox_ComputeEqRespon
 		lerpPtr = &pch2;
 	}
 	for (int i = 0; i < queryPts; i++)
-	{
 		javaResponsePtr[i] = (float)getValueAt(&lerpPtr->cb, javadispFreqPtr[i]);
-	}
+	(*env)->ReleaseDoubleArrayElements(env, dispFreq, javadispFreqPtr, 0);
+	(*env)->SetFloatArrayRegion(env, response, 0, queryPts, javaResponsePtr);
+	return 0;
+}
+double freqComp[NUMPTS_DRS + 2];
+double gainComp[NUMPTS_DRS + 2];
+JNIEXPORT jint JNICALL Java_james_dsp_activity_JdspImpResToolbox_ComputeCompResponse
+(JNIEnv *env, jobject obj, jint n, jdoubleArray jfreq, jdoubleArray jgain, jint queryPts, jdoubleArray dispFreq, jfloatArray response)
+{
+	jdouble *javaFreqPtr = (jdouble*) (*env)->GetDoubleArrayElements(env, jfreq, 0);
+	jdouble *javaGainPtr = (jdouble*) (*env)->GetDoubleArrayElements(env, jgain, 0);
+	jdouble *javadispFreqPtr = (jdouble*) (*env)->GetDoubleArrayElements(env, dispFreq, 0);
+	jfloat *javaResponsePtr = (jfloat*) (*env)->GetFloatArrayElements(env, response, 0);
+	memcpy(freqComp + 1, javaFreqPtr, NUMPTS_DRS * sizeof(double));
+	memcpy(gainComp + 1, javaGainPtr, NUMPTS_DRS * sizeof(double));
+	(*env)->ReleaseDoubleArrayElements(env, jfreq, javaFreqPtr, 0);
+	(*env)->ReleaseDoubleArrayElements(env, jgain, javaGainPtr, 0);
+	freqComp[0] = 0.0;
+	gainComp[0] = gainComp[1];
+	freqComp[NUMPTS_DRS + 1] = 24000.0;
+	gainComp[NUMPTS_DRS + 1] = gainComp[NUMPTS_DRS];
+	makima(&pch3, freqComp, gainComp, NUMPTS_DRS + 2, 1, 1);
+	ierper *lerpPtr = &pch3;
+	for (int i = 0; i < queryPts; i++)
+		javaResponsePtr[i] = (float)getValueAt(&lerpPtr->cb, javadispFreqPtr[i]);
 	(*env)->ReleaseDoubleArrayElements(env, dispFreq, javadispFreqPtr, 0);
 	(*env)->SetFloatArrayRegion(env, response, 0, queryPts, javaResponsePtr);
 	return 0;

libjamesdsp/subtree/Main/DSPManager/project.properties

@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-29
+target=android-28
 proguard.config=proguard.txt
-android.library.reference.1=../../appcompatSupport
+android.library.reference.1=../../../appcompatSupport

…Main/DSPManager/res/layout/equalizer.xml …Main/DSPManager/res/layout/compander.xmllibjamesdsp/subtree/Main/DSPManager/res/layout/equalizer.xml renamed to libjamesdsp/subtree/Main/DSPManager/res/layout/compander.xml libjamesdsp/subtree/Main/DSPManager/res/layout/equalizer.xml renamed to libjamesdsp/subtree/Main/DSPManager/res/layout/compander.xml

@@ -5,8 +5,8 @@
     android:layout_gravity="center"
     android:layout_width="fill_parent">
 
-  <james.dsp.preference.EqualizerSurface
-      android:id="@+id/FrequencyResponse"
+  <james.dsp.preference.CompanderSurface
+      android:id="@+id/DynamicResponse"
       android:layout_height="fill_parent"
       android:layout_width="fill_parent" />
 </LinearLayout>

…SPManager/res/layout/equalizer_popup.xml …SPManager/res/layout/compander_popup.xmllibjamesdsp/subtree/Main/DSPManager/res/layout/equalizer_popup.xml renamed to libjamesdsp/subtree/Main/DSPManager/res/layout/compander_popup.xml libjamesdsp/subtree/Main/DSPManager/res/layout/equalizer_popup.xml renamed to libjamesdsp/subtree/Main/DSPManager/res/layout/compander_popup.xml

@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="300dp">
 
-  <james.dsp.preference.EqualizerSurface
-      android:id="@+id/FrequencyResponse"
+  <james.dsp.preference.CompanderSurface
+      android:id="@+id/DynamicResponse"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent" />
 </LinearLayout>