From 669705c6edb5cfbcb2f0ca672612777d1e819aa6 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Mon, 13 Nov 2017 19:15:09 +0100 Subject: Restructure: Move filters from common code to 'libfilter' --- .gitignore | 1 + configure.ac | 1 + src/Makefile.am | 2 +- src/amps/Makefile.am | 1 + src/anetz/Makefile.am | 1 + src/bnetz/Makefile.am | 1 + src/cnetz/Makefile.am | 1 + src/cnetz/scrambler.h | 2 +- src/common/Makefile.am | 1 - src/common/emphasis.c | 2 +- src/common/fm_modulation.h | 2 +- src/common/iir_filter.c | 167 -------------------------------------------- src/common/iir_filter.h | 17 ----- src/common/samplerate.h | 2 +- src/jtacs/Makefile.am | 1 + src/libfilter/Makefile.am | 6 ++ src/libfilter/iir_filter.c | 167 ++++++++++++++++++++++++++++++++++++++++++++ src/libfilter/iir_filter.h | 17 +++++ src/nmt/Makefile.am | 1 + src/r2000/Makefile.am | 1 + src/tacs/Makefile.am | 1 + src/test/Makefile.am | 5 ++ src/test/test_emphasis.c | 2 +- src/test/test_filter.c | 2 +- src/test/test_performance.c | 2 +- src/tv/Makefile.am | 1 + src/tv/bas.c | 2 +- src/tv/main.c | 4 +- 28 files changed, 217 insertions(+), 196 deletions(-) delete mode 100644 src/common/iir_filter.c delete mode 100644 src/common/iir_filter.h create mode 100644 src/libfilter/Makefile.am create mode 100644 src/libfilter/iir_filter.c create mode 100644 src/libfilter/iir_filter.h diff --git a/.gitignore b/.gitignore index 6a87413..961b61b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ compile .libs .dirstamp m4 +src/libfilter/libfilter.a src/common/libcommon.a src/common/libmobile.a src/common/libimage.a diff --git a/configure.ac b/configure.ac index 93176b3..cea6660 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )]) AC_OUTPUT( + src/libfilter/Makefile src/common/Makefile src/anetz/Makefile src/bnetz/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a248673..378d449 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test +SUBDIRS = libfilter common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am index c94f2c1..43e4887 100644 --- a/src/amps/Makefile.am +++ b/src/amps/Makefile.am @@ -28,6 +28,7 @@ amps_LDADD = \ libamps.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am index 48e7489..b742481 100644 --- a/src/anetz/Makefile.am +++ b/src/anetz/Makefile.am @@ -14,6 +14,7 @@ anetz_LDADD = \ $(top_builddir)/src/common/libgermanton.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am index 059f455..38adde6 100644 --- a/src/bnetz/Makefile.am +++ b/src/bnetz/Makefile.am @@ -16,6 +16,7 @@ bnetz_LDADD = \ $(top_builddir)/src/common/libgermanton.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am index 9d5c86b..ee678e7 100644 --- a/src/cnetz/Makefile.am +++ b/src/cnetz/Makefile.am @@ -20,6 +20,7 @@ cnetz_LDADD = \ $(top_builddir)/src/common/libgermanton.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/cnetz/scrambler.h b/src/cnetz/scrambler.h index f06e4ac..d38edc5 100644 --- a/src/cnetz/scrambler.h +++ b/src/cnetz/scrambler.h @@ -1,4 +1,4 @@ -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" typedef struct scrambler { double carrier_phaseshift65536;/* carrier phase shift per sample */ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 6005e56..7a59d64 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -10,7 +10,6 @@ libcommon_a_SOURCES = \ wave.c \ goertzel.c \ jitter.c \ - iir_filter.c \ dtmf.c \ samplerate.c \ emphasis.c \ diff --git a/src/common/emphasis.c b/src/common/emphasis.c index 5a1453e..08f944a 100644 --- a/src/common/emphasis.c +++ b/src/common/emphasis.c @@ -22,7 +22,7 @@ #include #include #include "sample.h" -#include "iir_filter.h" +#include "../libfilter/iir_filter.h" #include "emphasis.h" #include "debug.h" diff --git a/src/common/fm_modulation.h b/src/common/fm_modulation.h index d0bdaa1..68f0bcd 100644 --- a/src/common/fm_modulation.h +++ b/src/common/fm_modulation.h @@ -1,4 +1,4 @@ -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" enum fm_mod_state { MOD_STATE_OFF, /* transmitter off, no IQ vector */ diff --git a/src/common/iir_filter.c b/src/common/iir_filter.c deleted file mode 100644 index 3d1e15c..0000000 --- a/src/common/iir_filter.c +++ /dev/null @@ -1,167 +0,0 @@ -/* cut-off filter (biquad) based on Nigel Redmon (www.earlevel.com) - * - * (C) 2016 by Andreas Eversberg - * All Rights Reserved - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include -#include "sample.h" -#include "iir_filter.h" - -#define PI M_PI - -void iir_lowpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) -{ - double Fc, Q, K, norm; - - if (iterations > 64) { - fprintf(stderr, "%s failed: too many iterations, please fix!\n", __func__); - abort(); - } - - memset(filter, 0, sizeof(*filter)); - filter->iter = iterations; - Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ - Fc = frequency / (double)samplerate; - K = tan(PI * Fc); - norm = 1 / (1 + K / Q + K * K); - filter->a0 = K * K * norm; - filter->a1 = 2 * filter->a0; - filter->a2 = filter->a0; - filter->b1 = 2 * (K * K - 1) * norm; - filter->b2 = (1 - K / Q + K * K) * norm; -} - -void iir_highpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) -{ - double Fc, Q, K, norm; - - memset(filter, 0, sizeof(*filter)); - filter->iter = iterations; - Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ - Fc = frequency / (double)samplerate; - K = tan(PI * Fc); - norm = 1 / (1 + K / Q + K * K); - filter->a0 = 1 * norm; - filter->a1 = -2 * filter->a0; - filter->a2 = filter->a0; - filter->b1 = 2 * (K * K - 1) * norm; - filter->b2 = (1 - K / Q + K * K) * norm; -} - -void iir_bandpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) -{ - double Fc, Q, K, norm; - - memset(filter, 0, sizeof(*filter)); - filter->iter = iterations; - Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ - Fc = frequency / (double)samplerate; - K = tan(PI * Fc); - norm = 1 / (1 + K / Q + K * K); - filter->a0 = K / Q * norm; - filter->a1 = 0; - filter->a2 = -filter->a0; - filter->b1 = 2 * (K * K - 1) * norm; - filter->b2 = (1 - K / Q + K * K) * norm; -} - -void iir_notch_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) -{ - double Fc, Q, K, norm; - - memset(filter, 0, sizeof(*filter)); - filter->iter = iterations; - Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ - Fc = frequency / (double)samplerate; - K = tan(PI * Fc); - norm = 1 / (1 + K / Q + K * K); - filter->a0 = (1 + K * K) * norm; - filter->a1 = 2 * (K * K - 1) * norm; - filter->a2 = filter->a0; - filter->b1 = filter->a1; - filter->b2 = (1 - K / Q + K * K) * norm; -} - -void iir_process(iir_filter_t *filter, sample_t *samples, int length) -{ - double a0, a1, a2, b1, b2; - double *z1, *z2; - double in, out; - int iterations = filter->iter; - int i, j; - - /* get states */ - a0 = filter->a0; - a1 = filter->a1; - a2 = filter->a2; - b1 = filter->b1; - b2 = filter->b2; - - /* these are state pointers, so no need to write back */ - z1 = filter->z1; - z2 = filter->z2; - - /* process filter */ - for (i = 0; i < length; i++) { - in = *samples; - for (j = 0; j < iterations; j++) { - out = in * a0 + z1[j]; - z1[j] = in * a1 + z2[j] - b1 * out; - z2[j] = in * a2 - b2 * out; - in = out; - } - *samples++ = in; - } -} - -void iir_process_baseband(iir_filter_t *filter, float *baseband, int length) -{ - double a0, a1, a2, b1, b2; - double *z1, *z2; - double in, out; - int iterations = filter->iter; - int i, j; - - /* get states */ - a0 = filter->a0; - a1 = filter->a1; - a2 = filter->a2; - b1 = filter->b1; - b2 = filter->b2; - - /* these are state pointers, so no need to write back */ - z1 = filter->z1; - z2 = filter->z2; - - /* process filter */ - for (i = 0; i < length; i++) { - in = *baseband; - for (j = 0; j < iterations; j++) { - out = in * a0 + z1[j]; - z1[j] = in * a1 + z2[j] - b1 * out; - z2[j] = in * a2 - b2 * out; - in = out; - } - *baseband = in; - baseband += 2; - } -} - diff --git a/src/common/iir_filter.h b/src/common/iir_filter.h deleted file mode 100644 index a5956c8..0000000 --- a/src/common/iir_filter.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _FILTER_H -#define _FILTER_H - -typedef struct iir_filter { - int iter; - double a0, a1, a2, b1, b2; - double z1[64], z2[64]; -} iir_filter_t; - -void iir_lowpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); -void iir_highpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); -void iir_bandpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); -void iir_notch_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); -void iir_process(iir_filter_t *filter, sample_t *samples, int length); -void iir_process_baseband(iir_filter_t *filter, float *baseband, int length); - -#endif /* _FILTER_H */ diff --git a/src/common/samplerate.h b/src/common/samplerate.h index 4fbf680..8f8ea87 100644 --- a/src/common/samplerate.h +++ b/src/common/samplerate.h @@ -1,4 +1,4 @@ -#include "iir_filter.h" +#include "../libfilter/iir_filter.h" typedef struct samplerate { double factor; diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am index 7074176..b4e6fdf 100644 --- a/src/jtacs/Makefile.am +++ b/src/jtacs/Makefile.am @@ -14,6 +14,7 @@ jtacs_LDADD = \ ../amps/libamps.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/libfilter/Makefile.am b/src/libfilter/Makefile.am new file mode 100644 index 0000000..2a387ee --- /dev/null +++ b/src/libfilter/Makefile.am @@ -0,0 +1,6 @@ +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) + +noinst_LIBRARIES = libfilter.a + +libfilter_a_SOURCES = \ + iir_filter.c diff --git a/src/libfilter/iir_filter.c b/src/libfilter/iir_filter.c new file mode 100644 index 0000000..2f6bb1d --- /dev/null +++ b/src/libfilter/iir_filter.c @@ -0,0 +1,167 @@ +/* cut-off filter (biquad) based on Nigel Redmon (www.earlevel.com) + * + * (C) 2016 by Andreas Eversberg + * All Rights Reserved + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include "../common/sample.h" +#include "iir_filter.h" + +#define PI M_PI + +void iir_lowpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) +{ + double Fc, Q, K, norm; + + if (iterations > 64) { + fprintf(stderr, "%s failed: too many iterations, please fix!\n", __func__); + abort(); + } + + memset(filter, 0, sizeof(*filter)); + filter->iter = iterations; + Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ + Fc = frequency / (double)samplerate; + K = tan(PI * Fc); + norm = 1 / (1 + K / Q + K * K); + filter->a0 = K * K * norm; + filter->a1 = 2 * filter->a0; + filter->a2 = filter->a0; + filter->b1 = 2 * (K * K - 1) * norm; + filter->b2 = (1 - K / Q + K * K) * norm; +} + +void iir_highpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) +{ + double Fc, Q, K, norm; + + memset(filter, 0, sizeof(*filter)); + filter->iter = iterations; + Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ + Fc = frequency / (double)samplerate; + K = tan(PI * Fc); + norm = 1 / (1 + K / Q + K * K); + filter->a0 = 1 * norm; + filter->a1 = -2 * filter->a0; + filter->a2 = filter->a0; + filter->b1 = 2 * (K * K - 1) * norm; + filter->b2 = (1 - K / Q + K * K) * norm; +} + +void iir_bandpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) +{ + double Fc, Q, K, norm; + + memset(filter, 0, sizeof(*filter)); + filter->iter = iterations; + Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ + Fc = frequency / (double)samplerate; + K = tan(PI * Fc); + norm = 1 / (1 + K / Q + K * K); + filter->a0 = K / Q * norm; + filter->a1 = 0; + filter->a2 = -filter->a0; + filter->b1 = 2 * (K * K - 1) * norm; + filter->b2 = (1 - K / Q + K * K) * norm; +} + +void iir_notch_init(iir_filter_t *filter, double frequency, int samplerate, int iterations) +{ + double Fc, Q, K, norm; + + memset(filter, 0, sizeof(*filter)); + filter->iter = iterations; + Q = pow(sqrt(0.5), 1.0 / (double)iterations); /* 0.7071 @ 1 iteration */ + Fc = frequency / (double)samplerate; + K = tan(PI * Fc); + norm = 1 / (1 + K / Q + K * K); + filter->a0 = (1 + K * K) * norm; + filter->a1 = 2 * (K * K - 1) * norm; + filter->a2 = filter->a0; + filter->b1 = filter->a1; + filter->b2 = (1 - K / Q + K * K) * norm; +} + +void iir_process(iir_filter_t *filter, sample_t *samples, int length) +{ + double a0, a1, a2, b1, b2; + double *z1, *z2; + double in, out; + int iterations = filter->iter; + int i, j; + + /* get states */ + a0 = filter->a0; + a1 = filter->a1; + a2 = filter->a2; + b1 = filter->b1; + b2 = filter->b2; + + /* these are state pointers, so no need to write back */ + z1 = filter->z1; + z2 = filter->z2; + + /* process filter */ + for (i = 0; i < length; i++) { + in = *samples; + for (j = 0; j < iterations; j++) { + out = in * a0 + z1[j]; + z1[j] = in * a1 + z2[j] - b1 * out; + z2[j] = in * a2 - b2 * out; + in = out; + } + *samples++ = in; + } +} + +void iir_process_baseband(iir_filter_t *filter, float *baseband, int length) +{ + double a0, a1, a2, b1, b2; + double *z1, *z2; + double in, out; + int iterations = filter->iter; + int i, j; + + /* get states */ + a0 = filter->a0; + a1 = filter->a1; + a2 = filter->a2; + b1 = filter->b1; + b2 = filter->b2; + + /* these are state pointers, so no need to write back */ + z1 = filter->z1; + z2 = filter->z2; + + /* process filter */ + for (i = 0; i < length; i++) { + in = *baseband; + for (j = 0; j < iterations; j++) { + out = in * a0 + z1[j]; + z1[j] = in * a1 + z2[j] - b1 * out; + z2[j] = in * a2 - b2 * out; + in = out; + } + *baseband = in; + baseband += 2; + } +} + diff --git a/src/libfilter/iir_filter.h b/src/libfilter/iir_filter.h new file mode 100644 index 0000000..a5956c8 --- /dev/null +++ b/src/libfilter/iir_filter.h @@ -0,0 +1,17 @@ +#ifndef _FILTER_H +#define _FILTER_H + +typedef struct iir_filter { + int iter; + double a0, a1, a2, b1, b2; + double z1[64], z2[64]; +} iir_filter_t; + +void iir_lowpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); +void iir_highpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); +void iir_bandpass_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); +void iir_notch_init(iir_filter_t *filter, double frequency, int samplerate, int iterations); +void iir_process(iir_filter_t *filter, sample_t *samples, int length); +void iir_process_baseband(iir_filter_t *filter, float *baseband, int length); + +#endif /* _FILTER_H */ diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am index 0c567be..923dfde 100644 --- a/src/nmt/Makefile.am +++ b/src/nmt/Makefile.am @@ -24,6 +24,7 @@ nmt_LDADD = \ libdmssms.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am index 5beee48..d17a392 100644 --- a/src/r2000/Makefile.am +++ b/src/r2000/Makefile.am @@ -14,6 +14,7 @@ radiocom2000_LDADD = \ $(COMMON_LA) \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am index ec7163c..190e9a2 100644 --- a/src/tacs/Makefile.am +++ b/src/tacs/Makefile.am @@ -15,6 +15,7 @@ tacs_LDADD = \ ../amps/libamps.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/test/Makefile.am b/src/test/Makefile.am index d310415..1c86d46 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -15,6 +15,7 @@ test_filter_LDADD = \ $(COMMON_LA) \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -37,6 +38,7 @@ test_emphasis_LDADD = \ $(COMMON_LA) \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -49,6 +51,7 @@ test_dms_LDADD = \ $(top_builddir)/src/nmt/libdmssms.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -61,6 +64,7 @@ test_sms_LDADD = \ $(top_builddir)/src/nmt/libdmssms.a \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ @@ -72,6 +76,7 @@ test_performance_LDADD = \ $(COMMON_LA) \ $(top_builddir)/src/common/libmobile.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c index f404cdd..b02c106 100644 --- a/src/test/test_emphasis.c +++ b/src/test/test_emphasis.c @@ -3,7 +3,7 @@ #include #include #include "../common/sample.h" -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" #include "../common/emphasis.h" #include "../common/debug.h" diff --git a/src/test/test_filter.c b/src/test/test_filter.c index dc8ca7d..10b1393 100644 --- a/src/test/test_filter.c +++ b/src/test/test_filter.c @@ -3,7 +3,7 @@ #include #include #include "../common/sample.h" -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" #include "../common/debug.h" #define level2db(level) (20 * log10(level)) diff --git a/src/test/test_performance.c b/src/test/test_performance.c index dbc6b5c..175185c 100644 --- a/src/test/test_performance.c +++ b/src/test/test_performance.c @@ -4,7 +4,7 @@ #include #include #include "../common/sample.h" -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" #include "../common/fm_modulation.h" #include "../common/debug.h" diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am index ffee6fd..b6d20de 100644 --- a/src/tv/Makefile.am +++ b/src/tv/Makefile.am @@ -16,6 +16,7 @@ osmotv_LDADD = \ $(COMMON_LA) \ $(top_builddir)/src/common/libimage.a \ $(top_builddir)/src/common/libcommon.a \ + $(top_builddir)/src/libfilter/libfilter.a \ $(ALSA_LIBS) \ $(UHD_LIBS) \ $(SOAPY_LIBS) \ diff --git a/src/tv/bas.c b/src/tv/bas.c index fb8c70b..86df443 100644 --- a/src/tv/bas.c +++ b/src/tv/bas.c @@ -21,7 +21,7 @@ #include #include #include "../common/sample.h" -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" #include "bas.h" #include "vcr.h" #include "fubk.h" diff --git a/src/tv/main.c b/src/tv/main.c index a107d53..115d97d 100644 --- a/src/tv/main.c +++ b/src/tv/main.c @@ -28,7 +28,7 @@ enum paging_signal; #include #include #include "../common/sample.h" -#include "../common/iir_filter.h" +#include "../libfilter/iir_filter.h" #include "../common/fm_modulation.h" #include "../common/wave.h" #include "../common/img.h" @@ -260,7 +260,7 @@ static int handle_options(int argc, char **argv) return skip_args; } -static void tx_bas(sample_t *sample_bas, __attribute__((__unused__)) sample_t *sample_tone, uint8_t *power_tone, int samples) +static void tx_bas(sample_t *sample_bas, __attribute__((__unused__)) sample_t *sample_tone, __attribute__((__unused__)) uint8_t *power_tone, int samples) { /* catch signals */ signal(SIGINT, sighandler); -- cgit v1.2.3