commit cba857af61ffc14d6957444221a16abe8c9d92f7 Author: Jens Ahrensfeld Date: Sat Oct 25 14:39:11 2025 +0200 first commit diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..eb89e51 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "submodules/make"] + path = submodules/make + url = http://192.168.22.90:3001/jayfield/make.git diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/c_cpp_properties.json b/c_cpp_properties.json new file mode 100644 index 0000000..b626341 --- /dev/null +++ b/c_cpp_properties.json @@ -0,0 +1,11 @@ +{ + "C_Cpp.intelliSenseEngine": "disabled", + "clangd.path": "/usr/bin/clangd", + "clangd.arguments": + [ + "-log=verbose", + "-pretty", + "--background-index", + "--compile-commands-dir=${workspaceFolder}/compile_commands.json" + ] +} diff --git a/make/defaults.mk b/make/defaults.mk new file mode 100644 index 0000000..6f12ad2 --- /dev/null +++ b/make/defaults.mk @@ -0,0 +1,6 @@ +include $(MAKE_HOME)/defaults.mk + +# Environment +CC=clang +CCC=clang++ +CXX=clang++ diff --git a/sdk/vst/.gitignore b/sdk/vst/.gitignore new file mode 100644 index 0000000..60a08ff --- /dev/null +++ b/sdk/vst/.gitignore @@ -0,0 +1,2 @@ +vstsdk2.4 + diff --git a/sdk/vst/Makefile b/sdk/vst/Makefile new file mode 100644 index 0000000..1d6fe39 --- /dev/null +++ b/sdk/vst/Makefile @@ -0,0 +1,6 @@ +CONFIG ?= release +PKG_VER := vstsdk2.4 + +include pkg.mk + + diff --git a/sdk/vst/pkg.mk b/sdk/vst/pkg.mk new file mode 100644 index 0000000..aadddaa --- /dev/null +++ b/sdk/vst/pkg.mk @@ -0,0 +1,40 @@ +BUILD_DIR := ./build/${CONFIG} +PKG_ROOT := ./${PKG_VER} +OBJS := $(addprefix ${BUILD_DIR}/, $(subst .cpp,.o,$(SRCS))) + +.PHONY: ${PKG_VER}.patch +all: ${PKG_ROOT} +prepare: ${PKG_ROOT} +patch: ${PKG_VER}.patch + +${PKG_VER}.patch: + @rm -rf temp + @unzip ${PKG_VER}.zip -d temp >/dev/null + @diff -ruN temp/${PKG_VER}/ ${PKG_ROOT} > ${PKG_VER}.patch; [ $$? -eq 1 ] + @rm -rf temp + @echo "Created" ${PKG_VER}.patch + +CXXFLAGS += -std=c++11 +CXXFLAGS_debug := ${CXXFLAGS} -O0 -g +CXXFLAGS_release := ${CXXFLAGS} -O2 + +INCLUDES += -I./ -I/usr/include/freetype2 +DEFINES += -D${TARGET} + +${OBJS}: $(BUILD_DIR)/%.o : ${PKG_ROOT}/%.cpp + mkdir -p $(dir $@) + g++ ${CXXFLAGS_${CONFIG}} ${DEFINES} ${INCLUDES} -o $@ -c $< + +${PKG_ROOT}: + unzip ${PKG_VER}.zip + if [ -e ${PKG_VER}.patch ]; then \ + patch -p0 < ${PKG_VER}.patch;\ + fi + +clean: + rm -rf ${BUILD_DIR}/* + +distclean: + rm -rf ${BUILD_DIR} + rm -rf ${PKG_ROOT} + diff --git a/sdk/vst/vstsdk2.4.patch b/sdk/vst/vstsdk2.4.patch new file mode 100644 index 0000000..5b8371e --- /dev/null +++ b/sdk/vst/vstsdk2.4.patch @@ -0,0 +1,24 @@ +diff -ruN temp/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp ./vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp +--- temp/vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp 2006-06-07 09:22:02.000000000 +0200 ++++ ./vstsdk2.4/public.sdk/source/vst2.x/audioeffect.cpp 2025-08-02 10:01:34.082302630 +0200 +@@ -7,7 +7,7 @@ + // Created by : Steinberg Media Technologies + // Description : Class AudioEffect (VST 1.0) + // +-// © 2006, Steinberg Media Technologies, All Rights Reserved ++// � 2006, Steinberg Media Technologies, All Rights Reserved + //------------------------------------------------------------------------------------------------------- + + #include "audioeffect.h" +@@ -507,9 +507,10 @@ + { + VstInt32 digit = value / div; + value -= digit * div; ++ const char digit8 = (char)(digit & 0xFF) + '0'; + if (state || digit > 0) + { +- char temp[2] = {'0' + (char)digit, '\0'}; ++ char temp[2] = {digit8, '\0'}; + vst_strncat (text, temp, maxLen); + state = true; + } diff --git a/sdk/vst/vstsdk2.4.zip b/sdk/vst/vstsdk2.4.zip new file mode 100644 index 0000000..8789bef Binary files /dev/null and b/sdk/vst/vstsdk2.4.zip differ diff --git a/src/Iir.c b/src/Iir.c new file mode 100755 index 0000000..87980e1 --- /dev/null +++ b/src/Iir.c @@ -0,0 +1,225 @@ +/*************************************************************************/ +/* iir.c +/*************************************************************************/ +#include "stdio.h" +#include "math.h" +#include "iir.h" + +/*************************************************************************/ +/* Global Variables +/*************************************************************************/ +const char *filterTypeString[] = +{ + "Unknown filter type", + "Butterworth-Lowpass", + "Butterworth-Highpass", + "Butterworth-Bandpass", + "Butterworth-Bandstop", + "Peaking-EQ", + "Low Shelving-EQ", + "High Shelving-EQ" +}; + +/******************************************************************************/ +void IIRCalcFilterCoeff(struct _sIIRCoeff *pCoeff, float fa, float fg, float q, unsigned order, unsigned filterType) +{ + unsigned p; + float qp; + + //IIRInit(pCoeff, order); + + for(p=0; p < order/2;p++) + { + qp = q * IIRCalcQp(p+1, order); + IIRCalcPartFilterCoeff2(&pCoeff[p], 1.0, fa, fg, qp, filterType); + } +} + +int IIRCalcPartFilterCoeff1(struct _sIIRCoeff *pCoeff, float fa, float fg, float Qi, unsigned filterType) +{ + float K, a0; + float alpha, omega, ks, kc; + unsigned error; + + omega = (float)(2*pi*fg/fa); + ks = (float)sin(omega); + kc = (float)cos(omega); + alpha = (float)(0.5*ks /Qi); + + K = IIRBilTrans(fg, fa); + a0 = K/Qi + 1; + + switch(filterType) + { + case IIR_FILTERTYPE_LOWPASS: + + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (1 - K/Qi)/a0; + pCoeff->ak2 = 0.0; + + pCoeff->bk0 = (float)(1.0/a0); + pCoeff->bk1 = (float)(1.0/a0); + pCoeff->bk2 = (float)0.0; + + break; + + case IIR_FILTERTYPE_HIGHPASS: + + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (1 - K/Qi) /a0; + pCoeff->ak2 = 0.0; + + pCoeff->bk0 = (float)(1.0*K /a0); + pCoeff->bk1 = (float)(-1.0*K /a0); + pCoeff->bk2 = (float)0.0; + + break; + + default: + error = -1; + break; + } + return error; +} + +int IIRCalcPartFilterCoeff2(struct _sIIRCoeff *pCoeff, float A, float fa, float fg, float qp, unsigned filterType) +{ + float a0; + float alpha, omega, ks, kc; + unsigned error; + + omega = (float)(2*pi*fg/fa); + ks = (float)sin(omega); + kc = (float)cos(omega); + alpha = (float)(0.5*ks /qp); + + error = 0; + switch(filterType) + { + case IIR_FILTERTYPE_LOWPASS: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = (float)(0.5*(1 - kc) /a0); + pCoeff->bk1 = (1 - kc) /a0; + pCoeff->bk2 = (float)(0.5*(1 - kc) /a0); + + break; + + case IIR_FILTERTYPE_HIGHPASS: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = (float)(0.5*(1 + kc) /a0); + pCoeff->bk1 = -(1 + kc) /a0; + pCoeff->bk2 = (float)(0.5*(1 + kc) /a0); + + break; + + case IIR_FILTERTYPE_BANDPASS: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = alpha /a0; + pCoeff->bk1 = 0; + pCoeff->bk2 = -alpha /a0; + + break; + + case IIR_FILTERTYPE_BANDSTOP: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = (float)(1.0 /a0); + pCoeff->bk1 = (float)(-2.0*kc /a0); + pCoeff->bk2 = (float)(1.0 /a0); + + break; + + case IIR_FILTERTYPE_PEAKING: + + a0 = 1 + (alpha/A); + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - (alpha/A)) /a0; + + pCoeff->bk0 = (1 + (alpha*A)) /a0; + pCoeff->bk1 = (float)(-2.0*kc /a0); + pCoeff->bk2 = (1 - (alpha*A)) /a0; + + break; + + default: + error = -1; + break; + } + return error; +} + +void IIR(struct _sIIRCoeff *pCoeff, float *xn, float *yn, unsigned order, unsigned numPoints) +{ + float xp, yp; + unsigned i, p; + unsigned numSec = order/2; + + for (i=0; i +#include +#include "iir.h" +#include "filter.hpp" +#include "paramutils.h" + +#define NUM_PARMS 7 +#define MAX_ORDER 10 +#define MAX_TYPES 4 +#define MAX_Q 10.0f +#define ALPHA 0.2f +#define BETA (1.0f-ALPHA) + +char *pFTypeString[] = +{ + "Unknown", + "Lowpass", + "Highpass", + "Bandpass", + "Bandstop", + "Peaking", + "Low-Shelving", + "High-Shelving" +}; + +enum {ORDER, TYPE, FMIN, FMAX, FG, Q, TESTPARAM}; +char *pParmStr[NUM_PARMS] = {"Order","Filter-Type","Freq min","Freq max","Frequency","Resonance","Test-Param"}; + +AudioEffect* createEffectInstance (audioMasterCallback audioMaster) +{ + return new Filter (audioMaster); +} + +//----------------------------------------------------------------------------- +Filter::Filter(audioMasterCallback audioMaster) + : AudioEffectX(audioMaster, 1, NUM_PARMS) // 1 program, 1 parameter only +{ + sampleRate = 48000; + fg = 1000/sampleRate; // default to 1000 Hz + order = 4; + q = 1.0f/MAX_Q; + type = IIR_FILTERTYPE_LOWPASS; + setNumInputs(2); // stereo in + setNumOutputs(2); // stereo out + setUniqueID('Filt'); // identify +// canMono(); // makes sense to feed both inputs with the same signal + canProcessReplacing(); // supports both accumulating and replacing output + strcpy(programName, "Default"); // default program name + IIRInit(filterCoeff_L, order); + IIRInit(filterCoeff_R, order); + sm_fg = fg; + sm_q = q; + testParam=0; + + IIRCalcFilterCoeff(filterCoeff_L, sampleRate, sm_fg*sampleRate, sm_q, order, type); + IIRCalcFilterCoeff(filterCoeff_R, sampleRate, sm_fg*sampleRate, sm_q, order, type); + forder = (0.5f/MAX_ORDER)*(float)(order -1); + ftype = (1.0f/MAX_TYPES)*(float)(type -1); + f_fmin = 0; + f_fmax = 17300.f/sampleRate; +} + +//----------------------------------------------------------------------------------------- +Filter::~Filter() +{ + // nothing to do here +} + +//----------------------------------------------------------------------------------------- +void Filter::setProgramName(char *name) +{ + strcpy(programName, name); +} + +//----------------------------------------------------------------------------------------- +void Filter::getProgramName(char *name) +{ + strcpy(name, programName); +} + +//----------------------------------------------------------------------------------------- +void Filter::setParameter(VstInt32 index, float value) +{ + fg = f_fmin + value*(f_fmax-f_fmin); + + + switch(index) + { + case TYPE: + + ftype = ParamQuantize(value,1.0f/(MAX_TYPES-1)); + + type = 1 + (VstInt32)(ftype*(MAX_TYPES-1)); + IIRCalcFilterCoeff(filterCoeff_L, sampleRate, 0.5f*fg*sampleRate, q*MAX_Q, order, type); + IIRCalcFilterCoeff(filterCoeff_R, sampleRate, 0.5f*fg*sampleRate, q*MAX_Q, order, type); + break; + + case ORDER: + forder = ParamQuantize(value,1.0f/(MAX_ORDER/2-1)); + order = 2*(VstInt32)(1+forder*MAX_ORDER/2); + sprintf(dbgStr, "value = %f, forder = %f, order = %d",value,forder,order); + OutputDebugString(dbgStr); + IIRCalcFilterCoeff(filterCoeff_L, sampleRate, 0.5f*fg*sampleRate, q*MAX_Q, order, type); + IIRCalcFilterCoeff(filterCoeff_R, sampleRate, 0.5f*fg*sampleRate, q*MAX_Q, order, type); + break; + + case FMIN: + f_fmin = value; + break; + + case FMAX: + f_fmax = value; + break; + + case FG: + f_fg_param = value; + break; + + case Q: + q = value; + break; + + case TESTPARAM: + testParam=ParamQuantize(value,1.0f/3); + sprintf(dbgStr, "Set Param: %f",value); + OutputDebugString(dbgStr); + break; + } + +} + +//----------------------------------------------------------------------------------------- +float Filter::getParameter(VstInt32 index) +{ + float value = 0; + + switch(index) + { + case TYPE: + value = (float)ftype; + break; + + case ORDER: + value = (float)forder; + break; + + case FMIN: + value = f_fmin; + break; + + case FMAX: + value = f_fmin; + break; + + case FG: + value = f_fg_param; + break; + + case Q: + value = q; + break; + + case TESTPARAM: + value = testParam; + sprintf(dbgStr, "Get Param: %f",value); + OutputDebugString(dbgStr); + break; + } + return value; +} + +//----------------------------------------------------------------------------------------- +void Filter::getParameterName(VstInt32 index, char *label) +{ + strcpy(label,pParmStr[index]); +} + +//----------------------------------------------------------------------------------------- +void Filter::getParameterDisplay(VstInt32 index, char *text) +{ + switch(index) + { + case TYPE: + strcpy(text,pFTypeString[type]); + break; + case ORDER: + int2string(order, text, kVstMaxParamStrLen); + break; + case FMIN: + float2string(0.5f*f_fmin*sampleRate,text, kVstMaxParamStrLen); + break; + case FMAX: + float2string(0.5f*f_fmax*sampleRate,text, kVstMaxParamStrLen); + break; + case FG: + float2string(0.5f*fg*sampleRate,text, kVstMaxParamStrLen); + break; + case Q: + float2string(q*MAX_Q,text, kVstMaxParamStrLen); + break; + case TESTPARAM: + float2string(testParam,text, kVstMaxParamStrLen); + break; + + } +} + +//----------------------------------------------------------------------------------------- +void Filter::getParameterLabel(VstInt32 index, char *label) +{ + switch(index) + { + case TYPE: + strcpy(label, " "); + break; + case ORDER: + strcpy(label, " "); + break; + case FMIN: + strcpy(label, " Hz "); + break; + case FMAX: + strcpy(label, " Hz "); + break; + case FG: + strcpy(label, " Hz "); + break; + case Q: + strcpy(label, " "); + break; + case TESTPARAM: + strcpy(label, " Test "); + break; + } +} + +//----------------------------------------------------------------------------------------- +void Filter::processReplacing(float **inputs, float **outputs, VstInt32 sampleFrames) +{ + float *in1 = inputs[0]; + float *in2 = inputs[1]; + float *out1 = outputs[0]; + float *out2 = outputs[1]; + + sm_fg = BETA*sm_fg+ALPHA*fg; + sm_q = BETA*sm_q+ALPHA*q*MAX_Q; + + IIRCalcFilterCoeff(filterCoeff_L, sampleRate, 0.5f*sm_fg*sampleRate, sm_q, order, type); + IIRCalcFilterCoeff(filterCoeff_R, sampleRate, 0.5f*sm_fg*sampleRate, sm_q, order, type); + + IIR(filterCoeff_L, in1, out1, order, sampleFrames); + IIR(filterCoeff_R, in2, out2, order, sampleFrames); +} + +//----------------------------------------------------------------------------------------- +void Filter::setSampleRate(float sampleRate) +{ + this->sampleRate = sampleRate; + sprintf(dbgStr, "Sample Rate = %f",sampleRate); + OutputDebugString(dbgStr); +} + +//----------------------------------------------------------------------------------------- +void Filter::setBlockSize(VstInt32 blockSize) +{ + this->blockSize = blockSize; + sprintf(dbgStr, "Block Size = %d",blockSize); + OutputDebugString(dbgStr); +} diff --git a/src/filter.hpp b/src/filter.hpp new file mode 100755 index 0000000..e7a2c95 --- /dev/null +++ b/src/filter.hpp @@ -0,0 +1,44 @@ +/*----------------------------------------------------------------------------- + +© 1999, Steinberg Soft und Hardware GmbH, All Rights Reserved + +-----------------------------------------------------------------------------*/ +#ifndef __FILTER_H +#define __FILTER_H + +#include "public.sdk/source/vst2.x/audioeffectx.h" + +class Filter : public AudioEffectX +{ +public: + Filter(audioMasterCallback audioMaster); + ~Filter(); + + // Processing + virtual void processReplacing (float** inputs, float** outputs, VstInt32 sampleFrames); + + // Program + virtual void setProgramName (char* name); + virtual void getProgramName (char* name); + + // Parameters + virtual void setParameter (VstInt32 index, float value); + virtual float getParameter (VstInt32 index); + virtual void getParameterLabel (VstInt32 index, char* label); + virtual void getParameterDisplay (VstInt32 index, char* text); + virtual void getParameterName (VstInt32 index, char* text); + + virtual void setSampleRate(float sampleRate); + virtual void setBlockSize(VstInt32 blockSize); + +protected: + float ftype, forder, fg, q, sm_fg, sm_q, testParam; + float f_fmin, f_fmax, f_fg_param; + VstInt32 type, order; + char programName[32]; + char dbgStr[80]; + IIRPARAM filterParms; + IIRCOEFF filterCoeff_L[8], filterCoeff_R[8]; +}; + +#endif diff --git a/src/filterMain.cpp b/src/filterMain.cpp new file mode 100755 index 0000000..565c318 --- /dev/null +++ b/src/filterMain.cpp @@ -0,0 +1,56 @@ +/*----------------------------------------------------------------------------- + +© 1999, Steinberg Soft und Hardware GmbH, All Rights Reserved + +-----------------------------------------------------------------------------*/ +#include +#include "iir.h" +#include "filter.hpp" // *change* + +static AudioEffect *effect = 0; +bool oome = false; + +#if MAC +#pragma export on +#endif + +// prototype of the export function main +#if BEOS +#define main main_plugin +extern "C" __declspec(dllexport) AEffect *main_plugin (audioMasterCallback audioMaster); + +#else +AEffect *main (audioMasterCallback audioMaster); +#endif + +AEffect *main (audioMasterCallback audioMaster) +{ + // get vst version + if (!audioMaster (0, audioMasterVersion, 0, 0, 0, 0)) + return 0; // old version + + effect = new Filter (audioMaster); + if (!effect) + return 0; + if (oome) + { + delete effect; + return 0; + } + return effect->getAeffect (); +} + +#if MAC +#pragma export off +#endif + + +#if WIN32 +#include +void* hInstance; +BOOL WINAPI DllMain (HINSTANCE hInst, DWORD dwReason, LPVOID lpvReserved) +{ + hInstance = hInst; + return 1; +} +#endif diff --git a/src/iir.c b/src/iir.c new file mode 100644 index 0000000..88a7a59 --- /dev/null +++ b/src/iir.c @@ -0,0 +1,225 @@ +/************************************************************************* +** iir.c +**************************************************************************/ +#include "stdio.h" +#include "math.h" +#include "iir.h" + +/************************************************************************* +** Global Variables +**************************************************************************/ +const char *filterTypeString[] = +{ + "Unknown filter type", + "Butterworth-Lowpass", + "Butterworth-Highpass", + "Butterworth-Bandpass", + "Butterworth-Bandstop", + "Peaking-EQ", + "Low Shelving-EQ", + "High Shelving-EQ" +}; + +/******************************************************************************/ +void IIRCalcFilterCoeff(struct _sIIRCoeff *pCoeff, float fa, float fg, float q, unsigned order, unsigned filterType) +{ + unsigned p; + float qp; + + //IIRInit(pCoeff, order); + + for(p=0; p < order/2;p++) + { + qp = q * IIRCalcQp(p+1, order); + IIRCalcPartFilterCoeff2(&pCoeff[p], 1.0, fa, fg, qp, filterType); + } +} + +int IIRCalcPartFilterCoeff1(struct _sIIRCoeff *pCoeff, float fa, float fg, float Qi, unsigned filterType) +{ + float K, a0; + float alpha, omega, ks, kc; + unsigned error; + + omega = (float)(2*pi*fg/fa); + ks = (float)sin(omega); + kc = (float)cos(omega); + alpha = (float)(0.5*ks /Qi); + + K = IIRBilTrans(fg, fa); + a0 = K/Qi + 1; + + switch(filterType) + { + case IIR_FILTERTYPE_LOWPASS: + + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (1 - K/Qi)/a0; + pCoeff->ak2 = 0.0; + + pCoeff->bk0 = (float)(1.0/a0); + pCoeff->bk1 = (float)(1.0/a0); + pCoeff->bk2 = (float)0.0; + + break; + + case IIR_FILTERTYPE_HIGHPASS: + + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (1 - K/Qi) /a0; + pCoeff->ak2 = 0.0; + + pCoeff->bk0 = (float)(1.0*K /a0); + pCoeff->bk1 = (float)(-1.0*K /a0); + pCoeff->bk2 = (float)0.0; + + break; + + default: + error = -1; + break; + } + return error; +} + +int IIRCalcPartFilterCoeff2(struct _sIIRCoeff *pCoeff, float A, float fa, float fg, float qp, unsigned filterType) +{ + float a0; + float alpha, omega, ks, kc; + unsigned error; + + omega = (float)(2*pi*fg/fa); + ks = (float)sin(omega); + kc = (float)cos(omega); + alpha = (float)(0.5*ks /qp); + + error = 0; + switch(filterType) + { + case IIR_FILTERTYPE_LOWPASS: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = (float)(0.5*(1 - kc) /a0); + pCoeff->bk1 = (1 - kc) /a0; + pCoeff->bk2 = (float)(0.5*(1 - kc) /a0); + + break; + + case IIR_FILTERTYPE_HIGHPASS: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = (float)(0.5*(1 + kc) /a0); + pCoeff->bk1 = -(1 + kc) /a0; + pCoeff->bk2 = (float)(0.5*(1 + kc) /a0); + + break; + + case IIR_FILTERTYPE_BANDPASS: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = alpha /a0; + pCoeff->bk1 = 0; + pCoeff->bk2 = -alpha /a0; + + break; + + case IIR_FILTERTYPE_BANDSTOP: + + a0 = 1 + alpha; + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - alpha) /a0; + + pCoeff->bk0 = (float)(1.0 /a0); + pCoeff->bk1 = (float)(-2.0*kc /a0); + pCoeff->bk2 = (float)(1.0 /a0); + + break; + + case IIR_FILTERTYPE_PEAKING: + + a0 = 1 + (alpha/A); + pCoeff->ak0 = 1.0; + pCoeff->ak1 = (float)(-2.0*kc /a0); + pCoeff->ak2 = (1 - (alpha/A)) /a0; + + pCoeff->bk0 = (1 + (alpha*A)) /a0; + pCoeff->bk1 = (float)(-2.0*kc /a0); + pCoeff->bk2 = (1 - (alpha*A)) /a0; + + break; + + default: + error = -1; + break; + } + return error; +} + +void IIR(struct _sIIRCoeff *pCoeff, float *xn, float *yn, unsigned order, unsigned numPoints) +{ + float xp, yp; + unsigned i, p; + unsigned numSec = order/2; + + for (i=0; i + +float ParamQuantize(float value, float quantization) +{ + + float result = 1.0; + float k = (float) ceil(value / quantization); + + if ((k*quantization) < 1.0) + result = k*quantization; + + return result; +} + +float norm2quant(float minparm, float maxparm, float quant, float x) +{ + int y; + float step = (maxparm-minparm); + + y = (int)minparm + (int)quant * (int)((0.5 + x*step)/quant); + + return (float)y; +} + +float quant2norm(float minparm, float maxparm, float y) +{ + return (y-minparm)/(maxparm-minparm); +} diff --git a/src/paramutils.h b/src/paramutils.h new file mode 100644 index 0000000..575e186 --- /dev/null +++ b/src/paramutils.h @@ -0,0 +1,21 @@ +/*************************************************************** +** paramutils.h +****************************************************************/ +#ifndef PARAMUTILS_H +#define PARAMUTILS_H +#if defined(__cplusplus) +extern "C" { +#endif +/***************************************************************/ + +float ParamQuantize(float value, float quantization); +float norm2quant(float minparm, float maxparm, float quant, float x); +float quant2norm(float minparm, float maxparm, float y); + + +/***************************************************************/ +#if defined(__cplusplus) +} +#endif /* cplusplus */ + +#endif /* PARAMUTILS_H */ diff --git a/submodules/make b/submodules/make new file mode 160000 index 0000000..e07fbf1 --- /dev/null +++ b/submodules/make @@ -0,0 +1 @@ +Subproject commit e07fbf1860f0ffc92fdb69cf646961ca8da10193