use qfplib; fix I2S clock

main
Clyne 4 months ago
parent a78f3f6fe9
commit eea21d422b
Signed by: clyne
GPG Key ID: 3267C8EBF3F9AFC7

@ -5,7 +5,7 @@
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = -O3 -ggdb -fomit-frame-pointer -falign-functions=16 USE_OPT = -O3 -ggdb -fomit-frame-pointer -falign-functions=16 -fno-stack-protector
endif endif
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).
@ -25,7 +25,7 @@ endif
# Linker extra options here. # Linker extra options here.
ifeq ($(USE_LDOPT),) ifeq ($(USE_LDOPT),)
USE_LDOPT = -lm USE_LDOPT =
endif endif
# Enable this if you want link time optimizations (LTO). # Enable this if you want link time optimizations (LTO).
@ -66,12 +66,12 @@ endif
# Enables the use of FPU (no, softfp, hard). # Enables the use of FPU (no, softfp, hard).
ifeq ($(USE_FPU),) ifeq ($(USE_FPU),)
USE_FPU = softfp USE_FPU = no
endif endif
# FPU-related options. # FPU-related options.
ifeq ($(USE_FPU_OPT),) ifeq ($(USE_FPU_OPT),)
USE_FPU_OPT = -mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16 USE_FPU_OPT = #-mfloat-abi=$(USE_FPU) -mfpu=fpv4-sp-d16
endif endif
# #
@ -89,7 +89,7 @@ PROJECT = ch
MCU = cortex-m0 MCU = cortex-m0
# Imported source files and paths. # Imported source files and paths.
CHIBIOS := ../.. CHIBIOS := ../../ChibiOS
CONFDIR := ./cfg CONFDIR := ./cfg
BUILDDIR := ./build BUILDDIR := ./build
DEPDIR := ./.dep DEPDIR := ./.dep
@ -127,14 +127,15 @@ CPPSRC = $(ALLCPPSRC) \
main.cpp main.cpp
# List ASM source files here. # List ASM source files here.
ASMSRC = $(ALLASMSRC) ASMSRC = $(ALLASMSRC) \
qfplib-m0-full-20240105/qfplib-m0-full.s
# List ASM with preprocessor source files here. # List ASM with preprocessor source files here.
ASMXSRC = $(ALLXASMSRC) ASMXSRC = $(ALLXASMSRC)
# Inclusion directories. # Inclusion directories.
INCDIR = $(CONFDIR) $(ALLINC) \ INCDIR = $(CONFDIR) $(ALLINC) \
fpm/include qfplib-m0-full-20240105
# Define C warning options here. # Define C warning options here.
CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes

@ -67,7 +67,7 @@
#define STM32_PLLQ_VALUE 4 #define STM32_PLLQ_VALUE 4
#define STM32_PLLR_VALUE 4 #define STM32_PLLR_VALUE 4
#define STM32_HPRE STM32_HPRE_DIV1 #define STM32_HPRE STM32_HPRE_DIV1
#define STM32_PPRE STM32_PPRE_DIV1 #define STM32_PPRE STM32_PPRE_DIV4
#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK #define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
#define STM32_MCOPRE STM32_MCOPRE_DIV1 #define STM32_MCOPRE STM32_MCOPRE_DIV1
#define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK #define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK
@ -79,7 +79,7 @@
#define STM32_USART2SEL STM32_USART2SEL_PCLK #define STM32_USART2SEL STM32_USART2SEL_PCLK
#define STM32_LPUART1SEL STM32_LPUART1SEL_PCLK #define STM32_LPUART1SEL STM32_LPUART1SEL_PCLK
#define STM32_I2C1SEL STM32_I2C1SEL_PCLK #define STM32_I2C1SEL STM32_I2C1SEL_PCLK
#define STM32_I2S1SEL STM32_I2S1SEL_HSI16 #define STM32_I2S1SEL STM32_I2S1SEL_SYSCLK
#define STM32_LPTIM1SEL STM32_LPTIM1SEL_PCLK #define STM32_LPTIM1SEL STM32_LPTIM1SEL_PCLK
#define STM32_TIM1SEL STM32_TIM1SEL_TIMPCLK #define STM32_TIM1SEL STM32_TIM1SEL_TIMPCLK
#define STM32_RNGSEL STM32_RNGSEL_HSI16 #define STM32_RNGSEL STM32_RNGSEL_HSI16

@ -9,31 +9,31 @@
static constexpr auto& WEIGHTING = A_weighting; static constexpr auto& WEIGHTING = A_weighting;
static constexpr auto& MIC_EQUALIZER = SPH0645LM4H_B_RB; static constexpr auto& MIC_EQUALIZER = SPH0645LM4H_B_RB;
static constexpr sos_t MIC_OFFSET_DB ( 0.f); // Linear offset static constexpr float MIC_OFFSET_DB ( 0.f); // Linear offset
static constexpr sos_t MIC_SENSITIVITY (-26.f); // dBFS value expected at MIC_REF_DB static constexpr float MIC_SENSITIVITY (-26.f); // dBFS value expected at MIC_REF_DB
static constexpr sos_t MIC_REF_DB ( 94.f); // dB where sensitivity is specified static constexpr float MIC_REF_DB ( 94.f); // dB where sensitivity is specified
static constexpr sos_t MIC_OVERLOAD_DB (120.f); // dB - Acoustic overload point static constexpr sos_t MIC_OVERLOAD_DB (120.f); // dB - Acoustic overload point
static constexpr sos_t MIC_NOISE_DB ( 29.f); // dB - Noise floor static constexpr sos_t MIC_NOISE_DB ( 29.f); // dB - Noise floor
static constexpr auto MIC_BITS = 16u; // SPH0645 is actually 18 bits static constexpr auto MIC_BITS = 18u;
static constexpr auto SAMPLE_RATE = 32000u; static constexpr auto SAMPLE_RATE = 48000u;
static constexpr unsigned I2S_BUFSIZ = 512; // was 1024 static constexpr unsigned I2S_BUFSIZ = 1024;
static constexpr unsigned I2S_STRIDE = 16; // was 8 static constexpr unsigned I2S_STRIDE = 16;
// Calculate reference amplitude value at compile time // Calculate reference amplitude value at compile time
static const auto MIC_REF_AMPL = fpm::pow(sos_t(10), MIC_SENSITIVITY / 20) * static const auto MIC_REF_AMPL = qfp_fpow(10.f, MIC_SENSITIVITY / 20) *
((1 << (MIC_BITS - 1)) - 1); ((1 << (MIC_BITS - 1)) - 1);
static SEMAPHORE_DECL(i2sReady, 0); static SEMAPHORE_DECL(i2sReady, 0);
static THD_WORKING_AREA(waThread1, 128); static THD_WORKING_AREA(waThread1, 128);
static std::array<uint32_t, I2S_BUFSIZ> i2sBuffer; static std::array<uint32_t, I2S_BUFSIZ> i2sBuffer;
static sos_t Leq_sum_sqr (0); static sos_t Leq_sum_sqr (0.f);
static unsigned Leq_samples = 0; static unsigned Leq_samples = 0;
static THD_FUNCTION(Thread1, arg); static THD_FUNCTION(Thread1, arg);
static void i2sCallback(I2SDriver *i2s); static void i2sCallback(I2SDriver *i2s);
static constexpr auto I2SPRval = SAMPLE_RATE * 64 / 1000 / 1024 * 2; static constexpr unsigned I2SPRval = 16'000'000 / SAMPLE_RATE / 32 / 2;
static constexpr I2SConfig i2sConfig = { static constexpr I2SConfig i2sConfig = {
/* TX buffer */ NULL, /* TX buffer */ NULL,
/* RX buffer */ i2sBuffer.data(), /* RX buffer */ i2sBuffer.data(),
@ -43,11 +43,11 @@ static constexpr I2SConfig i2sConfig = {
(0 << SPI_I2SCFGR_I2SSTD_Pos) | // Philips I2S (0 << SPI_I2SCFGR_I2SSTD_Pos) | // Philips I2S
(1 << SPI_I2SCFGR_DATLEN_Pos) | // 24-bit (1 << SPI_I2SCFGR_DATLEN_Pos) | // 24-bit
SPI_I2SCFGR_CHLEN, // 32-bit frame SPI_I2SCFGR_CHLEN, // 32-bit frame
/* I2SPR */ I2SPRval | (((I2SPRval / 2) & 1) ? SPI_I2SPR_ODD : 0) /* I2SPR */ (I2SPRval / 2) | ((I2SPRval & 1) ? SPI_I2SPR_ODD : 0)
}; };
THD_TABLE_BEGIN THD_TABLE_BEGIN
THD_TABLE_THREAD(0, "blinker1", waThread1, Thread1, NULL) THD_TABLE_THREAD(0, "main", waThread1, Thread1, NULL)
THD_TABLE_END THD_TABLE_END
int main(void) int main(void)
@ -64,6 +64,7 @@ THD_FUNCTION(Thread1, arg)
chThdSleepMilliseconds(2000); chThdSleepMilliseconds(2000);
palSetPadMode(GPIOB, 7, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOF, 2, PAL_MODE_UNCONNECTED); palSetPadMode(GPIOF, 2, PAL_MODE_UNCONNECTED);
palSetLineMode(LINE_I2S_SD, PAL_MODE_ALTERNATE(0)); palSetLineMode(LINE_I2S_SD, PAL_MODE_ALTERNATE(0));
palSetLineMode(LINE_I2S_WS, PAL_MODE_ALTERNATE(0)); palSetLineMode(LINE_I2S_WS, PAL_MODE_ALTERNATE(0));
@ -79,12 +80,13 @@ THD_FUNCTION(Thread1, arg)
uint8_t strbuf[7] = { 0, 0, 0, 'd', 'B', '\n', '\0' }; uint8_t strbuf[7] = { 0, 0, 0, 'd', 'B', '\n', '\0' };
for (;;) { for (;;) {
palSetPad(GPIOB, 7);
chSemWait(&i2sReady); chSemWait(&i2sReady);
const auto Leq_RMS = fpm::sqrt(Leq_sum_sqr / Leq_samples); const auto Leq_RMS = qfp_fsqrt((float)Leq_sum_sqr / Leq_samples);
const auto Leq_dB = MIC_OFFSET_DB + MIC_REF_DB + 20 * const auto Leq_dB = MIC_OFFSET_DB + MIC_REF_DB + 20 *
fpm::log10(Leq_RMS / MIC_REF_AMPL); qfp_flog10(Leq_RMS / MIC_REF_AMPL);
Leq_sum_sqr = sos_t(0); Leq_sum_sqr = sos_t(0.f);
Leq_samples = 0; Leq_samples = 0;
auto n = std::clamp(static_cast<int32_t>(Leq_dB), 0l, 999l); auto n = std::clamp(static_cast<int32_t>(Leq_dB), 0l, 999l);
@ -92,22 +94,24 @@ THD_FUNCTION(Thread1, arg)
strbuf[1] = n % 10 + '0'; n /= 10; strbuf[1] = n % 10 + '0'; n /= 10;
strbuf[0] = n ? n + '0' : ' '; strbuf[0] = n ? n + '0' : ' ';
sdWrite(&SD2, strbuf, sizeof(strbuf)); sdWrite(&SD2, strbuf, sizeof(strbuf));
palClearPad(GPIOB, 7);
} }
} }
int32_t fixsample(uint32_t s) {
return (int32_t)(((s & 0xFFFF) << 16) | (s >> 16)) >> (32 - MIC_BITS);
}
void i2sCallback(I2SDriver *i2s) void i2sCallback(I2SDriver *i2s)
{ {
// Note: samples come in as 16-bit big-endian, so for simplicity we just palSetPad(GPIOB, 7);
// take the "high" 16-bits of valid data and drop the rest. Mic is
// technically 18-bit, so we are losing some precision.
const auto halfsize = i2sBuffer.size() / 2; const auto halfsize = i2sBuffer.size() / 2;
const auto offset = i2sIsBufferComplete(i2s) ? halfsize : 0; const auto offset = i2sIsBufferComplete(i2s) ? halfsize : 0;
auto samples = reinterpret_cast<sos_t *>(i2sBuffer.data() + offset); auto samples = reinterpret_cast<sos_t *>(i2sBuffer.data() + offset);
std::ranges::copy( std::ranges::copy(
std::views::counted(i2sBuffer.begin() + offset, halfsize) std::views::counted(i2sBuffer.begin() + offset, halfsize / I2S_STRIDE)
| std::ranges::views::stride(2 * I2S_STRIDE) | std::ranges::views::stride(2)
| std::views::transform([](auto s) { return sos_t((int16_t)s); }), | std::views::transform([](uint32_t s) { return sos_t(fixsample(s)); }),
samples); samples);
auto samps = std::views::counted(samples, halfsize / (2 * I2S_STRIDE)); auto samps = std::views::counted(samples, halfsize / (2 * I2S_STRIDE));
@ -117,8 +121,9 @@ void i2sCallback(I2SDriver *i2s)
Leq_samples += samps.size(); Leq_samples += samps.size();
// Wakeup main thread for dB calculation every second // Wakeup main thread for dB calculation every second
if (Leq_samples >= 2 * SAMPLE_RATE / I2S_STRIDE) { if (Leq_samples >= SAMPLE_RATE / I2S_STRIDE) {
chSemSignalI(&i2sReady); chSemSignalI(&i2sReady);
} }
palClearPad(GPIOB, 7);
} }

@ -0,0 +1,339 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
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 2 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, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

@ -0,0 +1,4 @@
The Qfplib libraries are open source, licensed under version 2 of the
GNU GPL. A copy of that licence is included in this archive.
Visit http://www.quinapalus.com/qfplib.html for more information.

@ -0,0 +1,97 @@
#ifndef __QFPLIB_M0_FULL_H__
#define __QFPLIB_M0_FULL_H__
/*
Copyright 2019-2024 Mark Owen
http://www.quinapalus.com
E-mail: qfp@quinapalus.com
This file is free software: you can redistribute it and/or modify
it under the terms of version 2 of the GNU General Public License
as published by the Free Software Foundation.
This file 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 file. If not, see <http://www.gnu.org/licenses/> or
write to the Free Software Foundation, Inc., 51 Franklin Street,
Fifth Floor, Boston, MA 02110-1301, USA.
*/
typedef unsigned int ui32;
typedef int i32;
typedef unsigned long long int ui64;
typedef long long int i64;
extern float qfp_fadd (float x,float y);
extern float qfp_fsub (float x,float y);
extern float qfp_fmul (float x,float y);
extern float qfp_fdiv (float x,float y);
extern int qfp_fcmp (float x,float y);
extern float qfp_fsqrt (float x);
extern i32 qfp_float2int (float x);
extern i32 qfp_float2fix (float x,int f);
extern ui32 qfp_float2uint (float x);
extern ui32 qfp_float2ufix (float x,int f);
extern float qfp_int2float (i32 x);
extern float qfp_fix2float (i32 x,int f);
extern float qfp_uint2float (ui32 x);
extern float qfp_ufix2float (ui32 x,int f);
extern float qfp_int642float (i64 x);
extern float qfp_fix642float (i64 x,int f);
extern float qfp_uint642float (ui64 x);
extern float qfp_ufix642float (ui64 x,int f);
extern float qfp_fcos (float x);
extern float qfp_fsin (float x);
extern float qfp_ftan (float x);
extern float qfp_fatan2 (float y,float x);
extern float qfp_fexp (float x);
extern float qfp_fln (float x);
extern double qfp_dadd (double x,double y);
extern double qfp_dsub (double x,double y);
extern double qfp_dmul (double x,double y);
extern double qfp_ddiv (double x,double y);
extern double qfp_dsqrt (double x);
extern double qfp_dcos (double x);
extern double qfp_dsin (double x);
extern double qfp_dtan (double x);
extern double qfp_datan2 (double y,double x);
extern double qfp_dexp (double x);
extern double qfp_dln (double x);
extern int qfp_dcmp (double x,double y);
extern i64 qfp_float2int64 (float x);
extern i64 qfp_float2fix64 (float x,int f);
extern ui64 qfp_float2uint64 (float x);
extern ui64 qfp_float2ufix64 (float x,int f);
extern i32 qfp_float2int_z (float x);
extern i64 qfp_float2int64_z (float x);
extern i32 qfp_double2int (double x);
extern i32 qfp_double2fix (double x,int f);
extern ui32 qfp_double2uint (double x);
extern ui32 qfp_double2ufix (double x,int f);
extern i64 qfp_double2int64 (double x);
extern i64 qfp_double2fix64 (double x,int f);
extern ui64 qfp_double2uint64 (double x);
extern ui64 qfp_double2ufix64 (double x,int f);
extern i32 qfp_double2int_z (double x);
extern i64 qfp_double2int64_z(double x);
extern double qfp_int2double (i32 x);
extern double qfp_fix2double (i32 x,int f);
extern double qfp_uint2double (ui32 x);
extern double qfp_ufix2double (ui32 x,int f);
extern double qfp_int642double (i64 x);
extern double qfp_fix642double (i64 x,int f);
extern double qfp_uint642double (ui64 x);
extern double qfp_ufix642double (ui64 x,int f);
extern float qfp_double2float (double x);
extern double qfp_float2double (float x);
#endif

File diff suppressed because it is too large Load Diff

@ -26,11 +26,50 @@
#include <ranges> #include <ranges>
#include <utility> #include <utility>
#include <cmath> extern "C" {
namespace fpm = std; #include <qfplib-m0-full.h>
using sos_t = float; }
//#include <fpm/math.hpp>
//using sos_t = fpm::fixed_16_16; float qfp_fpow(float b, float e)
{
return qfp_fexp(e * qfp_fln(b));
}
float qfp_flog10(float x)
{
return qfp_fln(x) / qfp_fln(10);
}
struct sos_t
{
float v;
constexpr sos_t(float v_ = 0.f): v(v_) {}
sos_t operator+(const sos_t& o) const noexcept {
return qfp_fadd(v, o.v);
}
sos_t operator-(const sos_t& o) const noexcept {
return qfp_fsub(v, o.v);
}
sos_t operator*(const sos_t& o) const noexcept {
return qfp_fmul(v, o.v);
}
sos_t operator/(const sos_t& o) const noexcept {
return qfp_fdiv(v, o.v);
}
sos_t& operator+=(const sos_t& o) noexcept {
return (*this = *this + o);
}
operator float() const noexcept {
return v;
}
};
struct SOS_Coefficients { struct SOS_Coefficients {
sos_t b1; sos_t b1;
@ -60,8 +99,7 @@ struct SOS_IIR_Filter {
std::copy(_sos, _sos + N, sos.begin()); std::copy(_sos, _sos + N, sos.begin());
} }
void filter(auto samples) { void filter(auto samples, std::size_t n = N) {
// Apply all but last Second-Order-Section
for ([[maybe_unused]] auto _ : std::views::zip_transform( for ([[maybe_unused]] auto _ : std::views::zip_transform(
[](auto samps, const auto& coeffs, auto& ww) { [](auto samps, const auto& coeffs, auto& ww) {
// Assumes a0 and b0 coefficients are one (1.0) // Assumes a0 and b0 coefficients are one (1.0)
@ -72,13 +110,25 @@ struct SOS_IIR_Filter {
} }
return 0; return 0;
}, },
std::views::repeat(samples, N), sos, w)) {} std::views::repeat(samples, n), sos, w)) {}
} }
sos_t filter_sum_sqr(auto samples) { sos_t filter_sum_sqr(auto samples) {
filter(samples); const auto& coeffs = sos.back();
return std::ranges::fold_left(samples, sos_t(0), auto& ww = w.back();
[this](auto a, auto b) { return a + b * gain * b * gain; }); sos_t sum_sqr (0.f);
filter(samples, N - 1);
// Assumes a0 and b0 coefficients are one (1.0)
for (auto& s : samples) {
auto f6 = s + coeffs.a1 * ww.w0 + coeffs.a2 * ww.w1;
s = f6 + coeffs.b1 * ww.w0 + coeffs.b2 * ww.w1;
ww.w1 = std::exchange(ww.w0, f6);
sum_sqr += s * gain * s * gain;
}
return sum_sqr;
} }
}; };
@ -90,12 +140,12 @@ struct SOS_IIR_Filter {
// A ~= [1.0, -1.993853, 0.993863] // A ~= [1.0, -1.993853, 0.993863]
// With additional DC blocking component // With additional DC blocking component
SOS_IIR_Filter SPH0645LM4H_B_RB = { SOS_IIR_Filter SPH0645LM4H_B_RB = {
/* gain: */ sos_t(1.00123377961525), /* gain: */ sos_t(1.00123377961525f),
/* sos: */ { // Second-Order Sections {b1, b2, -a1, -a2} /* sos: */ { // Second-Order Sections {b1, b2, -a1, -a2}
{ sos_t(-1.0), sos_t(0.0), { sos_t(-1.0f), sos_t(0.0f),
sos_t(+0.9992), sos_t(0) }, // DC blocker, a1 = -0.9992 sos_t(+0.9992f), sos_t(0.0f) }, // DC blocker, a1 = -0.9992
{ sos_t(-1.988897663539382), sos_t(+0.988928479008099), { sos_t(-1.988897663539382f), sos_t(+0.988928479008099f),
sos_t(+1.993853376183491), sos_t(-0.993862821429572) } } sos_t(+1.993853376183491f), sos_t(-0.993862821429572f) } }
}; };
// //
@ -104,14 +154,14 @@ SOS_IIR_Filter SPH0645LM4H_B_RB = {
// B = [0.169994948147430, 0.280415310498794, -1.120574766348363, 0.131562559965936, 0.974153561246036, -0.282740857326553, -0.152810756202003] // B = [0.169994948147430, 0.280415310498794, -1.120574766348363, 0.131562559965936, 0.974153561246036, -0.282740857326553, -0.152810756202003]
// A = [1.0, -2.12979364760736134, 0.42996125885751674, 1.62132698199721426, -0.96669962900852902, 0.00121015844426781, 0.04400300696788968] // A = [1.0, -2.12979364760736134, 0.42996125885751674, 1.62132698199721426, -0.96669962900852902, 0.00121015844426781, 0.04400300696788968]
SOS_IIR_Filter A_weighting = { SOS_IIR_Filter A_weighting = {
/* gain: */ sos_t(0.169994948147430), /* gain: */ sos_t(0.169994948147430f),
/* sos: */ { // Second-Order Sections {b1, b2, -a1, -a2} /* sos: */ { // Second-Order Sections {b1, b2, -a1, -a2}
{ sos_t(-2.00026996133106), sos_t(+1.00027056142719), { sos_t(-2.00026996133106f), sos_t(+1.00027056142719f),
sos_t(-1.060868438509278), sos_t(-0.163987445885926) }, sos_t(-1.060868438509278f), sos_t(-0.163987445885926f) },
{ sos_t(+4.35912384203144), sos_t(+3.09120265783884), { sos_t(+4.35912384203144f), sos_t(+3.09120265783884f),
sos_t(+1.208419926363593), sos_t(-0.273166998428332) }, sos_t(+1.208419926363593f), sos_t(-0.273166998428332f) },
{ sos_t(-0.70930303489759), sos_t(-0.29071868393580), { sos_t(-0.70930303489759f), sos_t(-0.29071868393580f),
sos_t(+1.982242159753048), sos_t(-0.982298594928989) } } sos_t(+1.982242159753048f), sos_t(-0.982298594928989f) } }
}; };
//// ////

Loading…
Cancel
Save