diff -pruN 1.2.21-5/CHANGELOG 1.2.23-0ubuntu1/CHANGELOG --- 1.2.21-5/CHANGELOG 2025-03-01 12:43:22.992491120 +0000 +++ 1.2.23-0ubuntu1/CHANGELOG 2025-08-26 18:16:40.709450247 +0000 @@ -2,6 +2,64 @@ * RECENT CHANGES ******************************************************************************* +=== 1.2.23 === +* Added experimental support of UI for MacOS using FreeType and Cairo libraries. + Contributed by Marvin Edeler. +* Implemented human-friendly preset management in the plugin's UI. +* VST3 plugin state format changed, not backward-compatible with previous versions + of plugins. Downgrading version may cause plugin state loss. +* Added AHDBSSR (Attack, Hold, Decay, Break, Slope, Sustain, Release) envelope control + over loaded samples in Sampler and Multisampler plugin series. +* Added DC offset control for Clipper and Multiband Clipper plugin series. +* Added frequency linking button to the Phaser plugin series that allows to link minimum + and maximum LFO frequencies and to keep logarithmic frequency range being constant. +* Added support of linear axis for frequency in Spectrum Analyzer plugin series. +* Added frequency inspection mode to the Spectrum Analyzer plugin series activated by + 'Inspect' button or Ctrl + Left Mouse Button on the graph. +* Added support of minimum-phase filter mode for Loudness Compensator plugin series. +* Added 'M/S Link' and 'S/C Link' buttons to LeftRigth and MidSide versions of following plugins: + * Compressor, Dynamics Builder, Expander, Gate; + * Multiband plugins: Compressor, Dynamics Builder, Expander, Gate; + * Equalizers: Parametric Equalizer and Graphic Equalizer; + * Crossover plugin. +* Added audio channel pre-mixing controls for the following plugins: + * Compressor, Dynamics Processor, Expander, Gate and Limiter; + * Multiband plugins: Compressor, Dynamics Processor, Expander, Gate and Limiter; + * GOTT Compressor. +* Extended collection of built-in rooms for Room Builder plugin series by Boris Gotsulenko + aka borT. +* Added exciter-like effect presets for Phaser plugin series contributed by Attila Schler. +* Added possibility to automatically play samples when navigating file list. +* Added command line option for JACK that allows to specify client name. +* Some bugfixes and improvements in VST3 plugin format, now UI works for editorhost + demo application from the Steinberg VST3 SDK. +* Additional optimizations of 3D space mathematics with AVX instruction set. +* Fixed improper AVX-512 optimization for lanczos kernel genration function which could cause + improper resampling of audio files and yield some plugins to not to work properly. +* Fixed bug in frequency split editing for Mid/Side and Left/Right versions of Crossover plugin. +* Fixed bug in Mid/Side conversion of stereo signal on 32-bit and 64-bit ARM processors. + Contributed by Asahi Lina. + +=== 1.2.22 === +* Implemented Phaser plugin series. +* Implemented overlay widgets which allow to hide rarely used controls under + special buttons which trigger them to pop up. +* Added Feedback Drive control for Chorus and Flanger plugin series. +* Significantly reduced quantization noise for Chorus and Flanger plugin series. +* Better support of widgets activity and coloring in the toolkit library. +* Added pitch knob for pitching files to the Impulse Responses and Impulse Reverb + plugin series. +* Optimized resampling algorithms. +* Added possibility to launch standalone plugins in minimized window state. +* Source code now builds for ARM-based MacOS but without the UI support. +* Fixed problems related to usage of OpenGL under ARM-based devices which do not + support Core OpenGL 3.3 with GLSL 3.3 and above. +* Fixes in OpenGL shaders for support of GLSL 1.80 and several bogus OpenGL + API implementations. +* Fixed broken transport (tempo BPM) synchronization for CLAP plugin format. +* Fixed some command line options that caused JACK version to crash. +* Fixed regression related to creating new global configuration file. + === 1.2.21 === * Implemented default OpenGL rendering engine for the UI for X11-based operating systems. The rendering engine can be switched back to Cairo by setting LSP_WS_LIB_GLXSURFACE=off @@ -37,14 +95,14 @@ * Added shared memory returns to A/B Tester plugin series. * Added tracking of maximum values to the Spectrum Analyzer plugin series. * Several fixes around UI Widgets. -* Added 'Stop' button for file preview in plugins tha allow audio file loading: +* Added 'Stop' button for file preview in plugins that allow audio file loading: * Impulse Responses; * Impulse Reverb; * Room Builder; * Sampler and Multisampler; * Trigger. * Better support of Enter and Escape keys in dialogs. -* Yet more SIMD and AVX-512 optimizations in the DSP libray. +* Yet more SIMD and AVX-512 optimizations in the DSP library. * AVX-512 optimizations are now enabled for AMD Ryzen 7000 processor series and later. * DSP library now supports build for MacOS on Apple M1 and later chips. * Fixed possible file name loss on deactivated plugins for all modern plugin formats. @@ -52,7 +110,7 @@ changing the frequency of filter in Parametric Equalizer plugin series. * Fixed the behaviour of the 'Inspect' button in the VST3 version of Parametric Equalizer plugin series. The fix may cause some regressions in user sessions by enabling the - inpection of the first filter. + inspection of the first filter. * Fixed regression related to he AArch64 version of plugins that freezed the host. === 1.2.19 === @@ -61,7 +119,7 @@ * Fixed window sizing for CLAP plugin format. * Updated CLAP SDK to 1.2.2. * Updated VST3 SDK to 3.7.12, may be breaking changes related to parameter identifiers as - Steinberg has twice reduced the set of valid paremeter identifiers. + Steinberg has twice reduced the set of valid parameter identifiers. * Several fixes in build scripts. === 1.2.18 === @@ -167,7 +225,7 @@ * Fixed Artistic Delay which could generate audio garbage on session startup. * Improved precision of bilinear transform for filters which could blow up signal when using steep-curved filters. -* Fixed jumping UI controls issues caused by variable widths of diffrent parameters. +* Fixed jumping UI controls issues caused by variable widths of different parameters. === 1.2.15 === * Added experimental VST3 plugin format support. @@ -322,7 +380,7 @@ * Fixed memory leakage in the UI (not freed resources on UI close). * Fixed bug in ALR function for Limiter plugin series which could cause random audio scratches. * Fixed gain jumping bug in A/B tester plugin. -* Serveral bugfixes in the core DSP modules provided by the lsp-dsp-units library. +* Several bugfixes in the core DSP modules provided by the lsp-dsp-units library. === 1.2.7 === * Fixed CLAP UI support for Bitwig Studio. @@ -515,7 +573,7 @@ * Fixed latency computation error for FIR and FFT modes of the filter. * Optimize FIR and FFT equalizers to use fastconv_ routines instead of FFT. -* Implemented SPM mode for Parameteric and Graphic Equalizer plugin series. +* Implemented SPM mode for Parametric and Graphic Equalizer plugin series. * Fixed improper VST call handling for several calls. * Several typo fixes in documentation (contributed by Olivier Humbert). * Fixed improper output MIDI event sorting for all plugins. @@ -559,7 +617,7 @@ * Fixed small memory leakage in multiband plugins (Compressor, Gate, Expander) related to usage of Inline Display feature. * Added support of pg:mainInput and pg:mainOutput LV2 properties in TTL files for all plugins. -* Updated all C++ heades and source files to match the LGPL3+ license headers. +* Updated all C++ headers and source files to match the LGPL3+ license headers. === 1.1.24 === @@ -574,7 +632,7 @@ * Added support of loading Hydrogen drumkits by the Multisampler plugin series. * Added 'Squared Cosine' and 'Cubic Hermite Spline' windows to Spectrum Analyzer. * Fixed bug that caused Spectrum Analyzer to ignore window selection. -* Fixed bug in AVX-optimized sidechaining funcion that could cause invalid behaviour of plugins that +* Fixed bug in AVX-optimized sidechaining function that could cause invalid behaviour of plugins that use external/internal sidechain for processing. * Implemented back-buffering of the window surface, all UI controls now don't glitch on edit. * Refactored and simplified LV2 parameter transport between UI and plugin code. @@ -684,7 +742,7 @@ * Added possibility to double-click the parameter's value and enter it manually with keyboard. * Added bookmark support by file opening/saving dialogs. Bookmarks are also automatically imported from GNOME/KDE desktop environments' configuration files. -* Refactored UI of the Parameteric Equalizer plugin series. +* Refactored UI of the Parametric Equalizer plugin series. * Added allpass filters to Parametric Equalizer plugin. * Added knobs that allow to simultaneously shift frequency for all active filters in the Parametric Equalizer plugin series. @@ -711,11 +769,11 @@ * Additionally optimized DSP biquad filters for 32-bit ARM NEON instruction set. * Additional DSP optimizations for AArch64 architecture. * Additional DSP optimizations of code with AVX, AVX2 and FMA3 instruction set for i586 and x86_64 architectures. -* Refactored clipboard mechanism for X11 protocol, addes support of INCR selection transfer protocol. +* Refactored clipboard mechanism for X11 protocol, adds support of INCR selection transfer protocol. * Refactoring of the UI widgets, eliminated old UI code and some deprecated facilities from all widgets. * Implemented basic styling mechanism for UI widgets. * Implemented ipc::Process class that allows to run nested processes with I/O redirection. - Code now prefers vfork() system call agains fork(). + Code now prefers vfork() system call over fork(). * Fixed memory corruption bug in Analyzer core module that could crash the system on non-power-of-two buffer sizes. Affected plugins: Parametric Equalizer, Graphic Equalizer, Spectrum Analyzer, Multiband Compressor. @@ -773,7 +831,7 @@ * Implemented fully compatible with EqualizerAPO software digital filters that are now part of the Parametric Equalizer plugin series. -* Fixed issue that caused VST plugins not to load from cusom user-defined path. +* Fixed issue that caused VST plugins not to load from custom user-defined path. * Some code parts rewritten for better compatibility with WindowsNT platform. * Fixed file listing in the file dialog that caused improper reading of remote directories mounted on the local file system. @@ -918,7 +976,7 @@ * Bitwig Studio DAW is now supported by UI * REAPER native linux version is now supported by UI * Updated JACK plugin wrapper to support new UIs -* Updated VST pluign wrapper to support new UIs +* Updated VST plugin wrapper to support new UIs * Updated LV2 plugin wrapper to support new UIs * Implemented LV2:Instance support feature for optimizing LV2 DSP <-> UI transfers * Official Steinberg VST 2.4 SDK is not required more for building VST plugins @@ -1076,7 +1134,7 @@ * Fixed time drifting between Middle and Side channels in FIR/FFT mode for Graphic Equalizer and Parametric Equalizer. * Fixed and updated metadata of Graphic Equalizer plugin: now filters have individual - pre-defined frequencies, Graphic Equalizer's tranlation is corrected to 'Graphic Equalizer';. + pre-defined frequencies, Graphic Equalizer's translation is corrected to 'Graphic Equalizer';. * Re-worked LSP Parametrischer Equalizer plugin series: added filter mode parameter. * A bit improved support of LinuxVST for Tracktion DAW and other JUCE'd plugins. Great thanks to Nick Dowell, the developer of amsynth. Still, there are problems with UI redraw. @@ -1096,13 +1154,13 @@ * Added Inline Display LV2 extension support provided by Ardour to all LV2 plugin series that use interactive graphic output. * Standalone versions of plugins now draw their state on window icons similarly to Inline Display extension. -* Optmized processing speed of IIR filters, overall acceleration is about 1.5x for filters with low +* Optimized processing speed of IIR filters, overall acceleration is about 1.5x for filters with low number of poles and zeros, about 5x for filters with high amount of poles and zeros. * Optimized equalizer structure by using filter banks. Low-pole filters in equalizer are combined into 4x biquad filter banks. Overall performance improvement is about 4x. * Floating-point calculations are more accurate now for FIR filters. * Added output signal metering to LSP Parametrischer Entzerrer plugin series. -* Moved spectrum analysis into separate core module for making re-usable. +* Moved spectrum analysis into separate core module for making reusable. * Fixed bugs of floating-point number formatting by the 'indicator' widget. * Added possibility to minimize visual space used by plugin by reducing size of rack mount studs in the UI. * Plugin UIs now store global configuration in ~/.config/lsp-plugins/lsp-plugins.cfg file. @@ -1153,7 +1211,7 @@ === 1.0.6 === -* Reorganized source tree. Splitted plugin metadata into separate files and moved from core to the new directory. +* Reorganized source tree. Split plugin metadata into separate files and moved from core to the new directory. * Fixed errors in formulas of noise envelopes for Spektrumanalysator. * Fixed some bugs in DSP SSE module functions caused to possible crash plugins on some conditions. * Implemented audio resampling algorithm for audio files using N-period Lanczos kernel convolution. @@ -1169,7 +1227,7 @@ * Implemented serialization/deserialization of plugin state to plain text files (available in UI when clicking on logo or model acronym). * Optimized the size of XML data (implemented 'ui:for' tag for cycles in XML documents). * Optimized LV2 TTL generator for more compact RDF output, fixed some problems in RDF format. -* Changed the color of 'Bypass' swtich to red. +* Changed the color of 'Bypass' switch to red. * Implemented Klangerzeuger (Sampler) plugin Mono/Stereo series. * Implemented Schlagzeug (Multi-Sampler) plugin x12, x24, x48 Stereo/Direktausgabe (DirectOut) series. diff -pruN 1.2.21-5/README.md 1.2.23-0ubuntu1/README.md --- 1.2.21-5/README.md 2025-03-01 12:43:22.992491120 +0000 +++ 1.2.23-0ubuntu1/README.md 2025-08-26 18:16:40.709450247 +0000 @@ -44,31 +44,31 @@ For more information about licensing, pl Current matrix of hardware architecture and platform (OS) support is: ``` - ┌───────────┬───────────┬─────────┬─────────┐ - │Arch / OS │ GNU/Linux │ FreeBSD │ Windows │ - ╞═══════════╪═══════════╪═════════╪═════════╡ - │aarch64 │ F │ E │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │armv5t │ C │ C │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │armv6-a │ E │ E │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │armv7-ar │ E │ E │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │i586 │ F │ E │ E │ - ├───────────┼───────────┼─────────┼─────────┤ - │loongarch32│ C │ U │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │loongarch64│ C │ U │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │ppc64 │ C │ U │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │riscv-64 │ C │ U │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │s390x │ C │ U │ U │ - ├───────────┼───────────┼─────────┼─────────┤ - │x86_64 │ F │ E │ E │ - └───────────┴───────────┴─────────┴─────────┘ + ┌───────────┬───────────┬─────────┬─────────┬─────────┐ + │Arch / OS │ GNU/Linux │ FreeBSD │ Windows │ macOS | + ╞═══════════╪═══════════╪═════════╪═════════╪═════════╡ + │aarch64 │ F │ E │ U │ E │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │armv5t │ C │ C │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │armv6-a │ E │ E │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │armv7-ar │ E │ E │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │i586 │ F │ F │ E │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │loongarch32│ C │ U │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │loongarch64│ C │ U │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │ppc64 │ C │ U │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │riscv-64 │ C │ U │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │s390x │ C │ U │ U │ N │ + ├───────────┼───────────┼─────────┼─────────┼─────────┤ + │x86_64 │ F │ F │ E │ U │ + └───────────┴───────────┴─────────┴─────────┴─────────┘ ``` The table legend is the following: @@ -237,11 +237,17 @@ The usual directory for VST3 binaries is The usual directory for CLAP binaries is: * C:\Program Files\Common Files\CLAP +## For macOS + +The usual directory for LV2 binaries is: + * /usr/local/lib/lv2 + # BUILDING You may build plugins from scratch. -The build process doesn't differ much for GNU/Linux, FreeBSD or Windows. +The build process doesn't differ much for GNU/Linux, FreeBSD or Windows. +For a build on macOS and FreeBSD you should use `gmake` instead of `make`. Build of JACK standalone versions for Windows is yet not supported. For successful build for Linux/FreeBSD you need the following packages to be installed: @@ -258,15 +264,21 @@ For successful build for Linux/FreeBSD y * gstreamer >= 1.20 (for GStreamer) * gstreamer-plugins-base >= 1.20 (for GStreamer) +For macOS build, the following software needs to be installed: + * make >= 4.4.1 + * cairo >= 1.18.4 + * freetype >= 2.13.3 + * pkgconf >= 2.5.1 + For Windows build, the following software needs to be installed: * MinGW/MinGW-W64 >= 7.0 * Git >= 2.8 (optional) * PHP >= 5.5.14 * GNU Make >= 4.2 - + To perform toolchain setup for Windows, you may perform the following steps: * Download [latest Git](https://git-scm.com/download/win) - * Download [latest MinGW-W64 GCC](from https://sourceforge.net/projects/mingw-w64/files/mingw-w64/) + * Download [latest MinGW-W64 GCC](https://sourceforge.net/projects/mingw-w64/files/mingw-w64/) * Download [latest PHP x64 Thread Safe ZIP package](https://windows.php.net/download/) * Install Git * Unpack PHP ZIP to C:\php @@ -383,6 +395,17 @@ For more build options, issue: make help ``` +Build example for macOS: +``` + brew install make pkgconf cairo freetype + gmake clean + gmake config FEATURES="lv2 ui" + gmake fetch + gmake + sudo gmake install +``` + + # DEBUGGING For debugging and getting crash stack trace with Ardour, please follow these steps: @@ -465,14 +488,19 @@ measuring single-core performance of dif optimizations. To build testing subsystem, issue the following commands: +``` make clean make config TEST=1 make +``` After build, we can launch the test binary by issuing command: +``` .build/host/lsp-plugin-fw/lsp-plugins-test +``` This binary provides simple command-line interface, so here's the full usage: +``` USAGE: {utest|ptest|mtest} [args...] [test name...] First argument: utest Unit testing subsystem @@ -496,23 +524,30 @@ This binary provides simple command-line -s, --silent Do not output additional information from tests -t, --tracepath path Override default trace path with specified value -v, --verbose Output additional information from tests +``` Each test has fully-qualified name separated by dot symbols, tests from different test spaces (utest, ptest, mtest) may have similar fully-qualified names. To obtain a list of all unit tests we can issue: +``` .build/host/lsp-plugin-fw/lsp-plugins-test utest --list +``` And then we can launch all complex number processing unit tests and additionally 'dsp.mix' unit test: +``` .build/host/lsp-plugin-fw/lsp-plugins-test utest dsp.complex.* dsp.pcomplex.* dsp.mix +``` If we don's specify any unit test name in argument, then all available unit tests will be launched. To start debugging of some unit test, you need to pass additional arguments: +``` .build/host/lsp-plugin-fw/lsp-plugins-test/lsp-plugins-test utest --nofork --debug --verbose - +``` + Because unit tests are short-time fully-automated tests, they are parallelized and executed by default by number_of_cores*2 processes. To disable this, we specify option --nofork. Also, unit test execution time is limited by 5 seconds by default, so when @@ -524,7 +559,9 @@ We also can use performance tests to obt Because performance tests in most cases take much time for gathering statistics, the final statistics for each test can be saved in a separate file by specifying --outfile option: +``` .build/host/lsp-plugin-fw/lsp-plugins-test ptest -o performance-test.log +``` Manual tests are mostly designed for developers' purposes. diff -pruN 1.2.21-5/debian/changelog 1.2.23-0ubuntu1/debian/changelog --- 1.2.21-5/debian/changelog 2025-04-30 22:09:57.000000000 +0000 +++ 1.2.23-0ubuntu1/debian/changelog 2025-08-27 00:20:25.000000000 +0000 @@ -1,3 +1,10 @@ +lsp-plugins (1.2.23-0ubuntu1) questing; urgency=medium + + * New upstream release + * Remove patches now in upstream code + + -- Erich Eickmeyer Tue, 26 Aug 2025 17:20:25 -0700 + lsp-plugins (1.2.21-5) unstable; urgency=medium * Use unsupported-architecture as B-D for unsupported architectures, diff -pruN 1.2.21-5/debian/control 1.2.23-0ubuntu1/debian/control --- 1.2.21-5/debian/control 2025-04-30 21:45:16.000000000 +0000 +++ 1.2.23-0ubuntu1/debian/control 2025-08-27 00:20:25.000000000 +0000 @@ -1,7 +1,8 @@ Source: lsp-plugins Section: sound Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Dennis Braun , Build-Depends: diff -pruN 1.2.21-5/debian/patches/1004-Fix_segfault_with_jack_plugins.patch 1.2.23-0ubuntu1/debian/patches/1004-Fix_segfault_with_jack_plugins.patch --- 1.2.21-5/debian/patches/1004-Fix_segfault_with_jack_plugins.patch 2025-04-12 09:04:23.000000000 +0000 +++ 1.2.23-0ubuntu1/debian/patches/1004-Fix_segfault_with_jack_plugins.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -From: Vladimir Sadovnikov -Date: Tue, 1 Apr 2025 00:00:41 +0300 -Subject: [PATCH] Framework improvements - -* Fixed invalid access to missing built-in resources. -* Fixed some command line options that caused JACK version to crash. ---- - .../include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h | 7 ++++--- - modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp | 18 ++++++++---------- - modules/lsp-plugin-fw/src/test/mtest/standalone.cpp | 10 ++++++---- - modules/lsp-plugin-fw/src/wrap/jack.cpp | 16 +++++++--------- - 4 files changed, 25 insertions(+), 26 deletions(-) - -diff --git a/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h b/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h -index 66d1194..bf34861 100644 ---- a/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h -+++ b/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h -@@ -1,6 +1,6 @@ - /* -- * Copyright (C) 2024 Linux Studio Plugins Project -- * (C) 2024 Vladimir Sadovnikov -+ * Copyright (C) 2025 Linux Studio Plugins Project -+ * (C) 2025 Vladimir Sadovnikov - * - * This file is part of lsp-plugin-fw - * Created on: 22 янв. 2021 г. -@@ -438,7 +438,8 @@ int main(int argc, const char **argv) - lsp::IPluginLoop *loop = NULL; - lsp::status_t res = factory(&loop, JACK_PLUGIN_UID, argc, argv); - if (res != lsp::STATUS_OK) -- return -res; -+ return (res == lsp::STATUS_CANCELLED) ? 0 : -res; -+ - lsp_finally { - if (loop != NULL) - delete loop; -diff --git a/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp b/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp -index 62d43e9..1f43fbf 100644 ---- a/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp -+++ b/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp -@@ -1077,6 +1077,14 @@ namespace lsp - if (tmp.fmt_utf8(LSP_BUILTIN_PREFIX "presets/%s", location) < 0) - return STATUS_BAD_STATE; - ssize_t count = pWrapper->resources()->enumerate(&tmp, &resources); -+ if (count < 0) -+ return status_t(-count); -+ lsp_finally { -+ if (resources != NULL) -+ free(resources); -+ }; -+ -+ lsp_trace("resources = %p, count = %d", resources, int(count)); - - // Process all resources and form the final list of preset files - for (ssize_t i=0; itype != resource::RES_FILE) - continue; - if (path.set(item->name) != STATUS_OK) -- { -- free(resources); - return STATUS_NO_MEM; -- } - if (path.get_ext(&tmp) != STATUS_OK) -- { -- free(resources); - return STATUS_BAD_STATE; -- } - - if ((!tmp.equals_ascii("patch")) && (!tmp.equals_ascii("preset"))) - continue; -@@ -1104,13 +1106,9 @@ namespace lsp - strncpy(item->name, path.get(), resource::RESOURCE_NAME_MAX); - item->name[resource::RESOURCE_NAME_MAX-1] = '\0'; - if (!presets->add(item)) -- { -- free(resources); - return STATUS_NO_MEM; -- } - } - -- free(resources); - presets->qsort(compare_presets); - - return STATUS_OK; -diff --git a/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp b/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp -index f5f8ab2..27573c5 100644 ---- a/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp -+++ b/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp -@@ -209,10 +209,12 @@ MTEST_BEGIN("", standalone) - cfg.plugin_id, - cfg.args.size(), - const_cast(cfg.args.array())); -- MTEST_ASSERT_MSG(result == STATUS_OK, "Failed with result=%d", int(result)); -- -- MTEST_ASSERT(loop->run() == STATUS_OK); -- delete loop; -+ if (result != STATUS_CANCELLED) -+ { -+ MTEST_ASSERT_MSG(result == STATUS_OK, "Failed with result=%d", int(result)); -+ MTEST_ASSERT(loop->run() == STATUS_OK); -+ delete loop; -+ } - } - - MTEST_END -diff --git a/modules/lsp-plugin-fw/src/wrap/jack.cpp b/modules/lsp-plugin-fw/src/wrap/jack.cpp -index c3c614e..eff640b 100644 ---- a/modules/lsp-plugin-fw/src/wrap/jack.cpp -+++ b/modules/lsp-plugin-fw/src/wrap/jack.cpp -@@ -621,14 +621,14 @@ namespace lsp - - // Parse command-line arguments - if ((res = parse_cmdline(&sCmdLine, plugin_id, argc, argv)) != STATUS_OK) -- return (res == STATUS_CANCELLED) ? 0 : res; -+ return res; - - // Need just to output version? - if (sCmdLine.version) - { - if ((res = jack::output_version(sCmdLine)) != STATUS_OK) - return -res; -- return 0; -+ return STATUS_CANCELLED; - } - - // Need just to list available plugins? -@@ -636,7 +636,7 @@ namespace lsp - { - if ((res = jack::list_plugins()) != STATUS_OK) - return -res; -- return 0; -+ return STATUS_CANCELLED; - } - - // Plugin identifier has been specified? -@@ -939,13 +939,11 @@ extern "C" - }; - - // Initialize loop -- status_t res = w->init(plugin_id, argc, argv); -- if (res != STATUS_OK) -- return res; -+ status_t res = w->init(plugin_id, argc, argv); -+ if (res == STATUS_OK) -+ *loop = release_ptr(w); // Return loop - -- // Return loop -- *loop = release_ptr(w); -- return STATUS_OK; -+ return res; - } - - #ifdef __cplusplus diff -pruN 1.2.21-5/debian/patches/1005-Fix_i386_build.patch 1.2.23-0ubuntu1/debian/patches/1005-Fix_i386_build.patch --- 1.2.21-5/debian/patches/1005-Fix_i386_build.patch 2025-04-12 09:04:23.000000000 +0000 +++ 1.2.23-0ubuntu1/debian/patches/1005-Fix_i386_build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,249 +0,0 @@ -From: Vladimir Sadovnikov -Date: Sat, 12 Apr 2025 01:01:09 +0300 -Subject: [PATCH] Fixed compilation on modern GCC for x86 - ---- - .../include/lsp-plug.in/common/arch/x86/atomic.h | 132 ++++++++++----------- - 1 file changed, 66 insertions(+), 66 deletions(-) - -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h -index 8f0ec84..58e5e36 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h -@@ -26,14 +26,14 @@ - #error "This file should not be included directly" - #endif /* LSP_PLUG_IN_COMMON_ATOMIC_IMPL */ - --#define ATOMIC_LOAD_DEF(type, ptrtype) \ -+#define ATOMIC_LOAD_DEF(type, ptrtype, reg) \ - inline type atomic_load(ptrtype ptr) \ - { \ - type value; \ - ARCH_X86_ASM \ - ( \ - __ASM_EMIT("mov (%[ptr]), %[value]") \ -- : [value] "=&r"(value) \ -+ : [value] reg (value) \ - : [ptr] "r" (ptr) \ - : \ - ); \ -@@ -42,73 +42,73 @@ - - namespace lsp - { -- ATOMIC_LOAD_DEF(int8_t, int8_t *) -- ATOMIC_LOAD_DEF(int8_t, const int8_t *) -- ATOMIC_LOAD_DEF(uint8_t, uint8_t *) -- ATOMIC_LOAD_DEF(uint8_t, const uint8_t *) -- ATOMIC_LOAD_DEF(int16_t, int16_t *) -- ATOMIC_LOAD_DEF(int16_t, const int16_t *) -- ATOMIC_LOAD_DEF(uint16_t, uint16_t *) -- ATOMIC_LOAD_DEF(uint16_t, const uint16_t *) -- ATOMIC_LOAD_DEF(int32_t, int32_t *) -- ATOMIC_LOAD_DEF(int32_t, const int32_t *) -- ATOMIC_LOAD_DEF(uint32_t, uint32_t *) -- ATOMIC_LOAD_DEF(uint32_t, const uint32_t *) -- ATOMIC_LOAD_DEF(void *, void **) -- ATOMIC_LOAD_DEF(void *, void * const *) -- ATOMIC_LOAD_DEF(const void *, const void **) -- ATOMIC_LOAD_DEF(const void *, const void * const *) -+ ATOMIC_LOAD_DEF(int8_t, int8_t *, "=&q") -+ ATOMIC_LOAD_DEF(int8_t, const int8_t *, "=&q") -+ ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "=&q") -+ ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "=&q") -+ ATOMIC_LOAD_DEF(int16_t, int16_t *, "=&r") -+ ATOMIC_LOAD_DEF(int16_t, const int16_t *, "=&r") -+ ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "=&r") -+ ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "=&r") -+ ATOMIC_LOAD_DEF(int32_t, int32_t *, "=&r") -+ ATOMIC_LOAD_DEF(int32_t, const int32_t *, "=&r") -+ ATOMIC_LOAD_DEF(uint32_t, uint32_t *, "=&r") -+ ATOMIC_LOAD_DEF(uint32_t, const uint32_t *, "=&r") -+ ATOMIC_LOAD_DEF(void *, void **, "=&r") -+ ATOMIC_LOAD_DEF(void *, void * const *, "=&r") -+ ATOMIC_LOAD_DEF(const void *, const void **, "=&r") -+ ATOMIC_LOAD_DEF(const void *, const void * const *, "=&r") - - #ifdef ARCH_X86_64 -- ATOMIC_LOAD_DEF(int64_t, int64_t *) -- ATOMIC_LOAD_DEF(int64_t, const int64_t *) -- ATOMIC_LOAD_DEF(uint64_t, uint64_t *) -- ATOMIC_LOAD_DEF(uint64_t, const uint64_t *) -+ ATOMIC_LOAD_DEF(int64_t, int64_t *, "=&r") -+ ATOMIC_LOAD_DEF(int64_t, const int64_t *, "=&r") -+ ATOMIC_LOAD_DEF(uint64_t, uint64_t *, "=&r") -+ ATOMIC_LOAD_DEF(uint64_t, const uint64_t *, "=&r") - #endif /* ARCH_X86_64 */ - - } /* namespace lsp */ - - #undef ATOMIC_LOAD_DEF - --#define ATOMIC_STORE_DEF(type) \ -+#define ATOMIC_STORE_DEF(type, reg) \ - inline void atomic_store(type *ptr, type value) \ - { \ - ARCH_X86_ASM \ - ( \ - __ASM_EMIT("mov %[value], (%[ptr])") \ - : \ -- : [ptr] "r" (ptr), [value] "r" (value) \ -+ : [ptr] "r" (ptr), [value] reg (value) \ - : "memory" \ - ); \ - } - - namespace lsp - { -- ATOMIC_STORE_DEF(int8_t) -- ATOMIC_STORE_DEF(uint8_t) -- ATOMIC_STORE_DEF(int16_t) -- ATOMIC_STORE_DEF(uint16_t) -- ATOMIC_STORE_DEF(int32_t) -- ATOMIC_STORE_DEF(uint32_t) -- ATOMIC_STORE_DEF(void *) -+ ATOMIC_STORE_DEF(int8_t, "q") -+ ATOMIC_STORE_DEF(uint8_t, "q") -+ ATOMIC_STORE_DEF(int16_t, "r") -+ ATOMIC_STORE_DEF(uint16_t, "r") -+ ATOMIC_STORE_DEF(int32_t, "r") -+ ATOMIC_STORE_DEF(uint32_t, "r") -+ ATOMIC_STORE_DEF(void *, "r") - - #ifdef ARCH_X86_64 -- ATOMIC_STORE_DEF(int64_t) -- ATOMIC_STORE_DEF(uint64_t) -+ ATOMIC_STORE_DEF(int64_t, "r") -+ ATOMIC_STORE_DEF(uint64_t, "r") - #endif /* ARCH_X86_64 */ - - } /* namespace lsp */ - - #undef ATOMIC_STORE_DEF - --#define ATOMIC_XCHG_DEF(type) \ -+#define ATOMIC_XCHG_DEF(type, reg) \ - inline type atomic_swap(type *ptr, type value) \ - { \ - ARCH_X86_ASM \ - ( \ - __ASM_EMIT("lock") \ - __ASM_EMIT("xchg %[value], (%[ptr])") \ -- : [value] "+r"(value) \ -+ : [value] reg (value) \ - : [ptr] "r" (ptr) \ - : "memory", "cc" \ - ); \ -@@ -117,24 +117,24 @@ namespace lsp - - namespace lsp - { -- ATOMIC_XCHG_DEF(int8_t) -- ATOMIC_XCHG_DEF(uint8_t) -- ATOMIC_XCHG_DEF(int16_t) -- ATOMIC_XCHG_DEF(uint16_t) -- ATOMIC_XCHG_DEF(int32_t) -- ATOMIC_XCHG_DEF(uint32_t) -- ATOMIC_XCHG_DEF(void *) -+ ATOMIC_XCHG_DEF(int8_t, "+q") -+ ATOMIC_XCHG_DEF(uint8_t, "+q") -+ ATOMIC_XCHG_DEF(int16_t, "+r") -+ ATOMIC_XCHG_DEF(uint16_t, "+r") -+ ATOMIC_XCHG_DEF(int32_t, "+r") -+ ATOMIC_XCHG_DEF(uint32_t, "+r") -+ ATOMIC_XCHG_DEF(void *, "+r") - - #ifdef ARCH_X86_64 -- ATOMIC_XCHG_DEF(int64_t) -- ATOMIC_XCHG_DEF(uint64_t) -+ ATOMIC_XCHG_DEF(int64_t, "+r") -+ ATOMIC_XCHG_DEF(uint64_t, "+r") - #endif /* ARCH_X86_64 */ - - } /* namespace lsp */ - - #undef ATOMIC_XCHG_DEF - --#define ATOMIC_CAS_DEF(type) \ -+#define ATOMIC_CAS_DEF(type, reg) \ - inline bool atomic_cas(type *ptr, type src, type rep) \ - { \ - bool res; \ -@@ -147,8 +147,8 @@ namespace lsp - __ASM_EMIT("2:") \ - : [res] "=@ccz" (res) \ - : [src] "a" (src), \ -- [ptr] "r" (ptr), \ -- [rep] "r" (rep) \ -+ [ptr] reg (ptr), \ -+ [rep] reg (rep) \ - : "memory", "cc" \ - ); \ - return res; \ -@@ -156,30 +156,30 @@ namespace lsp - - namespace lsp - { -- ATOMIC_CAS_DEF(int8_t) -- ATOMIC_CAS_DEF(uint8_t) -- ATOMIC_CAS_DEF(int16_t) -- ATOMIC_CAS_DEF(uint16_t) -- ATOMIC_CAS_DEF(int32_t) -- ATOMIC_CAS_DEF(uint32_t) -- ATOMIC_CAS_DEF(void *) -+ ATOMIC_CAS_DEF(int8_t, "q") -+ ATOMIC_CAS_DEF(uint8_t, "q") -+ ATOMIC_CAS_DEF(int16_t, "r") -+ ATOMIC_CAS_DEF(uint16_t, "r") -+ ATOMIC_CAS_DEF(int32_t, "r") -+ ATOMIC_CAS_DEF(uint32_t, "r") -+ ATOMIC_CAS_DEF(void *, "r") - - #ifdef ARCH_X86_64 -- ATOMIC_CAS_DEF(int64_t) -- ATOMIC_CAS_DEF(uint64_t) -+ ATOMIC_CAS_DEF(int64_t, "r") -+ ATOMIC_CAS_DEF(uint64_t, "r") - #endif /* ARCH_X86_64 */ - - } /* namespace lsp */ - #undef ATOMIC_CAS_DEF - --#define ATOMIC_ADD_DEF(type) \ -+#define ATOMIC_ADD_DEF(type, reg) \ - inline type atomic_add(type *ptr, type value) \ - { \ - ARCH_X86_ASM \ - ( \ - __ASM_EMIT("lock") \ - __ASM_EMIT("xadd %[src], (%[ptr])") \ -- : [src] "+r" (value) \ -+ : [src] reg (value) \ - : [ptr] "r" (ptr) \ - : "memory", "cc" \ - ); \ -@@ -188,16 +188,16 @@ namespace lsp - - namespace lsp - { -- ATOMIC_ADD_DEF(int8_t) -- ATOMIC_ADD_DEF(uint8_t) -- ATOMIC_ADD_DEF(int16_t) -- ATOMIC_ADD_DEF(uint16_t) -- ATOMIC_ADD_DEF(int32_t) -- ATOMIC_ADD_DEF(uint32_t) -+ ATOMIC_ADD_DEF(int8_t, "+q") -+ ATOMIC_ADD_DEF(uint8_t, "+q") -+ ATOMIC_ADD_DEF(int16_t, "+r") -+ ATOMIC_ADD_DEF(uint16_t, "+r") -+ ATOMIC_ADD_DEF(int32_t, "+r") -+ ATOMIC_ADD_DEF(uint32_t, "+r") - - #ifdef ARCH_X86_64 -- ATOMIC_ADD_DEF(int64_t) -- ATOMIC_ADD_DEF(uint64_t) -+ ATOMIC_ADD_DEF(int64_t, "+r") -+ ATOMIC_ADD_DEF(uint64_t, "+r") - #endif /* ARCH_X86_64 */ - - } /* namespace lsp */ diff -pruN 1.2.21-5/debian/patches/1006-Fix_armel_build.patch 1.2.23-0ubuntu1/debian/patches/1006-Fix_armel_build.patch --- 1.2.21-5/debian/patches/1006-Fix_armel_build.patch 2025-04-12 09:04:23.000000000 +0000 +++ 1.2.23-0ubuntu1/debian/patches/1006-Fix_armel_build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1348 +0,0 @@ -From: Vladimir Sadovnikov -Date: Fri, 11 Apr 2025 22:56:59 +0300 -Subject: [PATCH] Fixes for legacy ARM atomic reads - ---- - .../lsp-plug.in/common/arch/aarch64/atomic.h | 47 ++-- - .../lsp-plug.in/common/arch/arm/atomic-armv6.h | 278 +++++++++++++++++++++ - .../lsp-plug.in/common/arch/arm/atomic-legacy.h | 67 +++-- - .../include/lsp-plug.in/common/arch/arm/atomic.h | 51 ++-- - .../lsp-plug.in/common/arch/generic/atomic.h | 35 ++- - .../include/lsp-plug.in/common/arch/x86/atomic.h | 31 ++- - .../include/lsp-plug.in/common/atomic.h | 53 +++- - .../include/lsp-plug.in/common/bits.h | 45 +++- - .../include/lsp-plug.in/common/types.h | 29 ++- - modules/lsp-common-lib/src/main/atomic.cpp | 2 +- - modules/lsp-common-lib/src/test/utest/atomic.cpp | 95 ++++--- - modules/lsp-common-lib/src/test/utest/bits.cpp | 126 ++++++---- - modules/lsp-common-lib/src/test/utest/types.cpp | 99 ++++++++ - 13 files changed, 801 insertions(+), 157 deletions(-) - create mode 100644 modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h - create mode 100644 modules/lsp-common-lib/src/test/utest/types.cpp - -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h -index 2e6288e..a92f54e 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h -@@ -1,6 +1,6 @@ - /* -- * Copyright (C) 2024 Linux Studio Plugins Project -- * (C) 2024 Vladimir Sadovnikov -+ * Copyright (C) 2025 Linux Studio Plugins Project -+ * (C) 2025 Vladimir Sadovnikov - * - * This file is part of lsp-common-lib - * Created on: 31 мар. 2020 г. -@@ -43,12 +43,12 @@ - - namespace lsp - { -- ATOMIC_LOAD_DEF(int8_t, int8_t *, "sb", "w") -- ATOMIC_LOAD_DEF(int8_t, const int8_t *, "sb", "w") -+ ATOMIC_LOAD_DEF(int8_t, int8_t *, "b", "w") -+ ATOMIC_LOAD_DEF(int8_t, const int8_t *, "b", "w") - ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "b", "w") - ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "b", "w") -- ATOMIC_LOAD_DEF(int16_t, int16_t *, "sh", "w") -- ATOMIC_LOAD_DEF(int16_t, const int16_t *, "sh", "w") -+ ATOMIC_LOAD_DEF(int16_t, int16_t *, "h", "w") -+ ATOMIC_LOAD_DEF(int16_t, const int16_t *, "h", "w") - ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "h", "w") - ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "h", "w") - ATOMIC_LOAD_DEF(int32_t, int32_t *, "", "w") -@@ -81,9 +81,9 @@ namespace lsp - - namespace lsp - { -- ATOMIC_STORE_DEF(int8_t, "sb", "w") -+ ATOMIC_STORE_DEF(int8_t, "b", "w") - ATOMIC_STORE_DEF(uint8_t, "b", "w") -- ATOMIC_STORE_DEF(int16_t, "sh", "w") -+ ATOMIC_STORE_DEF(int16_t, "h", "w") - ATOMIC_STORE_DEF(uint16_t, "h", "w") - ATOMIC_STORE_DEF(int32_t, "", "w") - ATOMIC_STORE_DEF(uint32_t, "", "w") -@@ -216,14 +216,33 @@ namespace lsp - - namespace lsp - { -- template -- inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } -+ template -+ inline void atomic_init(T &lk) -+ { -+ atomic_store( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ ); -+ } - -- template -- inline type_t atomic_trylock(type_t &lk) { return atomic_cas(&lk, LSP_ATOMIC_UNLOCKED, LSP_ATOMIC_LOCKED); } -+ template -+ inline T atomic_trylock(T &lk) -+ { -+ return T(atomic_cas( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)), -+ fixed_int(T(LSP_ATOMIC_LOCKED)) -+ )); -+ } - -- template -- inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } -+ template -+ inline T atomic_unlock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ )); -+ } - } /* namespace lsp */ - - -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h -new file mode 100644 -index 0000000..903b31f ---- /dev/null -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h -@@ -0,0 +1,278 @@ -+/* -+ * Copyright (C) 2025 Linux Studio Plugins Project -+ * (C) 2025 Vladimir Sadovnikov -+ * -+ * This file is part of lsp-common-lib -+ * Created on: 4 мар. 2025 г. -+ * -+ * lsp-common-lib is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * any later version. -+ * -+ * lsp-common-lib 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 Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with lsp-common-lib. If not, see . -+ */ -+ -+#ifndef LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_ARMV6_H_ -+#define LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_ARMV6_H_ -+ -+#ifndef LSP_PLUG_IN_COMMON_ATOMIC_IMPL -+ #error "This file should not be included directly" -+#endif /* LSP_PLUG_IN_COMMON_ATOMIC_IMPL */ -+ -+namespace lsp -+{ -+ extern uint32_t atomic_lock_barrier; -+} /* namespace lsp */ -+ -+#define ATOMIC_LOAD_DEF(type, ptrtype, cmd) \ -+ inline type atomic_load(ptrtype ptr) \ -+ { \ -+ type retval; \ -+ ARCH_ARM_ASM( \ -+ __ASM_EMIT(cmd " %[ret], [%[ptr]]") \ -+ : [ret] "=&r" (retval) \ -+ : [ptr] "r" (ptr) \ -+ : "memory" \ -+ ); \ -+ return retval; \ -+ } -+ -+namespace lsp -+{ -+ ATOMIC_LOAD_DEF(int8_t, int8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(int8_t, const int8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(int16_t, int16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(int16_t, const int16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(int32_t, int32_t *, "ldr") -+ ATOMIC_LOAD_DEF(int32_t, const int32_t *, "ldr") -+ ATOMIC_LOAD_DEF(uint32_t, uint32_t *, "ldr") -+ ATOMIC_LOAD_DEF(uint32_t, const uint32_t *, "ldr") -+ ATOMIC_LOAD_DEF(void *, void **, "ldr") -+ ATOMIC_LOAD_DEF(void *, void * const *, "ldr") -+ ATOMIC_LOAD_DEF(const void *, const void **, "ldr") -+ ATOMIC_LOAD_DEF(const void *, const void * const *, "ldr") -+} /* namespace lsp */ -+ -+#undef ATOMIC_LOAD_DEF -+ -+#define ATOMIC_STORE_DEF(type, cmd) \ -+ inline void atomic_store(type *ptr, type value) \ -+ { \ -+ ARCH_ARM_ASM( \ -+ __ASM_EMIT(cmd " %[value], [%[ptr]]") \ -+ : \ -+ : [ptr] "r" (ptr), [value] "r" (value) \ -+ : "memory" \ -+ ); \ -+ } -+ -+namespace lsp -+{ -+ ATOMIC_STORE_DEF(int8_t, "strb") -+ ATOMIC_STORE_DEF(uint8_t, "strb") -+ ATOMIC_STORE_DEF(int16_t, "strh") -+ ATOMIC_STORE_DEF(uint16_t, "strh") -+ ATOMIC_STORE_DEF(int32_t, "str") -+ ATOMIC_STORE_DEF(uint32_t, "str") -+ ATOMIC_STORE_DEF(void *, "str") -+} /* namespace lsp */ -+ -+#undef ATOMIC_STORE_DEF -+ -+#define ATOMIC_SWAP_DEF(type, qsz) \ -+ inline type atomic_swap(type *ptr, type value) \ -+ { \ -+ type tmp; \ -+ type retval; \ -+ \ -+ ARCH_ARM_ASM \ -+ ( \ -+ __ASM_EMIT("1:") \ -+ __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ -+ __ASM_EMIT("str" qsz " %[tmp], %[src], [%[ptr]]") \ -+ __ASM_EMIT("tst %[tmp], %[tmp]") \ -+ __ASM_EMIT("bne 1b") \ -+ : [tmp] "=&r" (tmp), \ -+ [ret] "=&r" (retval) \ -+ : [ptr] "r" (ptr), \ -+ [src] "r" (value) \ -+ : "memory", "cc" \ -+ ); \ -+ return retval; \ -+ } -+ -+#define ATOMIC_SWAP_DEF2(type) \ -+ inline type atomic_swap(type *ptr, type value) \ -+ { \ -+ while (atomic_swap(&atomic_lock_barrier, uint32_t(1))) /* nothing */ ; \ -+ type retval = *ptr; \ -+ *ptr = value; \ -+ atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ -+ return retval; \ -+ } -+ -+namespace lsp -+{ -+ ATOMIC_SWAP_DEF(int32_t, "ex") -+ ATOMIC_SWAP_DEF(uint32_t, "ex") -+ ATOMIC_SWAP_DEF(void *, "ex") -+ ATOMIC_SWAP_DEF2(int8_t) -+ ATOMIC_SWAP_DEF2(uint8_t) -+ ATOMIC_SWAP_DEF2(int16_t) -+ ATOMIC_SWAP_DEF2(uint16_t) -+} /* namespace lsp */ -+ -+#undef ATOMIC_SWAP_DEF -+#undef ATOMIC_SWAP_DEF2 -+ -+#define ATOMIC_CAS_DEF(type, qsz) \ -+ inline type atomic_cas(type *ptr, type exp, type rep) \ -+ { \ -+ type tmp; \ -+ \ -+ ARCH_ARM_ASM \ -+ ( \ -+ __ASM_EMIT("1:") \ -+ __ASM_EMIT("ldr" qsz " %[tmp], [%[ptr]]") \ -+ __ASM_EMIT("cmp %[tmp], %[exp]") \ -+ __ASM_EMIT("mov %[tmp], #0") \ -+ __ASM_EMIT("bne 2f") \ -+ __ASM_EMIT("str" qsz " %[tmp], %[rep], [%[ptr]]") \ -+ __ASM_EMIT("cmp %[tmp], #0") \ -+ __ASM_EMIT("bne 1b") \ -+ __ASM_EMIT("mov %[tmp], #1") \ -+ __ASM_EMIT("2:") \ -+ : [tmp] "=&r" (tmp) \ -+ : [ptr] "r" (ptr), [exp] "r" (exp), [rep] "r" (rep) \ -+ : "cc", "memory" \ -+ ); \ -+ return tmp; \ -+ } -+ -+#define ATOMIC_CAS_DEF2(type) \ -+ inline bool atomic_cas(type *ptr, type exp, type rep) \ -+ { \ -+ if (!atomic_swap(&atomic_lock_barrier, uint32_t(1))) \ -+ return false; \ -+ if (*ptr == exp) \ -+ { \ -+ *ptr = rep; \ -+ atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ -+ return true; \ -+ } \ -+ \ -+ atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ -+ return false; \ -+ } -+ -+namespace lsp -+{ -+ ATOMIC_CAS_DEF(int32_t, "ex") -+ ATOMIC_CAS_DEF(uint32_t, "ex") -+ ATOMIC_CAS_DEF(void *, "ex") -+ ATOMIC_CAS_DEF2(int8_t) -+ ATOMIC_CAS_DEF2(uint8_t) -+ ATOMIC_CAS_DEF2(int16_t) -+ ATOMIC_CAS_DEF2(uint16_t) -+} /* namespace lsp */ -+ -+#undef ATOMIC_CAS_DEF -+#undef ATOMIC_CAS_DEF2 -+ -+#define ATOMIC_ADD_DEF(type, qsz) \ -+ inline type atomic_add(type *ptr, type value) \ -+ { \ -+ type tmp, sum, retval; \ -+ \ -+ ARCH_ARM_ASM \ -+ ( \ -+ __ASM_EMIT("1:") \ -+ __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ -+ __ASM_EMIT("add %[sum], %[ret], %[src]") \ -+ __ASM_EMIT("str" qsz " %[tmp], %[sum], [%[ptr]]") \ -+ __ASM_EMIT("tst %[tmp], %[tmp]") \ -+ __ASM_EMIT("bne 1b") \ -+ : [tmp] "=&r" (tmp), \ -+ [sum] "=&r" (sum), \ -+ [ret] "=&r" (retval) \ -+ : [ptr] "r" (ptr), \ -+ [src] "r" (value) \ -+ : "memory", "cc" \ -+ ); \ -+ return retval; \ -+ } -+ -+#define ATOMIC_ADD_DEF2(type) \ -+ inline type atomic_add(type *ptr, type value) \ -+ { \ -+ while (atomic_swap(&atomic_lock_barrier, 1)) /* nothing */ ; \ -+ type retval = *ptr; \ -+ *ptr = retval + value; \ -+ atomic_swap(&atomic_lock_barrier, 0); \ -+ return retval; \ -+ } -+ -+namespace lsp -+{ -+ ATOMIC_ADD_DEF(int32_t, "ex") -+ ATOMIC_ADD_DEF(uint32_t, "ex") -+ ATOMIC_ADD_DEF2(int8_t) -+ ATOMIC_ADD_DEF2(uint8_t) -+ ATOMIC_ADD_DEF2(int16_t) -+ ATOMIC_ADD_DEF2(uint16_t) -+} /* namespace lsp */ -+ -+#undef ATOMIC_ADD_DEF -+#undef ATOMIC_ADD_DEF2 -+ -+//----------------------------------------------------------------------------- -+// Atomic operations -+ -+#define LSP_ATOMIC_UNLOCKED 1 -+#define LSP_ATOMIC_LOCKED 0 -+ -+namespace lsp -+{ -+ template -+ inline void atomic_init(T &lk) -+ { -+ atomic_store( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ ); -+ } -+ -+ template -+ inline T atomic_trylock(T &lk) -+ { -+ return T(atomic_cas( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)), -+ fixed_int(T(LSP_ATOMIC_LOCKED)) -+ )); -+ } -+ -+ template -+ inline T atomic_unlock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ )); -+ } -+} /* namespace lsp */ -+ -+ -+ -+#endif /* LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_ARMV6_H_ */ -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h -index cdfd2cd..bb23167 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h -@@ -31,10 +31,10 @@ namespace lsp - extern uint32_t atomic_lock_barrier; - } /* namespace lsp */ - --#define ATOMIC_LOAD_DEF(type, cmd) \ -- inline type atomic_load(type *ptr) \ -+#define ATOMIC_LOAD_DEF(rtype, type, cmd) \ -+ inline rtype atomic_load(type ptr) \ - { \ -- type retval; \ -+ rtype retval; \ - ARCH_ARM_ASM( \ - __ASM_EMIT(cmd " %[ret], [%[ptr]]") \ - : [ret] "=&r" (retval) \ -@@ -46,13 +46,20 @@ namespace lsp - - namespace lsp - { -- ATOMIC_LOAD_DEF(int8_t, "ldrb") -- ATOMIC_LOAD_DEF(uint8_t, "ldrb") -- ATOMIC_LOAD_DEF(int16_t, "ldrh") -- ATOMIC_LOAD_DEF(uint16_t, "ldrh") -- ATOMIC_LOAD_DEF(int32_t, "ldr") -- ATOMIC_LOAD_DEF(uint32_t, "ldr") -- ATOMIC_LOAD_DEF(void *, "ldr") -+ ATOMIC_LOAD_DEF(int8_t, int8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(int8_t, const int8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "ldrb") -+ ATOMIC_LOAD_DEF(int16_t, int16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(int16_t, const int16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "ldrh") -+ ATOMIC_LOAD_DEF(int32_t, int32_t *, "ldr") -+ ATOMIC_LOAD_DEF(int32_t, const int32_t *, "ldr") -+ ATOMIC_LOAD_DEF(uint32_t, uint32_t *, "ldr") -+ ATOMIC_LOAD_DEF(uint32_t, const uint32_t *, "ldr") -+ ATOMIC_LOAD_DEF(void *, const void **, "ldr") -+ ATOMIC_LOAD_DEF(void *, const void * const *, "ldr") - } /* namespace lsp */ - - #undef ATOMIC_LOAD_DEF -@@ -108,10 +115,10 @@ namespace lsp - #define ATOMIC_SWAP_DEF3(type) \ - inline type atomic_swap(type *ptr, type value) \ - { \ -- while (atomic_swap(&atomic_lock_barrier, 1)) /* nothing */ ; \ -+ while (atomic_swap(&atomic_lock_barrier, uint32_t(1))) /* nothing */ ; \ - type retval = *ptr; \ - *ptr = value; \ -- atomic_swap(&atomic_lock_barrier, 0); \ -+ atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ - return retval; \ - } - -@@ -135,16 +142,16 @@ namespace lsp - #define ATOMIC_CAS_DEF(type) \ - inline bool atomic_cas(type *ptr, type exp, type rep) \ - { \ -- if (!atomic_swap(&atomic_lock_barrier, 1)) \ -+ if (!atomic_swap(&atomic_lock_barrier, uint32_t(1))) \ - return false; \ - if (*ptr == exp) \ - { \ - *ptr = rep; \ -- atomic_swap(&atomic_lock_barrier, 0); \ -+ atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ - return true; \ - } \ - \ -- atomic_swap(&atomic_lock_barrier, 0); \ -+ atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ - return false; \ - } - -@@ -191,14 +198,32 @@ namespace lsp - - namespace lsp - { -- template -- inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } -+ template -+ inline void atomic_init(T &lk) -+ { -+ atomic_store( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ ); -+ } - -- template -- inline type_t atomic_trylock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_LOCKED); } -+ template -+ inline T atomic_trylock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_LOCKED)) -+ )); -+ } - -- template -- inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } -+ template -+ inline T atomic_unlock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ )); -+ } - } /* namespace lsp */ - - #endif /* LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_LEGACY_H_ */ -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h -index da702eb..ccdf83c 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h -@@ -31,9 +31,9 @@ - { \ - type retval; \ - ARCH_ARM_ASM( \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - __ASM_EMIT(cmd " %[ret], [%[ptr]]") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - : [ret] "=&r" (retval) \ - : [ptr] "r" (ptr) \ - : "memory" \ -@@ -67,9 +67,9 @@ namespace lsp - inline void atomic_store(type *ptr, type value) \ - { \ - ARCH_ARM_ASM( \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - __ASM_EMIT(cmd " %[value], [%[ptr]]") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - : \ - : [ptr] "r" (ptr), [value] "r" (value) \ - : "memory" \ -@@ -97,7 +97,7 @@ namespace lsp - ARCH_ARM_ASM \ - ( \ - __ASM_EMIT("1:") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - __ASM_EMIT("ldr" qsz " %[tmp], [%[ptr]]") \ - __ASM_EMIT("cmp %[tmp], %[exp]") \ - __ASM_EMIT("mov %[tmp], #0") \ -@@ -107,7 +107,7 @@ namespace lsp - __ASM_EMIT("bne 1b") \ - __ASM_EMIT("mov %[tmp], #1") \ - __ASM_EMIT("2:") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - : [tmp] "=&r" (tmp) \ - : [ptr] "r" (ptr), [exp] "r" (exp), [rep] "r" (rep) \ - : "cc", "memory" \ -@@ -136,13 +136,13 @@ namespace lsp - ARCH_ARM_ASM \ - ( \ - __ASM_EMIT("1:") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ - __ASM_EMIT("add %[sum], %[ret], %[src]") \ - __ASM_EMIT("str" qsz " %[tmp], %[sum], [%[ptr]]") \ - __ASM_EMIT("tst %[tmp], %[tmp]") \ - __ASM_EMIT("bne 1b") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - : [tmp] "=&r" (tmp), \ - [sum] "=&r" (sum), \ - [ret] "=&r" (retval) \ -@@ -174,12 +174,12 @@ namespace lsp - ARCH_ARM_ASM \ - ( \ - __ASM_EMIT("1:") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ - __ASM_EMIT("str" qsz " %[tmp], %[src], [%[ptr]]") \ - __ASM_EMIT("tst %[tmp], %[tmp]") \ - __ASM_EMIT("bne 1b") \ -- IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ -+ __ASM_EMIT("dmb ish") \ - : [tmp] "=&r" (tmp), \ - [ret] "=&r" (retval) \ - : [ptr] "r" (ptr), \ -@@ -210,14 +210,33 @@ namespace lsp - - namespace lsp - { -- template -- inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } -+ template -+ inline void atomic_init(T &lk) -+ { -+ atomic_store( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ ); -+ } - -- template -- inline type_t atomic_trylock(type_t &lk) { return atomic_cas(&lk, LSP_ATOMIC_UNLOCKED, LSP_ATOMIC_LOCKED); } -+ template -+ inline T atomic_trylock(T &lk) -+ { -+ return T(atomic_cas( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)), -+ fixed_int(T(LSP_ATOMIC_LOCKED)) -+ )); -+ } - -- template -- inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } -+ template -+ inline T atomic_unlock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ )); -+ } - } /* namespace lsp */ - - #endif /* LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_H_ */ -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h -index fbf216a..c3e0bce 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h -@@ -146,7 +146,7 @@ namespace lsp - ATOMIC_ADD_DEF(int64_t) - ATOMIC_ADD_DEF(uint64_t) - #endif /* ARCH_64BIT */ --} -+} /* namespace lsp */ - - #undef ATOMIC_ADD_DEF - -@@ -158,14 +158,33 @@ namespace lsp - - namespace lsp - { -- template -- inline void atomic_init(type_t &lk) { atomic_store(&lk, LSP_ATOMIC_UNLOCKED); } -+ template -+ inline void atomic_init(T &lk) -+ { -+ atomic_store( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ ); -+ } - -- template -- inline bool atomic_trylock(type_t &lk) { return atomic_cas(&lk, LSP_ATOMIC_UNLOCKED, LSP_ATOMIC_LOCKED); } -+ template -+ inline bool atomic_trylock(T &lk) -+ { -+ return atomic_cas( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)), -+ fixed_int(T(LSP_ATOMIC_LOCKED)) -+ ); -+ } - -- template -- inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } --} -+ template -+ inline T atomic_unlock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ )); -+ } -+} /* namespace lsp */ - - #endif /* LSP_PLUG_IN_COMMON_ARCH_GENERIC_ATOMIC_H_ */ -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h -index 58e5e36..077e07f 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h -@@ -1,6 +1,6 @@ - /* -- * Copyright (C) 2024 Linux Studio Plugins Project -- * (C) 2024 Vladimir Sadovnikov -+ * Copyright (C) 2025 Linux Studio Plugins Project -+ * (C) 2025 Vladimir Sadovnikov - * - * This file is part of lsp-common-lib - * Created on: 31 мар. 2020 г. -@@ -212,14 +212,29 @@ namespace lsp - - namespace lsp - { -- template -- inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } -+ template -+ inline void atomic_init(T & lk) -+ { -+ lk = LSP_ATOMIC_UNLOCKED; -+ } - -- template -- inline type_t atomic_trylock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_LOCKED); } -+ template -+ inline T atomic_trylock(T & lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_LOCKED)) -+ )); -+ } - -- template -- inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } -+ template -+ inline T atomic_unlock(T &lk) -+ { -+ return T(atomic_swap( -+ fixed_int(&lk), -+ fixed_int(T(LSP_ATOMIC_UNLOCKED)) -+ )); -+ } - - } /* namespace lsp */ - -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h b/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h -index f5dd67c..7282c92 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h -@@ -55,8 +55,10 @@ namespace lsp - #include - #elif defined(ARCH_AARCH64) /* ARM 64-bit implementation */ - #include -- #elif defined(ARCH_ARM7) || defined(ARCH_ARM6) /* ARM 32-bit implementation */ -+ #elif defined(ARCH_ARM7) /* ARM 32-bit implementation */ - #include -+ #elif defined(ARCH_ARM6) /* ARM 32-bit implementation */ -+ #include - #elif defined(ARCH_ARM) /* ARM 32-bit implementation */ - #include - #else /* Generic implementation */ -@@ -78,6 +80,12 @@ namespace lsp - ); - } - -+ template -+ T atomic_swap(T *ptr, T value) -+ { -+ return T(atomic_swap(fixed_int(ptr), fixed_int(value))); -+ } -+ - // Special case for NULL - template - T *atomic_swap(T **ptr, nullptr_t *value) -@@ -90,6 +98,34 @@ namespace lsp - ); - } - -+ template -+ bool atomic_cas(T *dst, T src, T rep) -+ { -+ return atomic_cas(fixed_int(dst), fixed_int(src), fixed_int(rep)); -+ } -+ -+ template -+ bool atomic_cas(T **dst, T *src, T *rep) -+ { -+ return atomic_cas( -+ reinterpret_cast(dst), -+ reinterpret_cast(src), -+ reinterpret_cast(rep) -+ ); -+ } -+ -+ template -+ T atomic_load(T *ptr) -+ { -+ return T(atomic_load(fixed_int(ptr))); -+ } -+ -+ template -+ T atomic_load(const T *ptr) -+ { -+ return T(atomic_load(fixed_int(ptr))); -+ } -+ - template - T *atomic_load(T **ptr) - { -@@ -110,6 +146,12 @@ namespace lsp - ); - } - -+ template -+ void atomic_store(T *ptr, T value) -+ { -+ return atomic_store(fixed_int(ptr), fixed_int(value)); -+ } -+ - template - void atomic_store(T **ptr, T * value) - { -@@ -118,6 +160,15 @@ namespace lsp - reinterpret_cast(value) - ); - } -+ -+ template -+ inline T atomic_add(T *ptr, T value) -+ { -+ return T(atomic_add( -+ fixed_int(ptr), -+ fixed_int(value) -+ )); -+ } - } /* namespace lsp */ - - #endif /* LSP_PLUG_IN_COMMON_ATOMIC_H_ */ -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h b/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h -index 896c68d..37e2f10 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h -@@ -1,6 +1,6 @@ - /* -- * Copyright (C) 2020 Linux Studio Plugins Project -- * (C) 2020 Vladimir Sadovnikov -+ * Copyright (C) 2025 Linux Studio Plugins Project -+ * (C) 2025 Vladimir Sadovnikov - * - * This file is part of lsp-common-lib - * Created on: 1 апр. 2020 г. -@@ -60,6 +60,43 @@ namespace lsp - - namespace lsp - { -+ /** -+ * Compute binary logarithm of the integer value -+ * @param value value to compute binary logarithm -+ * @return computed binary logarithm -+ */ -+ template -+ inline T int_log2(T value) -+ { -+ return T(int_log2(fixed_int(value))); -+ } -+ -+ /** -+ * Reverse bits -+ * @param src source value to reverse bits -+ * @return value with reverse-order of bits -+ */ -+ template -+ inline T reverse_bits(T src) -+ { -+ return T(reverse_bits(fixed_int(src))); -+ } -+ -+ /** -+ * Reverse bits -+ * @param src source value to reverse bits -+ * @param count number of significant bits in the integer value -+ * @return value with reverse-order of significant bits -+ */ -+ template -+ inline T reverse_bits(T src, size_t count) -+ { -+ return T(reverse_bits( -+ fixed_int(src), -+ count -+ )); -+ } -+ - /** - * Round the integer value up to power of 2 - * @tparam T integer value -@@ -67,9 +104,9 @@ namespace lsp - * @return rounded value - */ - template -- T round_pow2(T value) -+ inline T round_pow2(T value) - { -- T rounded = 1 << int_log2(value); -+ T rounded = T(1 << int_log2(fixed_int(value))); - return (rounded == value) ? rounded : rounded << 1; - } - } /* namespace lsp */ -diff --git a/modules/lsp-common-lib/include/lsp-plug.in/common/types.h b/modules/lsp-common-lib/include/lsp-plug.in/common/types.h -index b0f3187..09d8924 100644 ---- a/modules/lsp-common-lib/include/lsp-plug.in/common/types.h -+++ b/modules/lsp-common-lib/include/lsp-plug.in/common/types.h -@@ -1020,6 +1020,7 @@ namespace lsp - template <> struct fixed_int_alias_t<4, false> { typedef uint32_t type; }; - template <> struct fixed_int_alias_t<8, false> { typedef uint64_t type; }; - -+ template <> struct fixed_int_type_t : public fixed_int_alias_t {}; - template <> struct fixed_int_type_t : public fixed_int_alias_t {}; - template <> struct fixed_int_type_t : public fixed_int_alias_t {}; - template <> struct fixed_int_type_t : public fixed_int_alias_t {}; -@@ -1032,7 +1033,7 @@ namespace lsp - template <> struct fixed_int_type_t : public fixed_int_alias_t {}; - - /** -- * Safe size-matching conversion of integral type to one of intN_t/uintN_t types without loosing precision. -+ * Safe size-matching conversion of integral type to one of intN_t/uintN_t types without losing precision. - * This is usual for systems where size_t is defined in some strange way like in MacOS. - * - * @param value value to convert -@@ -1044,6 +1045,32 @@ namespace lsp - return typename fixed_int_type_t::type(value); - } - -+ /** -+ * Safe size-matching conversion of integral type pointer to one of intN_t/uintN_t pointer types without losing precision. -+ * This is usual for systems where size_t is defined in some strange way like in MacOS. -+ * -+ * @param value value to convert -+ * @return converted value -+ */ -+ template -+ constexpr inline typename fixed_int_type_t::type *fixed_int(T *value) -+ { -+ return reinterpret_cast::type *>(value); -+ } -+ -+ /** -+ * Safe size-matching conversion of integral type pointer to one of intN_t/uintN_t pointer types without losing precision. -+ * This is usual for systems where size_t is defined in some strange way like in MacOS. -+ * -+ * @param value value to convert -+ * @return converted value -+ */ -+ template -+ constexpr inline const typename fixed_int_type_t::type * fixed_int(const T *value) -+ { -+ return reinterpret_cast::type *>(value); -+ } -+ - } /* namespace lsp */ - - #endif /* LSP_PLUG_IN_COMMON_TYPES_H_ */ -diff --git a/modules/lsp-common-lib/src/main/atomic.cpp b/modules/lsp-common-lib/src/main/atomic.cpp -index 80be267..0494d13 100644 ---- a/modules/lsp-common-lib/src/main/atomic.cpp -+++ b/modules/lsp-common-lib/src/main/atomic.cpp -@@ -23,7 +23,7 @@ - - namespace lsp - { --#if defined(ARCH_ARM7) || defined(ARCH_ARM6) -+#if defined(ARCH_ARM7) - /* nothing */ - #elif defined(ARCH_ARM) - LSP_COMMON_LIB_PUBLIC -diff --git a/modules/lsp-common-lib/src/test/utest/atomic.cpp b/modules/lsp-common-lib/src/test/utest/atomic.cpp -index 7cfc165..11c668c 100644 ---- a/modules/lsp-common-lib/src/test/utest/atomic.cpp -+++ b/modules/lsp-common-lib/src/test/utest/atomic.cpp -@@ -26,65 +26,104 @@ using namespace lsp; - - UTEST_BEGIN("common", atomic) - -- void test_cas() -+ template -+ void test_cas(const char *type) - { - size_t i; -- atomic_t value; -- atomic_store(&value, 0); -+ T value; -+ atomic_store(&value, T(0)); - -- printf("Testing atomic_cas...\n"); -+ printf("Testing atomic_cas for %s...\n", type); - - for (i=0; i<1000; ++i) -- if (atomic_cas(&value, 0, 1)) -+ if (atomic_cas(&value, T(0), T(1))) - break; - UTEST_ASSERT(i < 1000); - - for (i=0; i<1000; ++i) -- if (atomic_cas(&value, 0, 1)) -+ if (atomic_cas(&value, T(0), T(1))) - break; - UTEST_ASSERT(i >= 1000); - - for (i=0; i<1000; ++i) -- if (atomic_cas(&value, 1, 2)) -+ if (atomic_cas(&value, T(1), T(2))) - break; - UTEST_ASSERT(i < 1000); -- UTEST_ASSERT(atomic_load(&value) == 2); -+ UTEST_ASSERT(atomic_load(&value) == T(2)); - } - -- void test_swap() -+ template -+ void test_swap(const char *type) - { -- atomic_t value1, value2; -- atomic_store(&value1, 0); -- atomic_store(&value2, 1); -- printf("Testing atomic_swap...\n"); -+ T value1, value2; -+ atomic_store(&value1, T(0)); -+ atomic_store(&value2, T(1)); - -- atomic_swap(&value1, 2); -- atomic_swap(&value2, 3); -+ printf("Testing atomic_swap for %s...\n", type); - -- UTEST_ASSERT(atomic_load(&value1) == 2); -- UTEST_ASSERT(atomic_load(&value2) == 3); -+ atomic_swap(&value1, T(2)); -+ atomic_swap(&value2, T(3)); -+ -+ UTEST_ASSERT(atomic_load(&value1) == T(2)); -+ UTEST_ASSERT(atomic_load(&value2) == T(3)); - - atomic_swap(&value1, value2); - -- UTEST_ASSERT(atomic_load(&value1) == 3); -+ UTEST_ASSERT(atomic_load(&value1) == T(3)); - } - -- void test_add() -+ template -+ void test_add(const char *type) - { -- atomic_t value; -- atomic_store(&value, 0); -- printf("Testing atomic_add...\n"); -+ T value; -+ atomic_store(&value, T(0)); -+ printf("Testing atomic_add for %s...\n", type); - -- for (size_t i=0; i<1000; ++i) -- UTEST_ASSERT(atomic_add(&value, 1) == atomic_t(i)); // i == previous value -- UTEST_ASSERT(atomic_load(&value) == 1000); -+ for (size_t i=0; i<0x40; ++i) -+ UTEST_ASSERT(atomic_add(&value, T(1)) == T(i)); // i == previous value -+ UTEST_ASSERT(atomic_load(&value) == T(0x40)); - } - - UTEST_MAIN - { -- test_cas(); -- test_swap(); -- test_add(); -+ test_cas("int8_t"); -+ test_cas("uint8_t"); -+ test_cas("int16_t"); -+ test_cas("uint16_t"); -+ test_cas("int32_t"); -+ test_cas("uint32_t"); -+ #if defined(ARCH_64BIT) -+ test_cas("int64_t"); -+ test_cas("uint64_t"); -+ #endif /* ARCH_64BIT */ -+ test_cas("size_t"); -+ test_cas("ssize_t"); -+ -+ test_swap("int8_t"); -+ test_swap("uint8_t"); -+ test_swap("int16_t"); -+ test_swap("uint16_t"); -+ test_swap("int32_t"); -+ test_swap("uint32_t"); -+ #if defined(ARCH_64BIT) -+ test_swap("int64_t"); -+ test_swap("uint64_t"); -+ #endif /* ARCH_64BIT */ -+ test_swap("size_t"); -+ test_swap("ssize_t"); -+ -+ test_add("int8_t"); -+ test_add("uint8_t"); -+ test_add("int16_t"); -+ test_add("uint16_t"); -+ test_add("int32_t"); -+ test_add("uint32_t"); -+ #if defined(ARCH_64BIT) -+ test_add("int64_t"); -+ test_add("uint64_t"); -+ #endif /* ARCH_64BIT */ -+ test_add("size_t"); -+ test_add("ssize_t"); - } - UTEST_END; - -diff --git a/modules/lsp-common-lib/src/test/utest/bits.cpp b/modules/lsp-common-lib/src/test/utest/bits.cpp -index 777f9e5..cb1d973 100644 ---- a/modules/lsp-common-lib/src/test/utest/bits.cpp -+++ b/modules/lsp-common-lib/src/test/utest/bits.cpp -@@ -26,51 +26,63 @@ using namespace lsp; - - UTEST_BEGIN("common", bits) - template -- void test_reverse_bits(const char *label) -+ void test_reverse_bits(const char *label) -+ { -+ printf("Testing reverse_bits for %s...\n", label); -+ const size_t n = sizeof(T) * 8; -+ -+ for (size_t i=0; i -- void test_int_log2(const char *label) -+ for (size_t i=0; i<(n - 4); ++i) - { -- printf("Testing %s...\n", label); -+ T x = T(1) << i; -+ T y = reverse_bits(x, n - 4); -+ T ck = (T(1) << (n - 5 - i)); -+ UTEST_ASSERT_MSG(y == ck, "%s: tier2, i=%d, n=%d, x=0x%08llx, y=0x%08llx, ck=0x%08llx", -+ label, int(i), int(n), -+ (long long)x, -+ (long long)y, -+ (long long)ck); -+ } - -- int log2 = int_log2(T(0)); -- UTEST_ASSERT_MSG(log2 == 0, "%s: zero input detected as %d", label, log2); -+ for (size_t i=0; i<4; ++i) -+ { -+ T x = T(1) << i; -+ T y = reverse_bits(x, 4); -+ T ck = (T(1) << (3 - i)); -+ UTEST_ASSERT_MSG(y == ck, "%s: tier3, i=%d, n=%d, x=0x%08llx, y=0x%08llx, ck=0x%08llx", -+ label, int(i), int(n), -+ (long long)x, -+ (long long)y, -+ (long long)ck); -+ } -+ } - -- for (int i=0; i -+ void test_int_log2(const char *label) -+ { -+ printf("Testing int_log2 for %s...\n", label); -+ -+ int log2 = int_log2(T(0)); -+ UTEST_ASSERT_MSG(log2 == 0, "%s: zero input detected as %d", label, log2); -+ -+ for (int i=0; i("reverse_bits u8"); -- test_reverse_bits("reverse_bits i8"); -- test_reverse_bits("reverse_bits u16"); -- test_reverse_bits("reverse_bits i16"); -- test_reverse_bits("reverse_bits u32"); -- test_reverse_bits("reverse_bits i32"); -- test_reverse_bits("reverse_bits u64"); -- test_reverse_bits("reverse_bits i64"); -- -- test_int_log2("int_log2 u8"); -- test_int_log2("int_log2 i8"); -- test_int_log2("int_log2 u16"); -- test_int_log2("int_log2 i16"); -- test_int_log2("int_log2 u32"); -- test_int_log2("int_log2 i32"); -- test_int_log2("int_log2 u64"); -- test_int_log2("int_log2 i64"); -+ test_reverse_bits("uint8_t"); -+ test_reverse_bits("int8_t"); -+ test_reverse_bits("uint16_t"); -+ test_reverse_bits("int16_t"); -+ test_reverse_bits("uint32_t"); -+ test_reverse_bits("int32_t"); -+ test_reverse_bits("uint64_t"); -+ test_reverse_bits("int64_t"); -+ test_reverse_bits("size_t"); -+ test_reverse_bits("ssize_t"); -+ -+ test_int_log2("uint8_t"); -+ test_int_log2("int8_t"); -+ test_int_log2("uint16_t"); -+ test_int_log2("int16_t"); -+ test_int_log2("uint32_t"); -+ test_int_log2("int32_t"); -+ test_int_log2("uint64_t"); -+ test_int_log2("int64_t"); -+ test_int_log2("size_t"); -+ test_int_log2("ssize_t"); - - test_pow2_rounding(); - } -diff --git a/modules/lsp-common-lib/src/test/utest/types.cpp b/modules/lsp-common-lib/src/test/utest/types.cpp -new file mode 100644 -index 0000000..9af62ab ---- /dev/null -+++ b/modules/lsp-common-lib/src/test/utest/types.cpp -@@ -0,0 +1,99 @@ -+/* -+ * Copyright (C) 2025 Linux Studio Plugins Project -+ * (C) 2025 Vladimir Sadovnikov -+ * -+ * This file is part of lsp-common-lib -+ * Created on: 3 мар. 2025 г. -+ * -+ * lsp-common-lib is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as published by -+ * the Free Software Foundation, either version 3 of the License, or -+ * any later version. -+ * -+ * lsp-common-lib 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 Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with lsp-common-lib. If not, see . -+ */ -+ -+#include -+#include -+ -+using namespace lsp; -+ -+UTEST_BEGIN("common", types) -+ -+ template -+ void test_cast(type value) -+ { -+ auto casted = lsp::fixed_int(value); -+ UTEST_ASSERT(sizeof(casted) == sizeof(value)); -+ } -+ -+ UTEST_MAIN -+ { -+ char str[8]; -+ const char *cstr = "test"; -+ -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ test_cast(static_cast(42)); -+ -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ test_cast(reinterpret_cast(str)); -+ -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ test_cast(reinterpret_cast(cstr)); -+ } -+ -+UTEST_END; -+ -+ -+ diff -pruN 1.2.21-5/debian/patches/series 1.2.23-0ubuntu1/debian/patches/series --- 1.2.21-5/debian/patches/series 2025-04-14 08:29:04.000000000 +0000 +++ 1.2.23-0ubuntu1/debian/patches/series 2025-08-27 00:20:25.000000000 +0000 @@ -1,4 +1 @@ #1003-HURD.patch -1004-Fix_segfault_with_jack_plugins.patch -1005-Fix_i386_build.patch -#1006-Fix_armel_build.patch diff -pruN 1.2.21-5/dependencies.mk 1.2.23-0ubuntu1/dependencies.mk --- 1.2.21-5/dependencies.mk 2025-03-01 12:43:22.992491120 +0000 +++ 1.2.23-0ubuntu1/dependencies.mk 2025-08-26 18:16:40.709450247 +0000 @@ -114,13 +114,35 @@ ifeq ($(PLATFORM),Windows) endif #------------------------------------------------------------------------------ +# MacOS dependencies +MACOS_DEPENDENCIES = \ + LIBAUDIOTOOLBOX \ + LIBCAIRO \ + LIBCOCOA \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBICONV \ + LIBJACK + +MACOS_TEST_DEPENDENCIES = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES += $(MACOS_DEPENDENCIES) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES) \ $(LINUX_DEPENDENCIES) \ $(BSD_DEPENDENCIES) \ $(WINDOWS_DEPENDENCIES) \ + $(MACOS_DEPENDENCIES) \ $(TEST_DEPENDENCIES) \ $(LINUX_TEST_DEPENDENCIES) \ $(BSD_TEST_DEPENDENCIES) \ - $(WINDOWS_TEST_DEPENDENCIES) \ No newline at end of file + $(WINDOWS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES) + diff -pruN 1.2.21-5/make/tools.mk 1.2.23-0ubuntu1/make/tools.mk --- 1.2.21-5/make/tools.mk 2025-03-01 12:43:22.988491145 +0000 +++ 1.2.23-0ubuntu1/make/tools.mk 2025-08-26 18:16:40.641450907 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-3rd-party/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-3rd-party/CHANGELOG --- 1.2.21-5/modules/lsp-3rd-party/CHANGELOG 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/CHANGELOG 2025-08-26 18:15:40.906030661 +0000 @@ -2,6 +2,15 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.23 === +* Updated VST3 SDK headers to support version 3.7.14. +* Updated CLAP headers to support version 1.2.6. +* Updated module versions in dependencies. + +=== 1.0.22 === +* Updated build scripts. +* Updated module versions in dependencies. + === 1.0.21 === * Updated module versions in dependencies. diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/all.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/all.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/all.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/all.h 2025-08-26 18:15:40.910030622 +0000 @@ -6,7 +6,11 @@ #include "factory/draft/plugin-state-converter.h" #include "ext/draft/extensible-audio-ports.h" +#include "ext/draft/gain-adjustment-metering.h" +#include "ext/draft/mini-curve-display.h" +#include "ext/draft/project-location.h" #include "ext/draft/resource-directory.h" +#include "ext/draft/scratch-memory.h" #include "ext/draft/transport-control.h" #include "ext/draft/triggers.h" #include "ext/draft/tuning.h" diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/color.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/color.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/color.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/color.h 2025-08-26 18:15:40.910030622 +0000 @@ -13,6 +13,8 @@ typedef struct clap_color { uint8_t blue; } clap_color_t; +static const CLAP_CONSTEXPR clap_color_t CLAP_COLOR_TRANSPARENT = { 0, 0, 0, 0 }; + #ifdef __cplusplus } #endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/events.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/events.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/events.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/events.h 2025-08-26 18:15:40.910030622 +0000 @@ -9,7 +9,12 @@ extern "C" { #endif // event header -// must be the first attribute of the event +// All clap events start with an event header to determine the overall +// size of the event and its type and space (a namespacing for types). +// clap_event objects are contiguous regions of memory which can be copied +// with a memcpy of `size` bytes starting at the top of the header. As +// such, be very careful when designing clap events with internal pointers +// and other non-value-types to consider the lifetime of those members. typedef struct clap_event_header { uint32_t size; // event size including this header, eg: sizeof (clap_event_note) uint32_t time; // sample offset within the buffer for this event @@ -266,6 +271,12 @@ enum clap_transport_flags { CLAP_TRANSPORT_IS_WITHIN_PRE_ROLL = 1 << 7, }; +// clap_event_transport provides song position, tempo, and similar information +// from the host to the plugin. There are two ways a host communicates these values. +// In the `clap_process` structure sent to each processing block, the host may +// provide a transport structure which indicates the available information at the +// start of the block. If the host provides sample-accurate tempo or transport changes, +// it can also provide subsequent inter-block transport updates by delivering a new event. typedef struct clap_event_transport { clap_event_header_t header; @@ -297,11 +308,27 @@ typedef struct clap_event_midi { uint8_t data[3]; } clap_event_midi_t; +// clap_event_midi_sysex contains a pointer to a sysex contents buffer. +// The lifetime of this buffer is (from host->plugin) only the process +// call in which the event is delivered or (from plugin->host) only the +// duration of a try_push call. +// +// Since `clap_output_events.try_push` requires hosts to make a copy of +// an event, host implementers receiving sysex messages from plugins need +// to take care to both copy the event (so header, size, etc...) but +// also memcpy the contents of the sysex pointer to host-owned memory, and +// not just copy the data pointer. +// +// Similarly plugins retaining the sysex outside the lifetime of a single +// process call must copy the sysex buffer to plugin-owned memory. +// +// As a consequence, the data structure pointed to by the sysex buffer +// must be contiguous and copyable with `memcpy` of `size` bytes. typedef struct clap_event_midi_sysex { clap_event_header_t header; uint16_t port_index; - const uint8_t *buffer; // midi buffer + const uint8_t *buffer; // midi buffer. See lifetime comment above. uint32_t size; } clap_event_midi_sysex_t; diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/ambisonic.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/ambisonic.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/ambisonic.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/ambisonic.h 2025-08-26 18:15:40.910030622 +0000 @@ -43,9 +43,6 @@ typedef struct clap_plugin_ambisonic { const clap_ambisonic_config_t *config); // Returns true on success - // - // config_id: the configuration id, see clap_plugin_audio_ports_config. - // If config_id is CLAP_INVALID_ID, then this function queries the current port info. // [main-thread] bool(CLAP_ABI *get_config)(const clap_plugin_t *plugin, bool is_input, diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/gain-adjustment-metering.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/gain-adjustment-metering.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/gain-adjustment-metering.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/gain-adjustment-metering.h 2025-08-26 18:15:40.910030622 +0000 @@ -0,0 +1,34 @@ +#pragma once + +#include "../../plugin.h" + +// This extension lets the plugin report the current gain adjustment +// (typically, gain reduction) to the host. + +static CLAP_CONSTEXPR const char CLAP_EXT_GAIN_ADJUSTMENT_METERING[] = "clap.gain-adjustment-metering/0"; + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct clap_plugin_gain_adjustment_metering { + // Returns the current gain adjustment in dB. The value is intended + // for informational display, for example in a host meter or tooltip. + // The returned value represents the gain adjustment that the plugin + // applied to the last sample in the most recently processed block. + // + // The returned value is in dB. Zero means the plugin is applying no gain + // reduction, or is not processing. A negative value means the plugin is + // applying gain reduction, as with a compressor or limiter. A positive + // value means the plugin is adding gain, as with an expander. The value + // represents the dynamic gain reduction or expansion applied by the + // plugin, before any make-up gain or other adjustment. A single value is + // returned for all audio channels. + // + // [audio-thread] + double(CLAP_ABI *get)(const clap_plugin_t *plugin); +} clap_plugin_gain_adjustment_metering_t; + +#ifdef __cplusplus +} +#endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/mini-curve-display.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/mini-curve-display.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/mini-curve-display.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/mini-curve-display.h 2025-08-26 18:15:40.910030622 +0000 @@ -0,0 +1,153 @@ +#pragma once + +#include "../../plugin.h" + +// This extension allows a host to render a small curve provided by the plugin. +// A useful application is to render an EQ frequency response in the DAW mixer view. + +static CLAP_CONSTEXPR const char CLAP_EXT_MINI_CURVE_DISPLAY[] = "clap.mini-curve-display/3"; + +#ifdef __cplusplus +extern "C" { +#endif + +enum clap_mini_curve_display_curve_kind { + // If the curve's kind doesn't fit in any proposed kind, use this one + // and perhaps, make a pull request to extend the list. + CLAP_MINI_CURVE_DISPLAY_CURVE_KIND_UNSPECIFIED = 0, + + // The mini curve is intended to draw the total gain response of the plugin. + // In this case the y values are in dB and the x values are in Hz (logarithmic). + // This would be useful in for example an equalizer. + CLAP_MINI_CURVE_DISPLAY_CURVE_KIND_GAIN_RESPONSE = 1, + + // The mini curve is intended to draw the total phase response of the plugin. + // In this case the y values are in radians and the x values are in Hz (logarithmic). + // This would be useful in for example an equalizer. + CLAP_MINI_CURVE_DISPLAY_CURVE_KIND_PHASE_RESPONSE = 2, + + // The mini curve is intended to draw the transfer curve of the plugin. + // In this case the both x and y values are in dB. + // This would be useful in for example a compressor or distortion plugin. + CLAP_MINI_CURVE_DISPLAY_CURVE_KIND_TRANSFER_CURVE = 3, + + // This mini curve is intended to draw gain reduction over time. In this case + // x refers to the window in seconds and y refers to level in dB, x_min is + // always 0, and x_max would be the duration of the window. + // This would be useful in for example a compressor or limiter. + CLAP_MINI_CURVE_DISPLAY_CURVE_KIND_GAIN_REDUCTION = 4, + + // This curve is intended as a generic time series plot. In this case + // x refers to the window in seconds. x_min is always 0, and x_max would be the duration of the + // window. + // Y is not specified and up to the plugin. + CLAP_MINI_CURVE_DISPLAY_CURVE_KIND_TIME_SERIES = 5, + + // Note: more entries could be added here in the future +}; + +typedef struct clap_mini_curve_display_curve_hints { + + // Range for the x axis. + double x_min; + double x_max; + + // Range for the y axis. + double y_min; + double y_max; + +} clap_mini_curve_display_curve_hints_t; + +// A set of points representing the curve to be painted. +typedef struct clap_mini_curve_display_curve_data { + // Indicates the kind of curve those values represent, the host can use this + // information to paint the curve using a meaningful color. + int32_t curve_kind; + + // values[0] will be the leftmost value and values[data_size -1] will be the rightmost + // value. + // + // The value 0 and UINT16_MAX won't be painted. + // The value 1 will be at the bottom of the curve and UINT16_MAX - 1 will be at the top. + uint16_t *values; + uint32_t values_count; +} clap_mini_curve_display_curve_data_t; + +typedef struct clap_plugin_mini_curve_display { + // Returns the number of curves the plugin wants to paint. + // Be aware that the space to display those curves will be small, and too much data will make + // the output hard to read. + uint32_t(CLAP_ABI *get_curve_count)(const clap_plugin_t *plugin); + + // Renders the curve into each the curves buffer. + // + // curves is an array, and each entries (up to curves_size) contains pre-allocated + // values buffer that must be filled by the plugin. + // + // The host will "stack" the curves, from the first one to the last one. + // curves[0] is the first curve to be painted. + // curves[n + 1] will be painted over curves[n]. + // + // Returns the number of curves rendered. + // [main-thread] + uint32_t(CLAP_ABI *render)(const clap_plugin_t *plugin, + clap_mini_curve_display_curve_data_t *curves, + uint32_t curves_size); + + // Tells the plugin if the curve is currently observed or not. + // When it isn't observed render() can't be called. + // + // When is_obseverd becomes true, the curve content and axis name are implicitly invalidated. So + // the plugin don't need to call host->changed. + // + // [main-thread] + void(CLAP_ABI *set_observed)(const clap_plugin_t *plugin, bool is_observed); + + // Retrives the axis name. + // x_name and y_name must not to be null. + // Returns true on success, if the name capacity was sufficient. + // [main-thread] + bool(CLAP_ABI *get_axis_name)(const clap_plugin_t *plugin, + uint32_t curve_index, + char *x_name, + char *y_name, + uint32_t name_capacity); +} clap_plugin_mini_curve_display_t; + +enum clap_mini_curve_display_change_flags { + // Informs the host that the curve content changed. + // Can only be called if the curve is observed and is static. + CLAP_MINI_CURVE_DISPLAY_CURVE_CHANGED = 1 << 0, + + // Informs the host that the curve axis name changed. + // Can only be called if the curve is observed. + CLAP_MINI_CURVE_DISPLAY_AXIS_NAME_CHANGED = 1 << 1, +}; + +typedef struct clap_host_mini_curve_display { + // Fills in the given clap_mini_display_curve_hints_t structure and returns + // true if successful. If not, return false. + // [main-thread] + bool(CLAP_ABI *get_hints)(const clap_host_t *host, + uint32_t kind, + clap_mini_curve_display_curve_hints_t *hints); + + // Mark the curve as being static or dynamic. + // The curve is initially considered as static, though the plugin should explicitely + // initialize this state. + // + // When static, the curve changes will be notified by calling host->changed(). + // When dynamic, the curve is constantly changing and the host is expected to + // periodically re-render. + // + // [main-thread] + void(CLAP_ABI *set_dynamic)(const clap_host_t *host, bool is_dynamic); + + // See clap_mini_curve_display_change_flags + // [main-thread] + void(CLAP_ABI *changed)(const clap_host_t *host, uint32_t flags); +} clap_host_mini_curve_display_t; + +#ifdef __cplusplus +} +#endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/project-location.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/project-location.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/project-location.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/project-location.h 2025-08-26 18:15:40.910030622 +0000 @@ -0,0 +1,108 @@ +#pragma once + +#include "../../color.h" +#include "../../plugin.h" +#include "../../string-sizes.h" + +// This extension allows a host to tell the plugin more about its position +// within a project or session. + +static CLAP_CONSTEXPR const char CLAP_EXT_PROJECT_LOCATION[] = "clap.project-location/2"; + +#ifdef __cplusplus +extern "C" { +#endif + +enum clap_project_location_kind { + // Represents a document/project/session. + CLAP_PROJECT_LOCATION_PROJECT = 1, + + // Represents a group of tracks. + // It can contain track groups, tracks, and devices (post processing). + // The first device within a track group has the index of + // the last track or track group within this group + 1. + CLAP_PROJECT_LOCATION_TRACK_GROUP = 2, + + // Represents a single track. + // It contains devices (serial). + CLAP_PROJECT_LOCATION_TRACK = 3, + + // Represents a single device. + // It can contain other nested device chains. + CLAP_PROJECT_LOCATION_DEVICE = 4, + + // Represents a nested device chain (serial). + // Its parent must be a device. + // It contains other devices. + CLAP_PROJECT_LOCATION_NESTED_DEVICE_CHAIN = 5, +}; + +enum clap_project_location_track_kind { + // This track is an instrument track. + CLAP_PROJECT_LOCATION_INSTUMENT_TRACK = 1, + + // This track is an audio track. + CLAP_PROJECT_LOCATION_AUDIO_TRACK = 2, + + // This track is both an instrument and audio track. + CLAP_PROJECT_LOCATION_HYBRID_TRACK = 3, + + // This track is a return track. + CLAP_PROJECT_LOCATION_RETURN_TRACK = 4, + + // This track is a master track. + // Each group have a master track for processing the sum of all its children tracks. + CLAP_PROJECT_LOCATION_MASTER_TRACK = 5, +}; + +enum clap_project_location_flags { + CLAP_PROJECT_LOCATION_HAS_INDEX = 1 << 0, + CLAP_PROJECT_LOCATION_HAS_COLOR = 1 << 1, +}; + +typedef struct clap_project_location_element { + // A bit-mask, see clap_project_location_flags. + uint64_t flags; + + // Kind of the element, must be one of the CLAP_PROJECT_LOCATION_* values. + uint32_t kind; + + // Only relevant if kind is CLAP_PLUGIN_LOCATION_TRACK. + // see enum CLAP_PROJECT_LOCATION_track_kind. + uint32_t track_kind; + + // Index within the parent element. + // Only usable if CLAP_PROJECT_LOCATION_HAS_INDEX is set in flags. + uint32_t index; + + // Internal ID of the element. + // This is not intended for display to the user, + // but rather to give the host a potential quick way for lookups. + char id[CLAP_PATH_SIZE]; + + // User friendly name of the element. + char name[CLAP_NAME_SIZE]; + + // Color for this element. + // Only usable if CLAP_PROJECT_LOCATION_HAS_COLOR is set in flags. + clap_color_t color; +} clap_project_location_element_t; + +typedef struct clap_plugin_project_location { + // Called by the host when the location of the plugin instance changes. + // + // The last item in this array always refers to the device itself, and as + // such is expected to be of kind CLAP_PLUGIN_LOCATION_DEVICE. + // The first item in this array always refers to the project this device is in and must be of + // kind CLAP_PROJECT_LOCATION_PROJECT. The path is expected to be something like: PROJECT > + // TRACK_GROUP+ > TRACK > (DEVICE > NESTED_DEVICE_CHAIN)* > DEVICE + // + // [main-thread] + void(CLAP_ABI *set)(const clap_plugin_t *plugin, + const clap_project_location_element_t *path, + uint32_t num_elements); +} clap_plugin_project_location_t; + +#ifdef __cplusplus +} +#endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/scratch-memory.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/scratch-memory.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/draft/scratch-memory.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/draft/scratch-memory.h 2025-08-26 18:15:40.910030622 +0000 @@ -0,0 +1,90 @@ +#pragma once + +#include "../../plugin.h" + +// This extension lets the plugin request "scratch" memory from the host. +// +// The scratch memory is thread-local, and can be accessed during +// `clap_plugin->process()` and `clap_plugin_thread_pool->exec()`; +// its content is not persistent between callbacks. +// +// The motivation for this extension is to allow the plugin host +// to "share" a single scratch buffer across multiple plugin +// instances. +// +// For example, imagine the host needs to process N plugins +// in sequence, and each plugin requires 10K of scratch memory. +// If each plugin pre-allocates its own scratch memory, then N * 10K +// of memory is being allocated in total. However, if each plugin +// requests 10K of scratch memory from the host, then the host can +// allocate a single 10K scratch buffer, and make it available to all +// plugins. +// +// This optimization may allow for reduced memory usage and improved +// CPU cache usage. + +static CLAP_CONSTEXPR const char CLAP_EXT_SCRATCH_MEMORY[] = "clap.scratch-memory/1"; + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct clap_host_scratch_memory { + // Asks the host to reserve scratch memory. + // + // The plugin may call this method multiple times (for + // example, gradually decreasing the amount of scratch + // being asked for until the host returns true), however, + // the plugin should avoid calling this method un-neccesarily + // since the host implementation may be relatively expensive. + // If the plugin calls `reserve()` multiple times, then the + // last call invalidates all previous calls. + // + // De-activating the plugin releases the scratch memory. + // + // `max_concurrency_hint` is an optional hint which indicates + // the maximum number of threads concurrently accessing the scratch memory. + // Set to 0 if unspecified. + // + // Returns true on success. + // + // [main-thread & being-activated] + bool(CLAP_ABI *reserve)(const clap_host_t *host, + uint32_t scratch_size_bytes, + uint32_t max_concurrency_hint); + + // Returns a pointer to the "thread-local" scratch memory. + // + // If the scratch memory wasn't successfully reserved, returns NULL. + // + // If the plugin crosses `max_concurrency_hint`, then the return value + // is either NULL or a valid scratch memory pointer. + // + // This method may only be called by the plugin from the audio thread, + // (i.e. during the process() or thread_pool.exec() callback), and + // the provided memory is only valid until the plugin returns from + // that callback. The plugin must not hold any references to data + // that lives in the scratch memory after returning from the callback, + // as that data will likely be over-written by another plugin using + // the same scratch memory. + // + // The provided memory is not initialized, and may have been used + // by other plugin instances, so the plugin must correctly initialize + // the memory when using it. + // + // The provided memory is owned by the host, so the plugin must not + // free the memory. + // + // If the plugin wants to share the same scratch memory pointer with + // many threads, it must access the the scratch at the beginning of the + // `process()` callback, cache the returned pointer before calling + // `clap_host_thread_pool->request_exec()` and clear the cached pointer + // before returning from `process()`. + // + // [audio-thread] + void *(CLAP_ABI *access)(const clap_host_t *host); +} clap_host_scratch_memory_t; + +#ifdef __cplusplus +} +#endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/gui.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/gui.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/gui.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/gui.h 2025-08-26 18:15:40.910030622 +0000 @@ -13,6 +13,9 @@ /// Embedding the window gives more control to the host, and feels more integrated. /// Floating window are sometimes the only option due to technical limitations. /// +/// The Embedding protocol is by far the most common, supported by all hosts to date, +/// and a plugin author should support at least that case. +/// /// Showing the GUI works as follow: /// 1. clap_plugin_gui->is_api_supported(), check what can work /// 2. clap_plugin_gui->create(), allocates gui resources @@ -85,7 +88,10 @@ typedef struct clap_gui_resize_hints { bool can_resize_horizontally; bool can_resize_vertically; - // only if can resize horizontally and vertically + // if both horizontal and vertical resize are available, do we preserve the + // aspect ratio, and if so, what is the width x height aspect ratio to preserve. + // These flags are unused if can_resize_horizontally or vertically are false, + // and ratios are unused if preserve is false. bool preserve_aspect_ratio; uint32_t aspect_ratio_width; uint32_t aspect_ratio_height; @@ -94,7 +100,8 @@ typedef struct clap_gui_resize_hints { // Size (width, height) is in pixels; the corresponding windowing system extension is // responsible for defining if it is physical pixels or logical pixels. typedef struct clap_plugin_gui { - // Returns true if the requested gui api is supported + // Returns true if the requested gui api is supported, either in floating (plugin-created) + // or non-floating (embedded) mode. // [main-thread] bool(CLAP_ABI *is_api_supported)(const clap_plugin_t *plugin, const char *api, bool is_floating); diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/params.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/params.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/params.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/params.h 2025-08-26 18:15:40.910030622 +0000 @@ -246,9 +246,9 @@ typedef struct clap_param_info { // '/' will be used as a separator to show a tree-like structure. char module[CLAP_PATH_SIZE]; - double min_value; // Minimum plain value - double max_value; // Maximum plain value - double default_value; // Default plain value + double min_value; // Minimum plain value. Must be finite (`std::isfinite` true) + double max_value; // Maximum plain value. Must be finite + double default_value; // Default plain value. Must be in [min, max] range. } clap_param_info_t; typedef struct clap_plugin_params { diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/surround.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/surround.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/surround.h 2025-03-01 12:42:55.308657293 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/surround.h 2025-08-26 18:15:40.910030622 +0000 @@ -41,20 +41,22 @@ enum { CLAP_SURROUND_FR = 1, // Front Right CLAP_SURROUND_FC = 2, // Front Center CLAP_SURROUND_LFE = 3, // Low Frequency - CLAP_SURROUND_BL = 4, // Back Left - CLAP_SURROUND_BR = 5, // Back Right + CLAP_SURROUND_BL = 4, // Back (Rear) Left + CLAP_SURROUND_BR = 5, // Back (Rear) Right CLAP_SURROUND_FLC = 6, // Front Left of Center CLAP_SURROUND_FRC = 7, // Front Right of Center - CLAP_SURROUND_BC = 8, // Back Center + CLAP_SURROUND_BC = 8, // Back (Rear) Center CLAP_SURROUND_SL = 9, // Side Left CLAP_SURROUND_SR = 10, // Side Right - CLAP_SURROUND_TC = 11, // Top Center - CLAP_SURROUND_TFL = 12, // Front Left Height - CLAP_SURROUND_TFC = 13, // Front Center Height - CLAP_SURROUND_TFR = 14, // Front Right Height - CLAP_SURROUND_TBL = 15, // Rear Left Height - CLAP_SURROUND_TBC = 16, // Rear Center Height - CLAP_SURROUND_TBR = 17, // Rear Right Height + CLAP_SURROUND_TC = 11, // Top (Height) Center + CLAP_SURROUND_TFL = 12, // Top (Height) Front Left + CLAP_SURROUND_TFC = 13, // Top (Height) Front Center + CLAP_SURROUND_TFR = 14, // Top (Height) Front Right + CLAP_SURROUND_TBL = 15, // Top (Height) Back (Rear) Left + CLAP_SURROUND_TBC = 16, // Top (Height) Back (Rear) Center + CLAP_SURROUND_TBR = 17, // Top (Height) Back (Rear) Right + CLAP_SURROUND_TSL = 18, // Top (Height) Side Left + CLAP_SURROUND_TSR = 19, // Top (Height) Side Right }; typedef struct clap_plugin_surround { diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/thread-check.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/thread-check.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/ext/thread-check.h 2025-03-01 12:42:55.312657270 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/ext/thread-check.h 2025-08-26 18:15:40.910030622 +0000 @@ -52,9 +52,7 @@ extern "C" { /// /// Clap also tags some functions as [thread-safe]. Functions tagged as [thread-safe] can be called /// from any thread unless explicitly counter-indicated (for instance [thread-safe, !audio-thread]) -/// and may be called concurrently. Since a [thread-safe] function may be called from the -/// [audio-thread] unless explicitly counter-indicated, it must also meet the realtime constraints -/// as describes above. +/// and may be called concurrently. // This interface is useful to do runtime checks and make // sure that the functions are called on the correct threads. diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/host.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/host.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/host.h 2025-03-01 12:42:55.312657270 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/host.h 2025-08-26 18:15:40.910030622 +0000 @@ -35,6 +35,13 @@ typedef struct clap_host { void(CLAP_ABI *request_process)(const struct clap_host *host); // Request the host to schedule a call to plugin->on_main_thread(plugin) on the main thread. + // This callback should be called as soon as practicable, usually in the host application's next + // available main thread time slice. Typically callbacks occur within 33ms / 30hz. + // Despite this guidance, plugins should not make assumptions about the exactness of timing for + // a main thread callback, but hosts should endeavour to be prompt. For example, in high load + // situations the environment may starve the gui/main thread in favor of audio processing, + // leading to substantially longer latencies for the callback than the indicative times given + // here. // [thread-safe] void(CLAP_ABI *request_callback)(const struct clap_host *host); } clap_host_t; diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/plugin.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/plugin.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/plugin.h 2025-03-01 12:42:55.312657270 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/plugin.h 2025-08-26 18:15:40.910030622 +0000 @@ -61,6 +61,7 @@ typedef struct clap_plugin { // In this call the plugin may allocate memory and prepare everything needed for the process // call. The process's sample rate will be constant and process's frame count will included in // the [min, max] range, which is bounded by [1, INT32_MAX]. + // In this call the plugin may call host-provided methods marked [being-activated]. // Once activated the latency and port configuration must remain constant, until deactivation. // Returns true on success. // [main-thread & !active] diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/clap/version.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/version.h --- 1.2.21-5/modules/lsp-3rd-party/include/clap/version.h 2025-03-01 12:42:55.312657270 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/clap/version.h 2025-08-26 18:15:40.910030622 +0000 @@ -22,7 +22,7 @@ typedef struct clap_version { #define CLAP_VERSION_MAJOR 1 #define CLAP_VERSION_MINOR 2 -#define CLAP_VERSION_REVISION 2 +#define CLAP_VERSION_REVISION 6 #define CLAP_VERSION_INIT \ { (uint32_t)CLAP_VERSION_MAJOR, (uint32_t)CLAP_VERSION_MINOR, (uint32_t)CLAP_VERSION_REVISION } diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/lsp-plug.in/3rdparty/version.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/lsp-plug.in/3rdparty/version.h --- 1.2.21-5/modules/lsp-3rd-party/include/lsp-plug.in/3rdparty/version.h 2025-03-01 12:42:55.312657270 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/lsp-plug.in/3rdparty/version.h 2025-08-26 18:15:40.910030622 +0000 @@ -26,7 +26,7 @@ // Version of headers #define LSP_3RD_PARTY_MAJOR 1 #define LSP_3RD_PARTY_MINOR 0 -#define LSP_3RD_PARTY_MICRO 21 +#define LSP_3RD_PARTY_MICRO 23 #ifdef LSP_COMMON_LIB_BUILTIN #define LSP_3RD_PARTY_EXPORT diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst2.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst2.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst2.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst2.h 2025-08-26 18:15:40.914030583 +0000 @@ -1,5 +1,5 @@ /* - Copyright 2024 Linux Studio Plugins Project + Copyright 2025 Linux Studio Plugins Project Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -101,7 +101,7 @@ #endif /* __GNUC__ */ #if TARGET_API_MAC_CARBON - #ifdef (__LP64__) || (__ppc64__) + #if defined(__LP64__) || defined(__ppc64__) #pragma options align=power #else #pragma options align=mac68k @@ -112,7 +112,7 @@ #elif defined(__GNUC__) #pragma pack(push, 8) #define VSTCALLBACK __cdecl -#elif defined(WIN32) || defined(__FLAT__) || defined CBUILDER +#elif defined(WIN32) || defined(__FLAT__) || defined(CBUILDER) #pragma pack(push) #pragma pack(8) #define VSTCALLBACK __cdecl diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPop.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPop.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPop.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPop.h 2025-08-26 18:15:40.914030583 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 2023, Steinberg Media Technologies GmbH, All Rights Reserved - * Copyright 2023 Linux Studio Plugins Project + * Copyright 2025, Steinberg Media Technologies GmbH, All Rights Reserved + * Copyright 2025 Linux Studio Plugins Project * * 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 @@ -22,4 +22,6 @@ #pragma -a- #elif SMTG_OS_WINDOWS #pragma pack(pop) +#elif SMTG_OS_LINUX + #pragma pack(pop) #endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPush.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPush.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPush.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/AlignPush.h 2025-08-26 18:15:40.914030583 +0000 @@ -1,6 +1,6 @@ /* - * Copyright 2023, Steinberg Media Technologies GmbH, All Rights Reserved - * Copyright 2023 Linux Studio Plugins Project + * Copyright 2025, Steinberg Media Technologies GmbH, All Rights Reserved + * Copyright 2025 Linux Studio Plugins Project * * 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 @@ -37,5 +37,11 @@ #else #pragma pack(8) #endif +#elif SMTG_OS_LINUX + #if SMTG_PLATFORM_64 + #pragma pack(push, 16) + #else + #pragma pack(push, 8) + #endif #endif diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/FUnknown.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/FUnknown.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/FUnknown.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/FUnknown.h 2025-08-26 18:15:40.914030583 +0000 @@ -68,7 +68,13 @@ //------------------------------------------------------------------------ #define FUNKNOWN_CTOR { __funknownRefCount = 1; } -#define FUNKNOWN_DTOR {} + +#if defined(SMTG_FUNKNOWN_DTOR_ASSERT) && SMTG_FUNKNOWN_DTOR_ASSERT + #include + #define FUNKNOWN_DTOR { assert (__funknownRefCount == 0); } +#else + #define FUNKNOWN_DTOR +#endif #define QUERY_INTERFACE(iid, obj, InterfaceIID, InterfaceName) \ if (::Steinberg::FUnknownPrivate::iidEqual (iid, InterfaceIID)) \ diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/Platform.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/Platform.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/Platform.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/Platform.h 2025-08-26 18:15:40.914030583 +0000 @@ -96,13 +96,14 @@ enum #endif #ifdef _MSC_VER - #pragma warning (disable : 4244) //! @brief warning C4244: Conversion from 'type1' to 'type2', possible loss of data. - #pragma warning (disable : 4250) //! @brief warning C4250: Inheritance via dominance is allowed - #pragma warning (disable : 4996) //! @brief warning C4996: deprecated functions + #if !defined (SMTG_DISABLE_DEFAULT_DIAGNOSTICS) + #pragma warning (disable : 4244) //! @brief warning C4244: Conversion from 'type1' to 'type2', possible loss of data. + #pragma warning (disable : 4250) //! @brief warning C4250: Inheritance via dominance is allowed - #pragma warning (3 : 4189) //! @brief warning C4189: local variable is initialized but not referenced - #pragma warning (3 : 4238) //! @brief warning C4238: nonstandard extension used : class rvalue used as lvalue - #endif + #pragma warning (3 : 4189) //! @brief warning C4189: local variable is initialized but not referenced + #pragma warning (3 : 4238) //! @brief warning C4238: nonstandard extension used: class rvalue used as lvalue + #endif + #endif /* _MSC_VER */ #if defined (_WIN64) || defined (_M_ARM64) #define SMTG_PLATFORM_64 1 @@ -121,12 +122,12 @@ enum #define SMTG_CPP17 (__cplusplus >= 201703L || ((_MSC_FULL_VER >= 190024210L) && (_MSVC_LANG >= 201703L))) #define SMTG_CPP20 (__cplusplus >= 202002L) #define SMTG_HAS_NOEXCEPT ((_MSC_FULL_VER >= 190023026L) || (SMTG_INTEL_CXX11_MODE && SMTG_INTEL_COMPILER >= 1300)) - #if ((_MSC_FULL_VER >= 190024210L) || (SMTG_INTEL_CXX11_MODE && SMTG_INTEL_COMPILER >= 1500) || (defined(__MINGW32__) && SMTG_CPP11)) + #if ((_MSC_FULL_VER >= 190024210L) || (SMTG_INTEL_CXX11_MODE && SMTG_INTEL_COMPILER >= 1500) || (defined (__MINGW32__) && SMTG_CPP11)) #define SMTG_HAS_CPP11_CONSTEXPR 1 #else #define SMTG_HAS_CPP11_CONSTEXPR 0 #endif - #if (((_MSC_VER >= 1915L) && (_MSVC_LANG >= 201402L)) || (SMTG_INTEL_CXX11_MODE && SMTG_INTEL_COMPILER > 1700) || (defined(__MINGW32__) && SMTG_CPP14)) + #if (((_MSC_VER >= 1915L) && (_MSVC_LANG >= 201402L)) || (SMTG_INTEL_CXX11_MODE && SMTG_INTEL_COMPILER > 1700) || (defined (__MINGW32__) && SMTG_CPP14)) #define SMTG_HAS_CPP14_CONSTEXPR 1 #else #define SMTG_HAS_CPP14_CONSTEXPR 0 @@ -218,7 +219,7 @@ enum #endif /* __cplusplus */ #else // Definitions for Linux and other POSIX platforms - #if __gnu_linux__ || __linux__ + #if (defined(__gnu_linux__) && __gnu_linux__) || (defined(__linux__) && __linux__) #define SMTG_OS_LINUX 1 #else #define SMTG_OS_LINUX 0 diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/Types.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/Types.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/base/Types.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/base/Types.h 2025-08-26 18:15:40.914030583 +0000 @@ -173,7 +173,7 @@ namespace Steinberg // always inline macros (only when RELEASE is 1) //---------------------------------------------------------------------------- -#if RELEASE +#if defined(RELEASE) && RELEASE #if SMTG_OS_MACOS || SMTG_OS_LINUX || STMG_OS_POSIX || defined(__MINGW32__) #define SMTG_ALWAYS_INLINE __inline__ __attribute__((__always_inline__)) #define SMTG_NEVER_INLINE __attribute__((noinline)) diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/version.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/version.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/version.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/version.h 2025-08-26 18:15:40.918030544 +0000 @@ -22,7 +22,7 @@ // The compatibility version of official VST3 SDK #define VST3_VERSION_MAJOR 3 #define VST3_VERSION_MINOR 7 -#define VST3_VERSION_MICRO 12 +#define VST3_VERSION_MICRO 14 #define VST3_STRINGIFY1(x) #x #define VST3_STRINGIFY(x) VST3_STRINGIFY1(x) diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/vst/IAutomationState.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/vst/IAutomationState.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/vst/IAutomationState.h 2025-03-01 12:42:55.316657247 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/vst/IAutomationState.h 2025-08-26 18:15:40.918030544 +0000 @@ -33,7 +33,7 @@ namespace Steinberg class IAutomationState: public FUnknown { public: - enum AutomationStates + enum AutomationStates : int32 { kNoAutomation = 0, ///< Not Read and not Write kReadState = 1 << 0, ///< Read state diff -pruN 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/vst/Types.h 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/vst/Types.h --- 1.2.21-5/modules/lsp-3rd-party/include/steinberg/vst3/vst/Types.h 2025-03-01 12:42:55.320657221 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/include/steinberg/vst3/vst/Types.h 2025-08-26 18:15:40.922030505 +0000 @@ -43,6 +43,8 @@ namespace Steinberg // Versions History which allows to write such code: // #if VST_VERSION >= VST_3_6_5_VERSION + #define VST_3_7_14_VERSION 0x03070E + #define VST_3_7_13_VERSION 0x03070D #define VST_3_7_12_VERSION 0x03070C #define VST_3_7_11_VERSION 0x03070B #define VST_3_7_10_VERSION 0x03070A @@ -114,6 +116,8 @@ namespace Steinberg // Versions History which allows to write such code: // if constexpr (SDKVersion >= SDKVersion_3_6_5) { ... } + static SMTG_CONSTEXPR const uint32 SDKVersion_3_7_14 = VST_3_7_14_VERSION; + static SMTG_CONSTEXPR const uint32 SDKVersion_3_7_13 = VST_3_7_13_VERSION; static SMTG_CONSTEXPR const uint32 SDKVersion_3_7_12 = VST_3_7_12_VERSION; static SMTG_CONSTEXPR const uint32 SDKVersion_3_7_11 = VST_3_7_11_VERSION; static SMTG_CONSTEXPR const uint32 SDKVersion_3_7_10 = VST_3_7_10_VERSION; diff -pruN 1.2.21-5/modules/lsp-3rd-party/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-3rd-party/make/tools.mk --- 1.2.21-5/modules/lsp-3rd-party/make/tools.mk 2025-03-01 12:42:55.320657221 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/make/tools.mk 2025-08-26 18:15:40.922030505 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-3rd-party/modules.mk 1.2.23-0ubuntu1/modules/lsp-3rd-party/modules.mk --- 1.2.21-5/modules/lsp-3rd-party/modules.mk 2025-03-01 12:42:55.320657221 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/modules.mk 2025-08-26 18:15:40.922030505 +0000 @@ -19,13 +19,13 @@ # # Variables that describe dependencies -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git diff -pruN 1.2.21-5/modules/lsp-3rd-party/project.mk 1.2.23-0ubuntu1/modules/lsp-3rd-party/project.mk --- 1.2.21-5/modules/lsp-3rd-party/project.mk 2025-03-01 12:42:55.320657221 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-3rd-party/project.mk 2025-08-26 18:15:40.922030505 +0000 @@ -24,4 +24,4 @@ ARTIFACT_NAME = lsp-3rd-pa ARTIFACT_DESC = 3rd party libraries/headers for building audio plugins ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_ALL = 1 -ARTIFACT_VERSION = 1.0.21 +ARTIFACT_VERSION = 1.0.23 diff -pruN 1.2.21-5/modules/lsp-common-lib/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-common-lib/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-common-lib/.github/workflows/build.yml 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/.github/workflows/build.yml 2025-08-26 18:15:40.938030350 +0000 @@ -97,7 +97,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 @@ -119,7 +119,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ libstdc++-devel clang + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale glibc-gconv-modules-extra libstdc++-devel clang - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 CC=clang CXX=clang++ @@ -188,3 +188,26 @@ jobs: - name: Run unit tests shell: msys2 {0} run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test.exe utest --verbose --jobs 1 + + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config TEST=1 STRICT=1 DEBUG=1 ASAN=1 + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 + - name: Run unit tests + run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 + - name: Run unit tests with memcheck + run: | + for test in $(.build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --list --suppress); do \ + echo "***** MEMCHECK $test *****"; \ + .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 --nofork --debug $test; \ + done diff -pruN 1.2.21-5/modules/lsp-common-lib/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-common-lib/CHANGELOG --- 1.2.21-5/modules/lsp-common-lib/CHANGELOG 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/CHANGELOG 2025-08-26 18:15:40.938030350 +0000 @@ -2,6 +2,16 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.43 === +* Better memory safety macros definition. +* Added MacOS CI builds. +* Updated module versions in dependencies. + +=== 1.0.42 === +* Several changes related to bit operations. +* Improved atomic operations. +* Updated module versions in dependencies. + === 1.0.41 === * Added fixed_int function for proper platform-dependent integral type conversion to fixed-size type conversion defined by intN_t and uintN_t types. diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/aarch64/atomic.h 2025-08-26 18:15:40.938030350 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-common-lib * Created on: 31 мар. 2020 г. @@ -43,12 +43,12 @@ namespace lsp { - ATOMIC_LOAD_DEF(int8_t, int8_t *, "sb", "w") - ATOMIC_LOAD_DEF(int8_t, const int8_t *, "sb", "w") + ATOMIC_LOAD_DEF(int8_t, int8_t *, "b", "w") + ATOMIC_LOAD_DEF(int8_t, const int8_t *, "b", "w") ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "b", "w") ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "b", "w") - ATOMIC_LOAD_DEF(int16_t, int16_t *, "sh", "w") - ATOMIC_LOAD_DEF(int16_t, const int16_t *, "sh", "w") + ATOMIC_LOAD_DEF(int16_t, int16_t *, "h", "w") + ATOMIC_LOAD_DEF(int16_t, const int16_t *, "h", "w") ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "h", "w") ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "h", "w") ATOMIC_LOAD_DEF(int32_t, int32_t *, "", "w") @@ -81,9 +81,9 @@ namespace lsp namespace lsp { - ATOMIC_STORE_DEF(int8_t, "sb", "w") + ATOMIC_STORE_DEF(int8_t, "b", "w") ATOMIC_STORE_DEF(uint8_t, "b", "w") - ATOMIC_STORE_DEF(int16_t, "sh", "w") + ATOMIC_STORE_DEF(int16_t, "h", "w") ATOMIC_STORE_DEF(uint16_t, "h", "w") ATOMIC_STORE_DEF(int32_t, "", "w") ATOMIC_STORE_DEF(uint32_t, "", "w") @@ -216,14 +216,33 @@ namespace lsp namespace lsp { - template - inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } + template + inline void atomic_init(T &lk) + { + atomic_store( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + ); + } - template - inline type_t atomic_trylock(type_t &lk) { return atomic_cas(&lk, LSP_ATOMIC_UNLOCKED, LSP_ATOMIC_LOCKED); } + template + inline T atomic_trylock(T &lk) + { + return T(atomic_cas( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)), + fixed_int(T(LSP_ATOMIC_LOCKED)) + )); + } - template - inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } + template + inline T atomic_unlock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + )); + } } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-armv6.h 2025-08-26 18:15:40.938030350 +0000 @@ -0,0 +1,278 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-common-lib + * Created on: 4 мар. 2025 г. + * + * lsp-common-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-common-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-common-lib. If not, see . + */ + +#ifndef LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_ARMV6_H_ +#define LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_ARMV6_H_ + +#ifndef LSP_PLUG_IN_COMMON_ATOMIC_IMPL + #error "This file should not be included directly" +#endif /* LSP_PLUG_IN_COMMON_ATOMIC_IMPL */ + +namespace lsp +{ + extern uint32_t atomic_lock_barrier; +} /* namespace lsp */ + +#define ATOMIC_LOAD_DEF(type, ptrtype, cmd) \ + inline type atomic_load(ptrtype ptr) \ + { \ + type retval; \ + ARCH_ARM_ASM( \ + __ASM_EMIT(cmd " %[ret], [%[ptr]]") \ + : [ret] "=&r" (retval) \ + : [ptr] "r" (ptr) \ + : "memory" \ + ); \ + return retval; \ + } + +namespace lsp +{ + ATOMIC_LOAD_DEF(int8_t, int8_t *, "ldrb") + ATOMIC_LOAD_DEF(int8_t, const int8_t *, "ldrb") + ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "ldrb") + ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "ldrb") + ATOMIC_LOAD_DEF(int16_t, int16_t *, "ldrh") + ATOMIC_LOAD_DEF(int16_t, const int16_t *, "ldrh") + ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "ldrh") + ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "ldrh") + ATOMIC_LOAD_DEF(int32_t, int32_t *, "ldr") + ATOMIC_LOAD_DEF(int32_t, const int32_t *, "ldr") + ATOMIC_LOAD_DEF(uint32_t, uint32_t *, "ldr") + ATOMIC_LOAD_DEF(uint32_t, const uint32_t *, "ldr") + ATOMIC_LOAD_DEF(void *, void **, "ldr") + ATOMIC_LOAD_DEF(void *, void * const *, "ldr") + ATOMIC_LOAD_DEF(const void *, const void **, "ldr") + ATOMIC_LOAD_DEF(const void *, const void * const *, "ldr") +} /* namespace lsp */ + +#undef ATOMIC_LOAD_DEF + +#define ATOMIC_STORE_DEF(type, cmd) \ + inline void atomic_store(type *ptr, type value) \ + { \ + ARCH_ARM_ASM( \ + __ASM_EMIT(cmd " %[value], [%[ptr]]") \ + : \ + : [ptr] "r" (ptr), [value] "r" (value) \ + : "memory" \ + ); \ + } + +namespace lsp +{ + ATOMIC_STORE_DEF(int8_t, "strb") + ATOMIC_STORE_DEF(uint8_t, "strb") + ATOMIC_STORE_DEF(int16_t, "strh") + ATOMIC_STORE_DEF(uint16_t, "strh") + ATOMIC_STORE_DEF(int32_t, "str") + ATOMIC_STORE_DEF(uint32_t, "str") + ATOMIC_STORE_DEF(void *, "str") +} /* namespace lsp */ + +#undef ATOMIC_STORE_DEF + +#define ATOMIC_SWAP_DEF(type, qsz) \ + inline type atomic_swap(type *ptr, type value) \ + { \ + type tmp; \ + type retval; \ + \ + ARCH_ARM_ASM \ + ( \ + __ASM_EMIT("1:") \ + __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ + __ASM_EMIT("str" qsz " %[tmp], %[src], [%[ptr]]") \ + __ASM_EMIT("tst %[tmp], %[tmp]") \ + __ASM_EMIT("bne 1b") \ + : [tmp] "=&r" (tmp), \ + [ret] "=&r" (retval) \ + : [ptr] "r" (ptr), \ + [src] "r" (value) \ + : "memory", "cc" \ + ); \ + return retval; \ + } + +#define ATOMIC_SWAP_DEF2(type) \ + inline type atomic_swap(type *ptr, type value) \ + { \ + while (atomic_swap(&atomic_lock_barrier, uint32_t(1))) /* nothing */ ; \ + type retval = *ptr; \ + *ptr = value; \ + atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ + return retval; \ + } + +namespace lsp +{ + ATOMIC_SWAP_DEF(int32_t, "ex") + ATOMIC_SWAP_DEF(uint32_t, "ex") + ATOMIC_SWAP_DEF(void *, "ex") + ATOMIC_SWAP_DEF2(int8_t) + ATOMIC_SWAP_DEF2(uint8_t) + ATOMIC_SWAP_DEF2(int16_t) + ATOMIC_SWAP_DEF2(uint16_t) +} /* namespace lsp */ + +#undef ATOMIC_SWAP_DEF +#undef ATOMIC_SWAP_DEF2 + +#define ATOMIC_CAS_DEF(type, qsz) \ + inline type atomic_cas(type *ptr, type exp, type rep) \ + { \ + type tmp; \ + \ + ARCH_ARM_ASM \ + ( \ + __ASM_EMIT("1:") \ + __ASM_EMIT("ldr" qsz " %[tmp], [%[ptr]]") \ + __ASM_EMIT("cmp %[tmp], %[exp]") \ + __ASM_EMIT("mov %[tmp], #0") \ + __ASM_EMIT("bne 2f") \ + __ASM_EMIT("str" qsz " %[tmp], %[rep], [%[ptr]]") \ + __ASM_EMIT("cmp %[tmp], #0") \ + __ASM_EMIT("bne 1b") \ + __ASM_EMIT("mov %[tmp], #1") \ + __ASM_EMIT("2:") \ + : [tmp] "=&r" (tmp) \ + : [ptr] "r" (ptr), [exp] "r" (exp), [rep] "r" (rep) \ + : "cc", "memory" \ + ); \ + return tmp; \ + } + +#define ATOMIC_CAS_DEF2(type) \ + inline bool atomic_cas(type *ptr, type exp, type rep) \ + { \ + if (!atomic_swap(&atomic_lock_barrier, uint32_t(1))) \ + return false; \ + if (*ptr == exp) \ + { \ + *ptr = rep; \ + atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ + return true; \ + } \ + \ + atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ + return false; \ + } + +namespace lsp +{ + ATOMIC_CAS_DEF(int32_t, "ex") + ATOMIC_CAS_DEF(uint32_t, "ex") + ATOMIC_CAS_DEF(void *, "ex") + ATOMIC_CAS_DEF2(int8_t) + ATOMIC_CAS_DEF2(uint8_t) + ATOMIC_CAS_DEF2(int16_t) + ATOMIC_CAS_DEF2(uint16_t) +} /* namespace lsp */ + +#undef ATOMIC_CAS_DEF +#undef ATOMIC_CAS_DEF2 + +#define ATOMIC_ADD_DEF(type, qsz) \ + inline type atomic_add(type *ptr, type value) \ + { \ + type tmp, sum, retval; \ + \ + ARCH_ARM_ASM \ + ( \ + __ASM_EMIT("1:") \ + __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ + __ASM_EMIT("add %[sum], %[ret], %[src]") \ + __ASM_EMIT("str" qsz " %[tmp], %[sum], [%[ptr]]") \ + __ASM_EMIT("tst %[tmp], %[tmp]") \ + __ASM_EMIT("bne 1b") \ + : [tmp] "=&r" (tmp), \ + [sum] "=&r" (sum), \ + [ret] "=&r" (retval) \ + : [ptr] "r" (ptr), \ + [src] "r" (value) \ + : "memory", "cc" \ + ); \ + return retval; \ + } + +#define ATOMIC_ADD_DEF2(type) \ + inline type atomic_add(type *ptr, type value) \ + { \ + while (atomic_swap(&atomic_lock_barrier, 1)) /* nothing */ ; \ + type retval = *ptr; \ + *ptr = retval + value; \ + atomic_swap(&atomic_lock_barrier, 0); \ + return retval; \ + } + +namespace lsp +{ + ATOMIC_ADD_DEF(int32_t, "ex") + ATOMIC_ADD_DEF(uint32_t, "ex") + ATOMIC_ADD_DEF2(int8_t) + ATOMIC_ADD_DEF2(uint8_t) + ATOMIC_ADD_DEF2(int16_t) + ATOMIC_ADD_DEF2(uint16_t) +} /* namespace lsp */ + +#undef ATOMIC_ADD_DEF +#undef ATOMIC_ADD_DEF2 + +//----------------------------------------------------------------------------- +// Atomic operations + +#define LSP_ATOMIC_UNLOCKED 1 +#define LSP_ATOMIC_LOCKED 0 + +namespace lsp +{ + template + inline void atomic_init(T &lk) + { + atomic_store( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + ); + } + + template + inline T atomic_trylock(T &lk) + { + return T(atomic_cas( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)), + fixed_int(T(LSP_ATOMIC_LOCKED)) + )); + } + + template + inline T atomic_unlock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + )); + } +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_ARMV6_H_ */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic-legacy.h 2025-08-26 18:15:40.938030350 +0000 @@ -31,10 +31,10 @@ namespace lsp extern uint32_t atomic_lock_barrier; } /* namespace lsp */ -#define ATOMIC_LOAD_DEF(type, cmd) \ - inline type atomic_load(type *ptr) \ +#define ATOMIC_LOAD_DEF(rtype, type, cmd) \ + inline rtype atomic_load(type ptr) \ { \ - type retval; \ + rtype retval; \ ARCH_ARM_ASM( \ __ASM_EMIT(cmd " %[ret], [%[ptr]]") \ : [ret] "=&r" (retval) \ @@ -46,13 +46,20 @@ namespace lsp namespace lsp { - ATOMIC_LOAD_DEF(int8_t, "ldrb") - ATOMIC_LOAD_DEF(uint8_t, "ldrb") - ATOMIC_LOAD_DEF(int16_t, "ldrh") - ATOMIC_LOAD_DEF(uint16_t, "ldrh") - ATOMIC_LOAD_DEF(int32_t, "ldr") - ATOMIC_LOAD_DEF(uint32_t, "ldr") - ATOMIC_LOAD_DEF(void *, "ldr") + ATOMIC_LOAD_DEF(int8_t, int8_t *, "ldrb") + ATOMIC_LOAD_DEF(int8_t, const int8_t *, "ldrb") + ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "ldrb") + ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "ldrb") + ATOMIC_LOAD_DEF(int16_t, int16_t *, "ldrh") + ATOMIC_LOAD_DEF(int16_t, const int16_t *, "ldrh") + ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "ldrh") + ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "ldrh") + ATOMIC_LOAD_DEF(int32_t, int32_t *, "ldr") + ATOMIC_LOAD_DEF(int32_t, const int32_t *, "ldr") + ATOMIC_LOAD_DEF(uint32_t, uint32_t *, "ldr") + ATOMIC_LOAD_DEF(uint32_t, const uint32_t *, "ldr") + ATOMIC_LOAD_DEF(void *, const void **, "ldr") + ATOMIC_LOAD_DEF(void *, const void * const *, "ldr") } /* namespace lsp */ #undef ATOMIC_LOAD_DEF @@ -108,10 +115,10 @@ namespace lsp #define ATOMIC_SWAP_DEF3(type) \ inline type atomic_swap(type *ptr, type value) \ { \ - while (atomic_swap(&atomic_lock_barrier, 1)) /* nothing */ ; \ + while (atomic_swap(&atomic_lock_barrier, uint32_t(1))) /* nothing */ ; \ type retval = *ptr; \ *ptr = value; \ - atomic_swap(&atomic_lock_barrier, 0); \ + atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ return retval; \ } @@ -135,16 +142,16 @@ namespace lsp #define ATOMIC_CAS_DEF(type) \ inline bool atomic_cas(type *ptr, type exp, type rep) \ { \ - if (!atomic_swap(&atomic_lock_barrier, 1)) \ + if (!atomic_swap(&atomic_lock_barrier, uint32_t(1))) \ return false; \ if (*ptr == exp) \ { \ *ptr = rep; \ - atomic_swap(&atomic_lock_barrier, 0); \ + atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ return true; \ } \ \ - atomic_swap(&atomic_lock_barrier, 0); \ + atomic_swap(&atomic_lock_barrier, uint32_t(0)); \ return false; \ } @@ -191,14 +198,32 @@ namespace lsp namespace lsp { - template - inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } - - template - inline type_t atomic_trylock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_LOCKED); } - - template - inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } + template + inline void atomic_init(T &lk) + { + atomic_store( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + ); + } + + template + inline T atomic_trylock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_LOCKED)) + )); + } + + template + inline T atomic_unlock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + )); + } } /* namespace lsp */ #endif /* LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_LEGACY_H_ */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/arm/atomic.h 2025-08-26 18:15:40.938030350 +0000 @@ -31,9 +31,9 @@ { \ type retval; \ ARCH_ARM_ASM( \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ __ASM_EMIT(cmd " %[ret], [%[ptr]]") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ : [ret] "=&r" (retval) \ : [ptr] "r" (ptr) \ : "memory" \ @@ -67,9 +67,9 @@ namespace lsp inline void atomic_store(type *ptr, type value) \ { \ ARCH_ARM_ASM( \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ __ASM_EMIT(cmd " %[value], [%[ptr]]") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ : \ : [ptr] "r" (ptr), [value] "r" (value) \ : "memory" \ @@ -97,7 +97,7 @@ namespace lsp ARCH_ARM_ASM \ ( \ __ASM_EMIT("1:") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ __ASM_EMIT("ldr" qsz " %[tmp], [%[ptr]]") \ __ASM_EMIT("cmp %[tmp], %[exp]") \ __ASM_EMIT("mov %[tmp], #0") \ @@ -107,7 +107,7 @@ namespace lsp __ASM_EMIT("bne 1b") \ __ASM_EMIT("mov %[tmp], #1") \ __ASM_EMIT("2:") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ : [tmp] "=&r" (tmp) \ : [ptr] "r" (ptr), [exp] "r" (exp), [rep] "r" (rep) \ : "cc", "memory" \ @@ -136,13 +136,13 @@ namespace lsp ARCH_ARM_ASM \ ( \ __ASM_EMIT("1:") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ __ASM_EMIT("add %[sum], %[ret], %[src]") \ __ASM_EMIT("str" qsz " %[tmp], %[sum], [%[ptr]]") \ __ASM_EMIT("tst %[tmp], %[tmp]") \ __ASM_EMIT("bne 1b") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ : [tmp] "=&r" (tmp), \ [sum] "=&r" (sum), \ [ret] "=&r" (retval) \ @@ -174,12 +174,12 @@ namespace lsp ARCH_ARM_ASM \ ( \ __ASM_EMIT("1:") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ __ASM_EMIT("ldr" qsz " %[ret], [%[ptr]]") \ __ASM_EMIT("str" qsz " %[tmp], %[src], [%[ptr]]") \ __ASM_EMIT("tst %[tmp], %[tmp]") \ __ASM_EMIT("bne 1b") \ - IF_ARCH_LEAST_ARM7(__ASM_EMIT("dmb ish")) \ + __ASM_EMIT("dmb ish") \ : [tmp] "=&r" (tmp), \ [ret] "=&r" (retval) \ : [ptr] "r" (ptr), \ @@ -210,14 +210,33 @@ namespace lsp namespace lsp { - template - inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } + template + inline void atomic_init(T &lk) + { + atomic_store( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + ); + } - template - inline type_t atomic_trylock(type_t &lk) { return atomic_cas(&lk, LSP_ATOMIC_UNLOCKED, LSP_ATOMIC_LOCKED); } + template + inline T atomic_trylock(T &lk) + { + return T(atomic_cas( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)), + fixed_int(T(LSP_ATOMIC_LOCKED)) + )); + } - template - inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } + template + inline T atomic_unlock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + )); + } } /* namespace lsp */ #endif /* LSP_PLUG_IN_COMMON_ARCH_ARM_ATOMIC_H_ */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/generic/atomic.h 2025-08-26 18:15:40.938030350 +0000 @@ -146,7 +146,7 @@ namespace lsp ATOMIC_ADD_DEF(int64_t) ATOMIC_ADD_DEF(uint64_t) #endif /* ARCH_64BIT */ -} +} /* namespace lsp */ #undef ATOMIC_ADD_DEF @@ -158,14 +158,33 @@ namespace lsp namespace lsp { - template - inline void atomic_init(type_t &lk) { atomic_store(&lk, LSP_ATOMIC_UNLOCKED); } - - template - inline bool atomic_trylock(type_t &lk) { return atomic_cas(&lk, LSP_ATOMIC_UNLOCKED, LSP_ATOMIC_LOCKED); } - - template - inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } -} + template + inline void atomic_init(T &lk) + { + atomic_store( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + ); + } + + template + inline bool atomic_trylock(T &lk) + { + return atomic_cas( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)), + fixed_int(T(LSP_ATOMIC_LOCKED)) + ); + } + + template + inline T atomic_unlock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + )); + } +} /* namespace lsp */ #endif /* LSP_PLUG_IN_COMMON_ARCH_GENERIC_ATOMIC_H_ */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/arch/x86/atomic.h 2025-08-26 18:15:40.938030350 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-common-lib * Created on: 31 мар. 2020 г. @@ -26,14 +26,14 @@ #error "This file should not be included directly" #endif /* LSP_PLUG_IN_COMMON_ATOMIC_IMPL */ -#define ATOMIC_LOAD_DEF(type, ptrtype) \ +#define ATOMIC_LOAD_DEF(type, ptrtype, reg) \ inline type atomic_load(ptrtype ptr) \ { \ type value; \ ARCH_X86_ASM \ ( \ __ASM_EMIT("mov (%[ptr]), %[value]") \ - : [value] "=&r"(value) \ + : [value] reg (value) \ : [ptr] "r" (ptr) \ : \ ); \ @@ -42,73 +42,73 @@ namespace lsp { - ATOMIC_LOAD_DEF(int8_t, int8_t *) - ATOMIC_LOAD_DEF(int8_t, const int8_t *) - ATOMIC_LOAD_DEF(uint8_t, uint8_t *) - ATOMIC_LOAD_DEF(uint8_t, const uint8_t *) - ATOMIC_LOAD_DEF(int16_t, int16_t *) - ATOMIC_LOAD_DEF(int16_t, const int16_t *) - ATOMIC_LOAD_DEF(uint16_t, uint16_t *) - ATOMIC_LOAD_DEF(uint16_t, const uint16_t *) - ATOMIC_LOAD_DEF(int32_t, int32_t *) - ATOMIC_LOAD_DEF(int32_t, const int32_t *) - ATOMIC_LOAD_DEF(uint32_t, uint32_t *) - ATOMIC_LOAD_DEF(uint32_t, const uint32_t *) - ATOMIC_LOAD_DEF(void *, void **) - ATOMIC_LOAD_DEF(void *, void * const *) - ATOMIC_LOAD_DEF(const void *, const void **) - ATOMIC_LOAD_DEF(const void *, const void * const *) + ATOMIC_LOAD_DEF(int8_t, int8_t *, "=&q") + ATOMIC_LOAD_DEF(int8_t, const int8_t *, "=&q") + ATOMIC_LOAD_DEF(uint8_t, uint8_t *, "=&q") + ATOMIC_LOAD_DEF(uint8_t, const uint8_t *, "=&q") + ATOMIC_LOAD_DEF(int16_t, int16_t *, "=&r") + ATOMIC_LOAD_DEF(int16_t, const int16_t *, "=&r") + ATOMIC_LOAD_DEF(uint16_t, uint16_t *, "=&r") + ATOMIC_LOAD_DEF(uint16_t, const uint16_t *, "=&r") + ATOMIC_LOAD_DEF(int32_t, int32_t *, "=&r") + ATOMIC_LOAD_DEF(int32_t, const int32_t *, "=&r") + ATOMIC_LOAD_DEF(uint32_t, uint32_t *, "=&r") + ATOMIC_LOAD_DEF(uint32_t, const uint32_t *, "=&r") + ATOMIC_LOAD_DEF(void *, void **, "=&r") + ATOMIC_LOAD_DEF(void *, void * const *, "=&r") + ATOMIC_LOAD_DEF(const void *, const void **, "=&r") + ATOMIC_LOAD_DEF(const void *, const void * const *, "=&r") #ifdef ARCH_X86_64 - ATOMIC_LOAD_DEF(int64_t, int64_t *) - ATOMIC_LOAD_DEF(int64_t, const int64_t *) - ATOMIC_LOAD_DEF(uint64_t, uint64_t *) - ATOMIC_LOAD_DEF(uint64_t, const uint64_t *) + ATOMIC_LOAD_DEF(int64_t, int64_t *, "=&r") + ATOMIC_LOAD_DEF(int64_t, const int64_t *, "=&r") + ATOMIC_LOAD_DEF(uint64_t, uint64_t *, "=&r") + ATOMIC_LOAD_DEF(uint64_t, const uint64_t *, "=&r") #endif /* ARCH_X86_64 */ } /* namespace lsp */ #undef ATOMIC_LOAD_DEF -#define ATOMIC_STORE_DEF(type) \ +#define ATOMIC_STORE_DEF(type, reg) \ inline void atomic_store(type *ptr, type value) \ { \ ARCH_X86_ASM \ ( \ __ASM_EMIT("mov %[value], (%[ptr])") \ : \ - : [ptr] "r" (ptr), [value] "r" (value) \ + : [ptr] "r" (ptr), [value] reg (value) \ : "memory" \ ); \ } namespace lsp { - ATOMIC_STORE_DEF(int8_t) - ATOMIC_STORE_DEF(uint8_t) - ATOMIC_STORE_DEF(int16_t) - ATOMIC_STORE_DEF(uint16_t) - ATOMIC_STORE_DEF(int32_t) - ATOMIC_STORE_DEF(uint32_t) - ATOMIC_STORE_DEF(void *) + ATOMIC_STORE_DEF(int8_t, "q") + ATOMIC_STORE_DEF(uint8_t, "q") + ATOMIC_STORE_DEF(int16_t, "r") + ATOMIC_STORE_DEF(uint16_t, "r") + ATOMIC_STORE_DEF(int32_t, "r") + ATOMIC_STORE_DEF(uint32_t, "r") + ATOMIC_STORE_DEF(void *, "r") #ifdef ARCH_X86_64 - ATOMIC_STORE_DEF(int64_t) - ATOMIC_STORE_DEF(uint64_t) + ATOMIC_STORE_DEF(int64_t, "r") + ATOMIC_STORE_DEF(uint64_t, "r") #endif /* ARCH_X86_64 */ } /* namespace lsp */ #undef ATOMIC_STORE_DEF -#define ATOMIC_XCHG_DEF(type) \ +#define ATOMIC_XCHG_DEF(type, reg) \ inline type atomic_swap(type *ptr, type value) \ { \ ARCH_X86_ASM \ ( \ __ASM_EMIT("lock") \ __ASM_EMIT("xchg %[value], (%[ptr])") \ - : [value] "+r"(value) \ + : [value] reg (value) \ : [ptr] "r" (ptr) \ : "memory", "cc" \ ); \ @@ -117,24 +117,24 @@ namespace lsp namespace lsp { - ATOMIC_XCHG_DEF(int8_t) - ATOMIC_XCHG_DEF(uint8_t) - ATOMIC_XCHG_DEF(int16_t) - ATOMIC_XCHG_DEF(uint16_t) - ATOMIC_XCHG_DEF(int32_t) - ATOMIC_XCHG_DEF(uint32_t) - ATOMIC_XCHG_DEF(void *) + ATOMIC_XCHG_DEF(int8_t, "+q") + ATOMIC_XCHG_DEF(uint8_t, "+q") + ATOMIC_XCHG_DEF(int16_t, "+r") + ATOMIC_XCHG_DEF(uint16_t, "+r") + ATOMIC_XCHG_DEF(int32_t, "+r") + ATOMIC_XCHG_DEF(uint32_t, "+r") + ATOMIC_XCHG_DEF(void *, "+r") #ifdef ARCH_X86_64 - ATOMIC_XCHG_DEF(int64_t) - ATOMIC_XCHG_DEF(uint64_t) + ATOMIC_XCHG_DEF(int64_t, "+r") + ATOMIC_XCHG_DEF(uint64_t, "+r") #endif /* ARCH_X86_64 */ } /* namespace lsp */ #undef ATOMIC_XCHG_DEF -#define ATOMIC_CAS_DEF(type) \ +#define ATOMIC_CAS_DEF(type, reg) \ inline bool atomic_cas(type *ptr, type src, type rep) \ { \ bool res; \ @@ -147,8 +147,8 @@ namespace lsp __ASM_EMIT("2:") \ : [res] "=@ccz" (res) \ : [src] "a" (src), \ - [ptr] "r" (ptr), \ - [rep] "r" (rep) \ + [ptr] reg (ptr), \ + [rep] reg (rep) \ : "memory", "cc" \ ); \ return res; \ @@ -156,30 +156,30 @@ namespace lsp namespace lsp { - ATOMIC_CAS_DEF(int8_t) - ATOMIC_CAS_DEF(uint8_t) - ATOMIC_CAS_DEF(int16_t) - ATOMIC_CAS_DEF(uint16_t) - ATOMIC_CAS_DEF(int32_t) - ATOMIC_CAS_DEF(uint32_t) - ATOMIC_CAS_DEF(void *) + ATOMIC_CAS_DEF(int8_t, "q") + ATOMIC_CAS_DEF(uint8_t, "q") + ATOMIC_CAS_DEF(int16_t, "r") + ATOMIC_CAS_DEF(uint16_t, "r") + ATOMIC_CAS_DEF(int32_t, "r") + ATOMIC_CAS_DEF(uint32_t, "r") + ATOMIC_CAS_DEF(void *, "r") #ifdef ARCH_X86_64 - ATOMIC_CAS_DEF(int64_t) - ATOMIC_CAS_DEF(uint64_t) + ATOMIC_CAS_DEF(int64_t, "r") + ATOMIC_CAS_DEF(uint64_t, "r") #endif /* ARCH_X86_64 */ } /* namespace lsp */ #undef ATOMIC_CAS_DEF -#define ATOMIC_ADD_DEF(type) \ +#define ATOMIC_ADD_DEF(type, reg) \ inline type atomic_add(type *ptr, type value) \ { \ ARCH_X86_ASM \ ( \ __ASM_EMIT("lock") \ __ASM_EMIT("xadd %[src], (%[ptr])") \ - : [src] "+r" (value) \ + : [src] reg (value) \ : [ptr] "r" (ptr) \ : "memory", "cc" \ ); \ @@ -188,16 +188,16 @@ namespace lsp namespace lsp { - ATOMIC_ADD_DEF(int8_t) - ATOMIC_ADD_DEF(uint8_t) - ATOMIC_ADD_DEF(int16_t) - ATOMIC_ADD_DEF(uint16_t) - ATOMIC_ADD_DEF(int32_t) - ATOMIC_ADD_DEF(uint32_t) + ATOMIC_ADD_DEF(int8_t, "+q") + ATOMIC_ADD_DEF(uint8_t, "+q") + ATOMIC_ADD_DEF(int16_t, "+r") + ATOMIC_ADD_DEF(uint16_t, "+r") + ATOMIC_ADD_DEF(int32_t, "+r") + ATOMIC_ADD_DEF(uint32_t, "+r") #ifdef ARCH_X86_64 - ATOMIC_ADD_DEF(int64_t) - ATOMIC_ADD_DEF(uint64_t) + ATOMIC_ADD_DEF(int64_t, "+r") + ATOMIC_ADD_DEF(uint64_t, "+r") #endif /* ARCH_X86_64 */ } /* namespace lsp */ @@ -212,14 +212,29 @@ namespace lsp namespace lsp { - template - inline void atomic_init(type_t &lk) { lk = LSP_ATOMIC_UNLOCKED; } + template + inline void atomic_init(T & lk) + { + lk = LSP_ATOMIC_UNLOCKED; + } - template - inline type_t atomic_trylock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_LOCKED); } + template + inline T atomic_trylock(T & lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_LOCKED)) + )); + } - template - inline type_t atomic_unlock(type_t &lk) { return atomic_swap(&lk, LSP_ATOMIC_UNLOCKED); } + template + inline T atomic_unlock(T &lk) + { + return T(atomic_swap( + fixed_int(&lk), + fixed_int(T(LSP_ATOMIC_UNLOCKED)) + )); + } } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/atomic.h 2025-08-26 18:15:40.938030350 +0000 @@ -55,8 +55,10 @@ namespace lsp #include #elif defined(ARCH_AARCH64) /* ARM 64-bit implementation */ #include - #elif defined(ARCH_ARM7) || defined(ARCH_ARM6) /* ARM 32-bit implementation */ + #elif defined(ARCH_ARM7) /* ARM 32-bit implementation */ #include + #elif defined(ARCH_ARM6) /* ARM 32-bit implementation */ + #include #elif defined(ARCH_ARM) /* ARM 32-bit implementation */ #include #else /* Generic implementation */ @@ -78,6 +80,12 @@ namespace lsp ); } + template + T atomic_swap(T *ptr, T value) + { + return T(atomic_swap(fixed_int(ptr), fixed_int(value))); + } + // Special case for NULL template T *atomic_swap(T **ptr, nullptr_t *value) @@ -91,6 +99,34 @@ namespace lsp } template + bool atomic_cas(T *dst, T src, T rep) + { + return atomic_cas(fixed_int(dst), fixed_int(src), fixed_int(rep)); + } + + template + bool atomic_cas(T **dst, T *src, T *rep) + { + return atomic_cas( + reinterpret_cast(dst), + reinterpret_cast(src), + reinterpret_cast(rep) + ); + } + + template + T atomic_load(T *ptr) + { + return T(atomic_load(fixed_int(ptr))); + } + + template + T atomic_load(const T *ptr) + { + return T(atomic_load(fixed_int(ptr))); + } + + template T *atomic_load(T **ptr) { return static_cast( @@ -111,6 +147,12 @@ namespace lsp } template + void atomic_store(T *ptr, T value) + { + return atomic_store(fixed_int(ptr), fixed_int(value)); + } + + template void atomic_store(T **ptr, T * value) { atomic_store( @@ -118,6 +160,15 @@ namespace lsp reinterpret_cast(value) ); } + + template + inline T atomic_add(T *ptr, T value) + { + return T(atomic_add( + fixed_int(ptr), + fixed_int(value) + )); + } } /* namespace lsp */ #endif /* LSP_PLUG_IN_COMMON_ATOMIC_H_ */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h 2025-03-01 12:42:54.916659647 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/bits.h 2025-08-26 18:15:40.938030350 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-common-lib * Created on: 1 апр. 2020 г. @@ -61,15 +61,52 @@ namespace lsp namespace lsp { /** + * Compute binary logarithm of the integer value + * @param value value to compute binary logarithm + * @return computed binary logarithm + */ + template + inline T int_log2(T value) + { + return T(int_log2(fixed_int(value))); + } + + /** + * Reverse bits + * @param src source value to reverse bits + * @return value with reverse-order of bits + */ + template + inline T reverse_bits(T src) + { + return T(reverse_bits(fixed_int(src))); + } + + /** + * Reverse bits + * @param src source value to reverse bits + * @param count number of significant bits in the integer value + * @return value with reverse-order of significant bits + */ + template + inline T reverse_bits(T src, size_t count) + { + return T(reverse_bits( + fixed_int(src), + count + )); + } + + /** * Round the integer value up to power of 2 * @tparam T integer value * @param value value to round * @return rounded value */ template - T round_pow2(T value) + inline T round_pow2(T value) { - T rounded = 1 << int_log2(value); + T rounded = T(1 << int_log2(fixed_int(value))); return (rounded == value) ? rounded : rounded << 1; } } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/types.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/types.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/types.h 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/types.h 2025-08-26 18:15:40.942030311 +0000 @@ -803,11 +803,11 @@ namespace lsp #endif /* DEFAULT_ALIGN */ #ifdef LSP_UNALIGNED_MEMORY_SAFE - #define IF_UNALIGNED_MEMORY_SAFE(x) x - #define IF_UNALIGNED_MEMORY_UNSAFE(x) + #define IF_UNALIGNED_MEMORY_SAFE(...) __VA_ARGS__ + #define IF_UNALIGNED_MEMORY_UNSAFE(...) #else - #define IF_UNALIGNED_MEMORY_SAFE(x) - #define IF_UNALIGNED_MEMORY_UNSAFE(x) x + #define IF_UNALIGNED_MEMORY_SAFE(...) + #define IF_UNALIGNED_MEMORY_UNSAFE(...) __VA_ARGS__ #endif /* LSP_UNALIGNED_MEMORY_SAFE */ #ifdef PLATFORM_LINUX @@ -1020,6 +1020,7 @@ namespace lsp template <> struct fixed_int_alias_t<4, false> { typedef uint32_t type; }; template <> struct fixed_int_alias_t<8, false> { typedef uint64_t type; }; + template <> struct fixed_int_type_t : public fixed_int_alias_t {}; template <> struct fixed_int_type_t : public fixed_int_alias_t {}; template <> struct fixed_int_type_t : public fixed_int_alias_t {}; template <> struct fixed_int_type_t : public fixed_int_alias_t {}; @@ -1032,7 +1033,7 @@ namespace lsp template <> struct fixed_int_type_t : public fixed_int_alias_t {}; /** - * Safe size-matching conversion of integral type to one of intN_t/uintN_t types without loosing precision. + * Safe size-matching conversion of integral type to one of intN_t/uintN_t types without losing precision. * This is usual for systems where size_t is defined in some strange way like in MacOS. * * @param value value to convert @@ -1044,6 +1045,32 @@ namespace lsp return typename fixed_int_type_t::type(value); } + /** + * Safe size-matching conversion of integral type pointer to one of intN_t/uintN_t pointer types without losing precision. + * This is usual for systems where size_t is defined in some strange way like in MacOS. + * + * @param value value to convert + * @return converted value + */ + template + constexpr inline typename fixed_int_type_t::type *fixed_int(T *value) + { + return reinterpret_cast::type *>(value); + } + + /** + * Safe size-matching conversion of integral type pointer to one of intN_t/uintN_t pointer types without losing precision. + * This is usual for systems where size_t is defined in some strange way like in MacOS. + * + * @param value value to convert + * @return converted value + */ + template + constexpr inline const typename fixed_int_type_t::type * fixed_int(const T *value) + { + return reinterpret_cast::type *>(value); + } + } /* namespace lsp */ #endif /* LSP_PLUG_IN_COMMON_TYPES_H_ */ diff -pruN 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/version.h 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/version.h --- 1.2.21-5/modules/lsp-common-lib/include/lsp-plug.in/common/version.h 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/include/lsp-plug.in/common/version.h 2025-08-26 18:15:40.942030311 +0000 @@ -26,7 +26,7 @@ // Version of headers #define LSP_COMMON_LIB_MAJOR 1 #define LSP_COMMON_LIB_MINOR 0 -#define LSP_COMMON_LIB_MICRO 41 +#define LSP_COMMON_LIB_MICRO 43 #if defined(LSP_COMMON_LIB_PUBLISHER) #define LSP_COMMON_LIB_PUBLIC LSP_EXPORT_MODIFIER diff -pruN 1.2.21-5/modules/lsp-common-lib/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-common-lib/make/tools.mk --- 1.2.21-5/modules/lsp-common-lib/make/tools.mk 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/make/tools.mk 2025-08-26 18:15:40.942030311 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-common-lib/modules.mk 1.2.23-0ubuntu1/modules/lsp-common-lib/modules.mk --- 1.2.21-5/modules/lsp-common-lib/modules.mk 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/modules.mk 2025-08-26 18:15:40.942030311 +0000 @@ -20,7 +20,7 @@ #------------------------------------------------------------------------------ # Variables that describe source code dependencies -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git diff -pruN 1.2.21-5/modules/lsp-common-lib/project.mk 1.2.23-0ubuntu1/modules/lsp-common-lib/project.mk --- 1.2.21-5/modules/lsp-common-lib/project.mk 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/project.mk 2025-08-26 18:15:40.942030311 +0000 @@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_COMMON ARTIFACT_NAME = lsp-common-lib ARTIFACT_DESC = Common library for basic C/C++ language definitions ARTIFACT_HEADERS = lsp-plug.in -ARTIFACT_VERSION = 1.0.41 +ARTIFACT_VERSION = 1.0.43 diff -pruN 1.2.21-5/modules/lsp-common-lib/src/main/atomic.cpp 1.2.23-0ubuntu1/modules/lsp-common-lib/src/main/atomic.cpp --- 1.2.21-5/modules/lsp-common-lib/src/main/atomic.cpp 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/src/main/atomic.cpp 2025-08-26 18:15:40.942030311 +0000 @@ -23,7 +23,7 @@ namespace lsp { -#if defined(ARCH_ARM7) || defined(ARCH_ARM6) +#if defined(ARCH_ARM7) /* nothing */ #elif defined(ARCH_ARM) LSP_COMMON_LIB_PUBLIC diff -pruN 1.2.21-5/modules/lsp-common-lib/src/test/utest/atomic.cpp 1.2.23-0ubuntu1/modules/lsp-common-lib/src/test/utest/atomic.cpp --- 1.2.21-5/modules/lsp-common-lib/src/test/utest/atomic.cpp 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/src/test/utest/atomic.cpp 2025-08-26 18:15:40.942030311 +0000 @@ -26,65 +26,104 @@ using namespace lsp; UTEST_BEGIN("common", atomic) - void test_cas() + template + void test_cas(const char *type) { size_t i; - atomic_t value; - atomic_store(&value, 0); + T value; + atomic_store(&value, T(0)); - printf("Testing atomic_cas...\n"); + printf("Testing atomic_cas for %s...\n", type); for (i=0; i<1000; ++i) - if (atomic_cas(&value, 0, 1)) + if (atomic_cas(&value, T(0), T(1))) break; UTEST_ASSERT(i < 1000); for (i=0; i<1000; ++i) - if (atomic_cas(&value, 0, 1)) + if (atomic_cas(&value, T(0), T(1))) break; UTEST_ASSERT(i >= 1000); for (i=0; i<1000; ++i) - if (atomic_cas(&value, 1, 2)) + if (atomic_cas(&value, T(1), T(2))) break; UTEST_ASSERT(i < 1000); - UTEST_ASSERT(atomic_load(&value) == 2); + UTEST_ASSERT(atomic_load(&value) == T(2)); } - void test_swap() + template + void test_swap(const char *type) { - atomic_t value1, value2; - atomic_store(&value1, 0); - atomic_store(&value2, 1); - printf("Testing atomic_swap...\n"); + T value1, value2; + atomic_store(&value1, T(0)); + atomic_store(&value2, T(1)); - atomic_swap(&value1, 2); - atomic_swap(&value2, 3); + printf("Testing atomic_swap for %s...\n", type); - UTEST_ASSERT(atomic_load(&value1) == 2); - UTEST_ASSERT(atomic_load(&value2) == 3); + atomic_swap(&value1, T(2)); + atomic_swap(&value2, T(3)); + + UTEST_ASSERT(atomic_load(&value1) == T(2)); + UTEST_ASSERT(atomic_load(&value2) == T(3)); atomic_swap(&value1, value2); - UTEST_ASSERT(atomic_load(&value1) == 3); + UTEST_ASSERT(atomic_load(&value1) == T(3)); } - void test_add() + template + void test_add(const char *type) { - atomic_t value; - atomic_store(&value, 0); - printf("Testing atomic_add...\n"); - - for (size_t i=0; i<1000; ++i) - UTEST_ASSERT(atomic_add(&value, 1) == atomic_t(i)); // i == previous value - UTEST_ASSERT(atomic_load(&value) == 1000); + T value; + atomic_store(&value, T(0)); + printf("Testing atomic_add for %s...\n", type); + + for (size_t i=0; i<0x40; ++i) + UTEST_ASSERT(atomic_add(&value, T(1)) == T(i)); // i == previous value + UTEST_ASSERT(atomic_load(&value) == T(0x40)); } UTEST_MAIN { - test_cas(); - test_swap(); - test_add(); + test_cas("int8_t"); + test_cas("uint8_t"); + test_cas("int16_t"); + test_cas("uint16_t"); + test_cas("int32_t"); + test_cas("uint32_t"); + #if defined(ARCH_64BIT) + test_cas("int64_t"); + test_cas("uint64_t"); + #endif /* ARCH_64BIT */ + test_cas("size_t"); + test_cas("ssize_t"); + + test_swap("int8_t"); + test_swap("uint8_t"); + test_swap("int16_t"); + test_swap("uint16_t"); + test_swap("int32_t"); + test_swap("uint32_t"); + #if defined(ARCH_64BIT) + test_swap("int64_t"); + test_swap("uint64_t"); + #endif /* ARCH_64BIT */ + test_swap("size_t"); + test_swap("ssize_t"); + + test_add("int8_t"); + test_add("uint8_t"); + test_add("int16_t"); + test_add("uint16_t"); + test_add("int32_t"); + test_add("uint32_t"); + #if defined(ARCH_64BIT) + test_add("int64_t"); + test_add("uint64_t"); + #endif /* ARCH_64BIT */ + test_add("size_t"); + test_add("ssize_t"); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-common-lib/src/test/utest/bits.cpp 1.2.23-0ubuntu1/modules/lsp-common-lib/src/test/utest/bits.cpp --- 1.2.21-5/modules/lsp-common-lib/src/test/utest/bits.cpp 2025-03-01 12:42:54.920659624 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/src/test/utest/bits.cpp 2025-08-26 18:15:40.942030311 +0000 @@ -26,51 +26,63 @@ using namespace lsp; UTEST_BEGIN("common", bits) template - void test_reverse_bits(const char *label) + void test_reverse_bits(const char *label) + { + printf("Testing reverse_bits for %s...\n", label); + const size_t n = sizeof(T) * 8; + + for (size_t i=0; i - void test_int_log2(const char *label) + for (size_t i=0; i<4; ++i) { - printf("Testing %s...\n", label); + T x = T(1) << i; + T y = reverse_bits(x, 4); + T ck = (T(1) << (3 - i)); + UTEST_ASSERT_MSG(y == ck, "%s: tier3, i=%d, n=%d, x=0x%08llx, y=0x%08llx, ck=0x%08llx", + label, int(i), int(n), + (long long)x, + (long long)y, + (long long)ck); + } + } + + template + void test_int_log2(const char *label) + { + printf("Testing int_log2 for %s...\n", label); - int log2 = int_log2(T(0)); - UTEST_ASSERT_MSG(log2 == 0, "%s: zero input detected as %d", label, log2); + int log2 = int_log2(T(0)); + UTEST_ASSERT_MSG(log2 == 0, "%s: zero input detected as %d", label, log2); - for (int i=0; i("reverse_bits u8"); - test_reverse_bits("reverse_bits i8"); - test_reverse_bits("reverse_bits u16"); - test_reverse_bits("reverse_bits i16"); - test_reverse_bits("reverse_bits u32"); - test_reverse_bits("reverse_bits i32"); - test_reverse_bits("reverse_bits u64"); - test_reverse_bits("reverse_bits i64"); - - test_int_log2("int_log2 u8"); - test_int_log2("int_log2 i8"); - test_int_log2("int_log2 u16"); - test_int_log2("int_log2 i16"); - test_int_log2("int_log2 u32"); - test_int_log2("int_log2 i32"); - test_int_log2("int_log2 u64"); - test_int_log2("int_log2 i64"); + test_reverse_bits("uint8_t"); + test_reverse_bits("int8_t"); + test_reverse_bits("uint16_t"); + test_reverse_bits("int16_t"); + test_reverse_bits("uint32_t"); + test_reverse_bits("int32_t"); + test_reverse_bits("uint64_t"); + test_reverse_bits("int64_t"); + test_reverse_bits("size_t"); + test_reverse_bits("ssize_t"); + + test_int_log2("uint8_t"); + test_int_log2("int8_t"); + test_int_log2("uint16_t"); + test_int_log2("int16_t"); + test_int_log2("uint32_t"); + test_int_log2("int32_t"); + test_int_log2("uint64_t"); + test_int_log2("int64_t"); + test_int_log2("size_t"); + test_int_log2("ssize_t"); test_pow2_rounding(); } diff -pruN 1.2.21-5/modules/lsp-common-lib/src/test/utest/types.cpp 1.2.23-0ubuntu1/modules/lsp-common-lib/src/test/utest/types.cpp --- 1.2.21-5/modules/lsp-common-lib/src/test/utest/types.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-common-lib/src/test/utest/types.cpp 2025-08-26 18:15:40.942030311 +0000 @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-common-lib + * Created on: 3 мар. 2025 г. + * + * lsp-common-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-common-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-common-lib. If not, see . + */ + +#include +#include + +using namespace lsp; + +UTEST_BEGIN("common", types) + + template + void test_cast(type value) + { + auto casted = lsp::fixed_int(value); + UTEST_ASSERT(sizeof(casted) == sizeof(value)); + } + + UTEST_MAIN + { + char str[8]; + const char *cstr = "test"; + + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + test_cast(static_cast(42)); + + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + test_cast(reinterpret_cast(str)); + + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + test_cast(reinterpret_cast(cstr)); + } + +UTEST_END; + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-dsp-lib/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-dsp-lib/.github/workflows/build.yml 2025-03-01 12:42:56.768648530 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/.github/workflows/build.yml 2025-08-26 18:15:43.678003757 +0000 @@ -97,7 +97,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 @@ -119,7 +119,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ libstdc++-devel clang + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale glibc-gconv-modules-extra libstdc++-devel clang - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 CC=clang CXX=clang++ @@ -188,3 +188,25 @@ jobs: - name: Run unit tests shell: msys2 {0} run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test.exe utest --verbose --jobs 1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config TEST=1 STRICT=1 DEBUG=1 ASAN=1 + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 + - name: Run unit tests + run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 + - name: Run unit tests with memcheck + run: | + for test in $(.build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --list --suppress); do \ + echo "***** MEMCHECK $test *****"; \ + .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 --nofork --debug $test; \ + done diff -pruN 1.2.21-5/modules/lsp-dsp-lib/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-dsp-lib/CHANGELOG --- 1.2.21-5/modules/lsp-dsp-lib/CHANGELOG 2025-03-01 12:42:56.768648530 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/CHANGELOG 2025-08-26 18:15:43.678003757 +0000 @@ -2,6 +2,19 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.31 === +* Implementation of 3D mathematics using AVX instruction set. +* Fixed improper AVX-512 optimization for lanczos kernel genration function. +* Fixed Mid/Side transformation functions bug for 32-bit and 64-bit ARM processors. +* Added MacOS CI builds. +* Updated module versions in dependencies. + +=== 1.0.30 === +* Implemented SIMD-optimized trigonometric functions sinf and cosf. +* Implemented Lanczos filter kernel computation function. +* Updated build scripts. +* Updated module versions in dependencies. + === 1.0.29 === * Implemented AVX-512 optimized direct_fft and reverse_fft functions. * Added definition of MacOS dependencies in build scripts. diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath/types.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath/types.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath/types.h 2025-03-01 12:42:56.768648530 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath/types.h 2025-08-26 18:15:43.678003757 +0000 @@ -47,28 +47,11 @@ typedef struct LSP_DSP_LIB_TYPE(color3d_ float r, g, b, a; } LSP_DSP_LIB_TYPE(color3d_t); -typedef struct LSP_DSP_LIB_TYPE(ray3d_t) -{ - LSP_DSP_LIB_TYPE(point3d_t) z; // The start point: x, y, z = point coordinates - LSP_DSP_LIB_TYPE(vector3d_t) v; // The spread vector: dx, dy, dz = direction -} LSP_DSP_LIB_TYPE(ray3d_t); - typedef struct LSP_DSP_LIB_TYPE(bound_box3d_t) { LSP_DSP_LIB_TYPE(point3d_t) p[8]; // Bounding-box contains 8 points } LSP_DSP_LIB_TYPE(bound_box3d_t); -typedef struct LSP_DSP_LIB_TYPE(segment3d_t) -{ - LSP_DSP_LIB_TYPE(point3d_t) p[2]; -} LSP_DSP_LIB_TYPE(segment3d_t); - -typedef struct LSP_DSP_LIB_TYPE(triangle3d_t) -{ - LSP_DSP_LIB_TYPE(point3d_t) p[3]; // Vertexes: x, y, z = vertex coordinates, w = length of the corresponding edge - LSP_DSP_LIB_TYPE(vector3d_t) n; // Normal: dx, dy, dz = normal coordinates, dw = plane equation coefficient -} LSP_DSP_LIB_TYPE(triangle3d_t); - typedef struct LSP_DSP_LIB_TYPE(matrix3d_t) { float m[16]; // Matrix data diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath.h 2025-03-01 12:42:56.768648530 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/3dmath.h 2025-08-26 18:15:43.678003757 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -177,36 +177,6 @@ LSP_DSP_LIB_SYMBOL(void, vector_mul_v2, */ LSP_DSP_LIB_SYMBOL(void, vector_mul_vv, LSP_DSP_LIB_TYPE(vector3d_t) *r, const LSP_DSP_LIB_TYPE(vector3d_t) *vv); -/** Init segment using coordinates of 2 points - * - * @param s segment to initialize - * @param x0 point 1 X coordinate - * @param y0 point 1 Y coordinate - * @param z0 point 1 Z coordinate - * @param x1 point 2 X coordinate - * @param y1 point 2 Y coordinate - * @param z1 point 2 Z coordinate - */ -LSP_DSP_LIB_SYMBOL(void, init_segment_xyz, LSP_DSP_LIB_TYPE(segment3d_t) *s, - float x0, float y0, float z0, - float x1, float y1, float z1 -); - -/** Init segment using two points - * - * @param s segment to initialize - * @param p1 point 1 - * @param p2 point 2 - */ -LSP_DSP_LIB_SYMBOL(void, init_segment_p2, LSP_DSP_LIB_TYPE(segment3d_t) *s, const LSP_DSP_LIB_TYPE(point3d_t) *p1, const LSP_DSP_LIB_TYPE(point3d_t) *p2); - -/** Init segment using array of two points - * - * @param s segment to initialize - * @param p array of points - */ -LSP_DSP_LIB_SYMBOL(void, init_segment_pv, LSP_DSP_LIB_TYPE(segment3d_t) *s, const LSP_DSP_LIB_TYPE(point3d_t) *p); - /** Initialize matrix (make copy) * * @param dst destination matrix @@ -332,32 +302,6 @@ LSP_DSP_LIB_SYMBOL(void, init_matrix3d_l */ LSP_DSP_LIB_SYMBOL(void, init_matrix3d_orientation, LSP_DSP_LIB_TYPE(matrix3d_t) *m, LSP_DSP_LIB_TYPE(axis_orientation_t) orientation); -/** - * Compute tranfromation matrix from point and vector data which provides: - * - position of the object (point) - * - direction of the object (vector) - * - scale of the object (length of vector) - * After applying this matrix, the point with coordinates (0, 0, 1) - * will have coordinates (p.x + v.dx, p.y + v.dy, p.z + v.dz) - * - * @param m target matrix - * @param p point that indicates position of the object - * @param v vector that indicates rotation and size of the object - */ -LSP_DSP_LIB_SYMBOL(void, calc_matrix3d_transform_p1v1, LSP_DSP_LIB_TYPE(matrix3d_t) *m, const LSP_DSP_LIB_TYPE(point3d_t) *p, const LSP_DSP_LIB_TYPE(vector3d_t) *v); - -/** - * Compute tranfromation matrix from ray data which provides: - * - position of the object (point) - * - direction of the object (vector) - * - scale of the object (length of vector) - * After applying this matrix, the point with coordinates (0, 0, 1) - * will have coordinates (r.z.x + r.v.dx, r.z.y + r.v.dy, r.z.z + r.v.dz) - * @param m target matrix - * @param r ray that indicates position, rotation and size of the object - */ -LSP_DSP_LIB_SYMBOL(void, calc_matrix3d_transform_r1, LSP_DSP_LIB_TYPE(matrix3d_t) *m, const LSP_DSP_LIB_TYPE(ray3d_t) *r); - /** Apply matrix to vector * * @param r target vector @@ -416,226 +360,6 @@ LSP_DSP_LIB_SYMBOL(void, transpose_matri */ LSP_DSP_LIB_SYMBOL(void, transpose_matrix3d2, LSP_DSP_LIB_TYPE(matrix3d_t) *r, const LSP_DSP_LIB_TYPE(matrix3d_t) *m); -/** Initialize ray using coordinates of 2 points - * - * @param l ray to initialize - * @param x0 source point X coordinate - * @param y0 source point Y coordinate - * @param z0 source point Z coordinate - * @param x1 destination point X coordinate - * @param y1 destination point X coordinate - * @param z1 destination point X coordinate - */ -LSP_DSP_LIB_SYMBOL(void, init_ray_xyz, LSP_DSP_LIB_TYPE(ray3d_t) *l, float x0, float y0, float z0, float x1, float y1, float z1); - -/** Initialize ray using coordinate of start point and direction vector - * - * @param l ray to initialize - * @param x0 source point X coordinate - * @param y0 source point Y coordinate - * @param z0 source point Z coordinate - * @param dx direction vector X projection - * @param dy direction vector Y projection - * @param dz direction vector Z projection - */ -LSP_DSP_LIB_SYMBOL(void, init_ray_dxyz, LSP_DSP_LIB_TYPE(ray3d_t) *l, float x0, float y0, float z0, float dx, float dy, float dz); - -/** Initialize ray using point and vector object - * - * @param l ray to initialize - * @param p source point - * @param v direction vector - */ -LSP_DSP_LIB_SYMBOL(void, init_ray_pdv, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(point3d_t) *p, const LSP_DSP_LIB_TYPE(vector3d_t) *m); - -/** Initialize ray using two points - * - * @param l ray to initialize - * @param p1 source point - * @param p2 destination point - */ -LSP_DSP_LIB_SYMBOL(void, init_ray_p2, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(point3d_t) *p1, const LSP_DSP_LIB_TYPE(point3d_t) *p2); - -/** Initialize ray using array of two points - * - * @param l ray to initialize - * @param p array of two points to initialize - */ -LSP_DSP_LIB_SYMBOL(void, init_ray_pv, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(point3d_t) *p); - -/** Initialize ray using another ray - * - * @param l ray to initialize - * @param r source ray - */ -LSP_DSP_LIB_SYMBOL(void, init_ray, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(ray3d_t) *r); - -/** Calculate ray using coordinates of 2 points - * - * @param l ray to initialize - * @param x0 source point X coordinate - * @param y0 source point Y coordinate - * @param z0 source point Z coordinate - * @param x1 destination point X coordinate - * @param y1 destination point X coordinate - * @param z1 destination point X coordinate - */ -LSP_DSP_LIB_SYMBOL(void, calc_ray_xyz, LSP_DSP_LIB_TYPE(ray3d_t) *l, float x0, float y0, float z0, float x1, float y1, float z1); - -/** Calculate ray using coordinate of start point and direction vector - * - * @param l ray to initialize - * @param x0 source point X coordinate - * @param y0 source point Y coordinate - * @param z0 source point Z coordinate - * @param dx direction vector X projection - * @param dy direction vector Y projection - * @param dz direction vector Z projection - */ -LSP_DSP_LIB_SYMBOL(void, calc_ray_dxyz, LSP_DSP_LIB_TYPE(ray3d_t) *l, float x0, float y0, float z0, float dx, float dy, float dz); - -/** Calculate ray using another ray - * - * @param l ray to initialize - * @param r source ray - */ -LSP_DSP_LIB_SYMBOL(void, calc_ray_pdv, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(point3d_t) *p, const LSP_DSP_LIB_TYPE(vector3d_t) *m); - -/** Calculate ray using two points - * - * @param l ray to initialize - * @param p1 source point - * @param p2 destination point - */ -LSP_DSP_LIB_SYMBOL(void, calc_ray_p2, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(point3d_t) *p1, const LSP_DSP_LIB_TYPE(point3d_t) *p2); - -/** Calculate ray using array of two points - * - * @param l ray to initialize - * @param p array of two points to initialize - */ -LSP_DSP_LIB_SYMBOL(void, calc_ray_pv, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(point3d_t) *p); - -/** Calculate ray using another ray - * - * @param l ray to initialize - * @param r source ray - */ -LSP_DSP_LIB_SYMBOL(void, calc_ray, LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(ray3d_t) *r); - -/** Calculate triangle normal and edge lengths - * - * @param t triangle - */ -LSP_DSP_LIB_SYMBOL(void, calc_triangle3d_params, LSP_DSP_LIB_TYPE(triangle3d_t) *t); - -/** Initialize triangle using coordinates of 3 points, - * fill normal vector with zeros - * - * @param t triangle to initialize - * @param x0 point 1 X coordinate - * @param y0 point 1 Y coordinate - * @param z0 point 1 Z coordinate - * @param x1 point 2 X coordinate - * @param y1 point 2 Y coordinate - * @param z1 point 2 Z coordinate - * @param x2 point 3 X coordinate - * @param y2 point 3 Y coordinate - * @param z2 point 3 Z coordinate - */ -LSP_DSP_LIB_SYMBOL(void, init_triangle3d_xyz, LSP_DSP_LIB_TYPE(triangle3d_t) *t, - float x0, float y0, float z0, - float x1, float y1, float z1, - float x2, float y2, float z2 - ); - -/** Initialize triangle using 3 points, - * fill normal vector with zeros - * - * @param t triangle to initialize - * @param p1 point 1 - * @param p2 point 2 - * @param p3 point 3 - */ -LSP_DSP_LIB_SYMBOL(void, init_triangle3d_p3, - LSP_DSP_LIB_TYPE(triangle3d_t) *t, - const LSP_DSP_LIB_TYPE(point3d_t) *p1, - const LSP_DSP_LIB_TYPE(point3d_t) *p2, - const LSP_DSP_LIB_TYPE(point3d_t) *p3 - ); - -/** Initialize triangle using array of 3 points, - * fill normal vector with zeros - * - * @param t triangle to initialize - * @param p array of 3 points - */ -LSP_DSP_LIB_SYMBOL(void, init_triangle3d_pv, - LSP_DSP_LIB_TYPE(triangle3d_t) *t, - const LSP_DSP_LIB_TYPE(point3d_t) *p - ); - -/** Initialize triangle from another triangle - * - * @param dst destination triangle - * @param src source triangle - */ -LSP_DSP_LIB_SYMBOL(void, init_triangle3d, LSP_DSP_LIB_TYPE(triangle3d_t) *dst, const LSP_DSP_LIB_TYPE(triangle3d_t) *src); - -/** Initialize triangle using coordinates of 3 points, - * calculate normal vector - * - * @param t triangle to initialize - * @param x0 point 1 X coordinate - * @param y0 point 1 Y coordinate - * @param z0 point 1 Z coordinate - * @param x1 point 2 X coordinate - * @param y1 point 2 Y coordinate - * @param z1 point 2 Z coordinate - * @param x2 point 3 X coordinate - * @param y2 point 3 Y coordinate - * @param z2 point 3 Z coordinate - */ -LSP_DSP_LIB_SYMBOL(void, calc_triangle3d_xyz, LSP_DSP_LIB_TYPE(triangle3d_t) *t, - float x0, float y0, float z0, - float x1, float y1, float z1, - float x2, float y2, float z2 - ); - -/** Initialize triangle using 3 points, - * calculate normal vector - * - * @param t triangle to initialize - * @param p1 point 1 - * @param p2 point 2 - * @param p3 point 3 - */ -LSP_DSP_LIB_SYMBOL(void, calc_triangle3d_p3, - LSP_DSP_LIB_TYPE(triangle3d_t) *t, - const LSP_DSP_LIB_TYPE(point3d_t) *p1, - const LSP_DSP_LIB_TYPE(point3d_t) *p2, - const LSP_DSP_LIB_TYPE(point3d_t) *p3 - ); - -/** Initialize triangle using array of 3 points, - * calculate normal vector - * - * @param t triangle to initialize - * @param p array of 3 points - */ -LSP_DSP_LIB_SYMBOL(void, calc_triangle3d_pv, - LSP_DSP_LIB_TYPE(triangle3d_t) *t, - const LSP_DSP_LIB_TYPE(point3d_t) *p - ); - -/** Init triangle from another triangle, - * calculate normal vector - * - * @param dst destination triangle - * @param src source triangle - */ -LSP_DSP_LIB_SYMBOL(void, calc_triangle3d, LSP_DSP_LIB_TYPE(triangle3d_t) *dst, const LSP_DSP_LIB_TYPE(triangle3d_t) *src); - /** Analyze that two vectors and the normal vector organize the left triplet * * @param p1 start point of the first vector @@ -679,50 +403,29 @@ LSP_DSP_LIB_SYMBOL(float, check_triplet3 */ LSP_DSP_LIB_SYMBOL(float, check_triplet3d_vv, const LSP_DSP_LIB_TYPE(vector3d_t) *v); -/** Analyze that triangle vectors and normal vector of triangle organize the left triplet - * - * @param t triganle - * @return value greater than zero if left triplet, less than zero if right triplet, zero if not triplet - */ -LSP_DSP_LIB_SYMBOL(float, check_triplet3d_t, const LSP_DSP_LIB_TYPE(triangle3d_t) *t); - -/** Analyze that triangle vectors and normal vector organize the left triplet - * - * @param t triganle - * @param n normal vector - * @return value greater than zero if left triplet, less than zero if right triplet, zero if not triplet - */ -LSP_DSP_LIB_SYMBOL(float, check_triplet3d_tn, const LSP_DSP_LIB_TYPE(triangle3d_t) *t, const LSP_DSP_LIB_TYPE(vector3d_t) *n); - -/** Analyze point location relative to the triangle - * - * @param t triangle - * @param p point - * @return value > 0 if point is candidate to be inside the triangle, - * value < 0 if point is candidate to be outside the triangle, - * value = 0 if point is on the edge of triangle - */ -LSP_DSP_LIB_SYMBOL(float, check_point3d_on_triangle_tp, const LSP_DSP_LIB_TYPE(triangle3d_t) *t, const LSP_DSP_LIB_TYPE(point3d_t) *p); - -/** Analyze point location relative to the triangle of three points +/** + * Analyze point location relative to the triangle of three points. + * All points should be considered being co-planar. * * @param t array of three triangle points * @param p point - * @return value > 0 if point is candidate to be inside the triangle, - * value < 0 if point is candidate to be outside the triangle, - * value = 0 if point is on the edge of triangle + * @return value > 0 if point is inside of the triangle, + * value < 0 if point is outside of the triangle, + * value = 0 if point is on the edge of the triangle */ LSP_DSP_LIB_SYMBOL(float, check_point3d_on_triangle_pvp, const LSP_DSP_LIB_TYPE(point3d_t) *t, const LSP_DSP_LIB_TYPE(point3d_t) *p); -/** Analyze point location relative to the triangle of three points +/** + * Analyze point location relative to the triangle of three points. + * All points should be considered being co-planar. * * @param p1 triangle point 1 * @param p2 triangle point 2 * @param p3 triangle point 3 * @param p point - * @return value > 0 if point is candidate to be inside the triangle, - * value < 0 if point is candidate to be outside the triangle, - * value = 0 if point is on the edge of triangle + * @return value > 0 if point is inside of the triangle, + * value < 0 if point is outside of the triangle, + * value = 0 if point is on the edge of the triangle */ LSP_DSP_LIB_SYMBOL(float, check_point3d_on_triangle_p3p, const LSP_DSP_LIB_TYPE(point3d_t) *p1, const LSP_DSP_LIB_TYPE(point3d_t) *p2, const LSP_DSP_LIB_TYPE(point3d_t) *p3, const LSP_DSP_LIB_TYPE(point3d_t) *p); @@ -738,36 +441,11 @@ LSP_DSP_LIB_SYMBOL(size_t, longest_edge3 /** Return the index of longest edge between three points * - * @param p array of points + * @param p array of three points (0, 1, 2) * @return 0 if edge between points 0 and 1 is longest, 1 if between points 1 and 2, 2 if between ponts 2 and 0 */ LSP_DSP_LIB_SYMBOL(size_t, longest_edge3d_pv, const LSP_DSP_LIB_TYPE(point3d_t) *p); -/** Find intersection of ray and triangle - * - * @param ip intersection point to store result - * @param l ray to test intersection - * @param t pre-calculated triangle to check (with plane equation) - * @return actual distance between ray start point and intersection point. - * If value is less than zero, then there is no intersection - */ -LSP_DSP_LIB_SYMBOL(float, find_intersection3d_rt, LSP_DSP_LIB_TYPE(point3d_t) *ip, const LSP_DSP_LIB_TYPE(ray3d_t) *l, const LSP_DSP_LIB_TYPE(triangle3d_t) *t); - -/** Calculate angle between two vectors - * - * @param v1 vector 1 - * @param v2 vector 2 - * @return cosine of angle between two vectors [-1..1] - */ -LSP_DSP_LIB_SYMBOL(float, calc_angle3d_v2, const LSP_DSP_LIB_TYPE(vector3d_t) *v1, const LSP_DSP_LIB_TYPE(vector3d_t) *v2); - -/** Calculate angle between two vectors - * - * @param v array of two vectors - * @return cosine of angle between two vectors [-1..1] - */ -LSP_DSP_LIB_SYMBOL(float, calc_angle3d_vv, const LSP_DSP_LIB_TYPE(vector3d_t) *v); - /** Calculate normal for triangle described by three points * * @param n normal @@ -799,23 +477,6 @@ LSP_DSP_LIB_SYMBOL(void, calc_normal3d_v */ LSP_DSP_LIB_SYMBOL(void, calc_normal3d_vv, LSP_DSP_LIB_TYPE(vector3d_t) *n, const LSP_DSP_LIB_TYPE(vector3d_t) *vv); -/** Move point between two other points: p = p1 + (p2 - p1) * k - * - * @param p target to store result - * @param p1 point 1 - * @param p2 point 2 - * @param k movement - */ -LSP_DSP_LIB_SYMBOL(void, move_point3d_p2, LSP_DSP_LIB_TYPE(point3d_t) *p, const LSP_DSP_LIB_TYPE(point3d_t) *p1, const LSP_DSP_LIB_TYPE(point3d_t) *p2, float k); - -/** Move point between two other points: p = p1 + (p2 - p1) * k - * - * @param p point to move - * @param pv array of two points - * @param k movement - */ -LSP_DSP_LIB_SYMBOL(void, move_point3d_pv, LSP_DSP_LIB_TYPE(point3d_t) *p, const LSP_DSP_LIB_TYPE(point3d_t) *pv, float k); - /** * Add vector to point * @param p point @@ -848,14 +509,6 @@ LSP_DSP_LIB_SYMBOL(void, add_vector_pvk1 LSP_DSP_LIB_SYMBOL(void, add_vector_pvk2, LSP_DSP_LIB_TYPE(point3d_t) *p, const LSP_DSP_LIB_TYPE(point3d_t) *sp, const LSP_DSP_LIB_TYPE(vector3d_t) *dv, float k); /** - * Compute bounding box around object - * @param b bounding box object - * @param p array of object vertexes - * @param n number of vertexes in object - */ -LSP_DSP_LIB_SYMBOL(void, calc_bound_box, LSP_DSP_LIB_TYPE(bound_box3d_t) *b, const LSP_DSP_LIB_TYPE(point3d_t) *p, size_t n); - -/** * Compute plane equation using three points * @param v pointer to store plane equation * @param p0 point 0 @@ -964,23 +617,6 @@ LSP_DSP_LIB_SYMBOL(float, calc_area_p3, LSP_DSP_LIB_SYMBOL(float, calc_area_pv, const LSP_DSP_LIB_TYPE(point3d_t) *pv); /** - * Return length of the projection of the point on the line - * @param p0 projection line point 0 - * @param p1 projection line point 1 - * @param pp projected point - * @return length of the projection of the point on the line - */ -LSP_DSP_LIB_SYMBOL(float, projection_length_p2, const LSP_DSP_LIB_TYPE(point3d_t) *p0, const LSP_DSP_LIB_TYPE(point3d_t) *p1, const LSP_DSP_LIB_TYPE(point3d_t) *pp); - -/** - * Return length of the projection of the vector on another vector - * @param v projection vector - * @param pv projected vector - * @return length of the projection of the vector on another vector - */ -LSP_DSP_LIB_SYMBOL(float, projection_length_v2, const LSP_DSP_LIB_TYPE(vector3d_t) *v, const LSP_DSP_LIB_TYPE(vector3d_t) *pv); - -/** * Estimate the shortest distance to triangle * @param sp projection point * @param p0 point 0 of triangle diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/cos.h 2025-08-26 18:15:43.682003718 +0000 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 10 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef LSP_PLUG_IN_DSP_COMMON_PMATH_COS_H_ +#define LSP_PLUG_IN_DSP_COMMON_PMATH_COS_H_ + +/** + * Calculate cosine function: dst[i] = cos(dst[i]) + * + * @param dst destination vector + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, cosf1, float *dst, size_t count); + +/** + * Calculate cosine function: dst[i] = cos(src[i]) + * + * @param dst destination vector + * @param src source vector + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, cosf2, float *dst, const float *src, size_t count); + +/** + * Calculate cosine function with generated argument: dst[i] = cos(k*i + p) + * + * @param dst destination vector + * @param k phase step + * @param p initial phase + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, cosf_kp1, float *dst, float k, float p, size_t count); + + +#endif /* LSP_PLUG_IN_DSP_COMMON_PMATH_COS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/lanczos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/lanczos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/lanczos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/lanczos.h 2025-08-26 18:15:43.682003718 +0000 @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 10 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef LSP_PLUG_IN_DSP_COMMON_PMATH_LANCZOS_H_ +#define LSP_PLUG_IN_DSP_COMMON_PMATH_LANCZOS_H_ + +/** + * Calculate lanczos filter response function with generated argument: + * + * for each x = PI * (k*i - p) + * + * { 1.0 if fabsf(x) <= 1e-6 + * dst[i] = { sinc(x) * sinc(x*a)/(a * x^2) if fabsf(x) < t and fabsf(x) >= 1e-6 + * { 0.0 otherwise + * + * @param dst destination vector + * @param src source vector + * @param k number of samples per lobe multiplied by PI + * @param p shift in lobes multiplied by PI + * @param t the number of lobes multiplied by PI + * @param a reverse number of lobes + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, lanczos1, float *dst, float k, float p, float t, float a, size_t count); + + + +#endif /* LSP_PLUG_IN_DSP_COMMON_PMATH_SINCSINC_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath/sin.h 2025-08-26 18:15:43.682003718 +0000 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 9 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef LSP_PLUG_IN_DSP_COMMON_PMATH_SIN_H_ +#define LSP_PLUG_IN_DSP_COMMON_PMATH_SIN_H_ + +/** + * Calculate sine function: dst[i] = sin(dst[i]) + * + * @param dst destination vector + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, sinf1, float *dst, size_t count); + +/** + * Calculate sine function: dst[i] = sin(src[i]) + * + * @param dst destination vector + * @param src source vector + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, sinf2, float *dst, const float *src, size_t count); + +/** + * Calculate sine function with generated argument: dst[i] = sin(k*i + p) + * + * @param dst destination vector + * @param k phase step + * @param p initial phase + * @param count number of elements + */ +LSP_DSP_LIB_SYMBOL(void, sinf_kp1, float *dst, float k, float p, size_t count); + + +#endif /* LSP_PLUG_IN_DSP_COMMON_PMATH_SIN_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath.h 2025-03-01 12:42:56.772648507 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/common/pmath.h 2025-08-26 18:15:43.682003718 +0000 @@ -25,9 +25,11 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -35,6 +37,7 @@ #include #include #include +#include #include #include diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/version.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/version.h --- 1.2.21-5/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/version.h 2025-03-01 12:42:56.772648507 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/lsp-plug.in/dsp/version.h 2025-08-26 18:15:43.682003718 +0000 @@ -25,7 +25,7 @@ // Define version of headers #define LSP_DSP_LIB_MAJOR 1 #define LSP_DSP_LIB_MINOR 0 -#define LSP_DSP_LIB_MICRO 29 +#define LSP_DSP_LIB_MICRO 31 #if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__) #define LSP_DSP_LIB_EXPORT_MODIFIER __declspec(dllexport) diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/msmatrix.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/msmatrix.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/msmatrix.h 2025-03-01 12:42:56.780648458 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/msmatrix.h 2025-08-26 18:15:43.690003640 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -40,7 +40,7 @@ namespace lsp void lr_to_ms(float *m, float *s, const float *l, const float *r, size_t count) { ARCH_AARCH64_ASM( - __ASM_EMIT("ldp q24, q25, [%[HALF]]") // v24 = 0.5, v25 = 0.5 + __ASM_EMIT("ldr q24, [%[HALF]]") // v24 = 0.5 // x16 blocks __ASM_EMIT("subs %[count], %[count], #16") __ASM_EMIT("b.lo 2f") @@ -58,13 +58,13 @@ namespace lsp __ASM_EMIT("fsub v22.4s, v2.4s, v6.4s") __ASM_EMIT("fsub v23.4s, v3.4s, v7.4s") __ASM_EMIT("fmul v0.4s, v16.4s, v24.4s") // v0 = (l + r)/2 - __ASM_EMIT("fmul v1.4s, v17.4s, v25.4s") + __ASM_EMIT("fmul v1.4s, v17.4s, v24.4s") __ASM_EMIT("fmul v2.4s, v18.4s, v24.4s") - __ASM_EMIT("fmul v3.4s, v19.4s, v25.4s") + __ASM_EMIT("fmul v3.4s, v19.4s, v24.4s") __ASM_EMIT("fmul v4.4s, v20.4s, v24.4s") // v4 = (l - r)/2 - __ASM_EMIT("fmul v5.4s, v21.4s, v25.4s") + __ASM_EMIT("fmul v5.4s, v21.4s, v24.4s") __ASM_EMIT("fmul v6.4s, v22.4s, v24.4s") - __ASM_EMIT("fmul v7.4s, v23.4s, v25.4s") + __ASM_EMIT("fmul v7.4s, v23.4s, v24.4s") __ASM_EMIT("stp q0, q1, [%[m], #0x00]") __ASM_EMIT("stp q2, q3, [%[m], #0x20]") __ASM_EMIT("stp q4, q5, [%[s], #0x00]") @@ -86,9 +86,9 @@ namespace lsp __ASM_EMIT("fsub v20.4s, v0.4s, v4.4s") // v20 = l - r __ASM_EMIT("fsub v21.4s, v1.4s, v5.4s") __ASM_EMIT("fmul v0.4s, v16.4s, v24.4s") // v0 = (l + r)/2 - __ASM_EMIT("fmul v1.4s, v17.4s, v25.4s") + __ASM_EMIT("fmul v1.4s, v17.4s, v24.4s") __ASM_EMIT("fmul v4.4s, v20.4s, v24.4s") // v4 = (l - r)/2 - __ASM_EMIT("fmul v5.4s, v21.4s, v25.4s") + __ASM_EMIT("fmul v5.4s, v21.4s, v24.4s") __ASM_EMIT("stp q0, q1, [%[m], #0x00]") __ASM_EMIT("stp q4, q5, [%[s], #0x00]") __ASM_EMIT("sub %[count], %[count], #8") @@ -142,7 +142,7 @@ namespace lsp "v4", "v5", "v6", "v7", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", - "v24", "v25" + "v24" ); } @@ -238,7 +238,7 @@ namespace lsp } #define LR_TO_PART(OP) \ - __ASM_EMIT("ldp q24, q25, [%[HALF]]") /* v24 = 0.5, v25 = 0.5 */ \ + __ASM_EMIT("ldr q24, [%[HALF]]") /* v24 = 0.5 */ \ /* x16 blocks */ \ __ASM_EMIT("subs %[count], %[count], #16") \ __ASM_EMIT("b.lo 2f") \ @@ -252,9 +252,9 @@ namespace lsp __ASM_EMIT(OP " v18.4s, v2.4s, v6.4s") \ __ASM_EMIT(OP " v19.4s, v3.4s, v7.4s") \ __ASM_EMIT("fmul v0.4s, v16.4s, v24.4s") /* v0 = (l op r)/2 */ \ - __ASM_EMIT("fmul v1.4s, v17.4s, v25.4s") \ + __ASM_EMIT("fmul v1.4s, v17.4s, v24.4s") \ __ASM_EMIT("fmul v2.4s, v18.4s, v24.4s") \ - __ASM_EMIT("fmul v3.4s, v19.4s, v25.4s") \ + __ASM_EMIT("fmul v3.4s, v19.4s, v24.4s") \ __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") \ __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") \ __ASM_EMIT("subs %[count], %[count], #16") \ @@ -271,7 +271,7 @@ namespace lsp __ASM_EMIT(OP " v16.4s, v0.4s, v4.4s") /* v16 = l op r */ \ __ASM_EMIT(OP " v17.4s, v1.4s, v5.4s") \ __ASM_EMIT("fmul v0.4s, v16.4s, v24.4s") /* v0 = (l op r)/2 */ \ - __ASM_EMIT("fmul v1.4s, v17.4s, v25.4s") \ + __ASM_EMIT("fmul v1.4s, v17.4s, v24.4s") \ __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") \ __ASM_EMIT("sub %[count], %[count], #8") \ __ASM_EMIT("add %[l], %[l], #0x20") \ @@ -318,7 +318,7 @@ namespace lsp "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", "v17", "v18", "v19", - "v24", "v25" + "v24" ); } @@ -333,7 +333,7 @@ namespace lsp "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", "v17", "v18", "v19", - "v24", "v25" + "v24" ); } @@ -429,7 +429,7 @@ namespace lsp } #undef MS_TO_PART - } -} + } /* namespace asimd */ +} /* namespace lsp */ #endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_MSMATRIX_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/cos.h 2025-08-26 18:15:43.694003602 +0000 @@ -0,0 +1,301 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_COS_H_ +#define PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_COS_H_ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL */ + +#include + +namespace lsp +{ + namespace asimd + { + void cosf1(float *dst, size_t count) + { + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + // x16 blocks + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("ldp q0, q1, [%[dst], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("ldp q2, q3, [%[dst], #0x20]") // v2 = x2, v3 = x3 + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + __ASM_EMIT("fsub v1.4s, v17.4s, v1.4s") // v1 = PI/2 - x1 + PI/2 + __ASM_EMIT("fsub v2.4s, v17.4s, v2.4s") // v2 = PI/2 - x2 + PI/2 + __ASM_EMIT("fsub v3.4s, v17.4s, v3.4s") // v3 = PI/2 - x3 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") + __ASM_EMIT("add %[dst], %[dst], #0x40") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("adds %[count], %[count], #8") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("ldp q0, q1, [%[dst], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + __ASM_EMIT("fsub v1.4s, v17.4s, v1.4s") // v1 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("sub %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 6f") + __ASM_EMIT("ldr q0, [%[dst], #0x00]") // v0 = x0 + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 14f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("ld1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("8:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 10f") + __ASM_EMIT("ld1 {v0.d}[1], [%[dst]]") + __ASM_EMIT("10:") + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 12f") + __ASM_EMIT("sub %[dst], %[dst], #0x04") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("12:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 14f") + __ASM_EMIT("st1 {v0.d}[1], [%[dst]]") + // End + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23" + ); + } + + void cosf2(float *dst, const float *src, size_t count) + { + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + // x16 blocks + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("ldp q0, q1, [%[src], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("ldp q2, q3, [%[src], #0x20]") // v2 = x2, v3 = x3 + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + __ASM_EMIT("fsub v1.4s, v17.4s, v1.4s") // v1 = PI/2 - x1 + PI/2 + __ASM_EMIT("fsub v2.4s, v17.4s, v2.4s") // v2 = PI/2 - x2 + PI/2 + __ASM_EMIT("fsub v3.4s, v17.4s, v3.4s") // v3 = PI/2 - x3 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") + __ASM_EMIT("add %[src], %[src], #0x40") + __ASM_EMIT("add %[dst], %[dst], #0x40") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("adds %[count], %[count], #8") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("ldp q0, q1, [%[src], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + __ASM_EMIT("fsub v1.4s, v17.4s, v1.4s") // v1 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("sub %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[src], %[src], #0x20") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 6f") + __ASM_EMIT("ldr q0, [%[src], #0x00]") // v0 = x0 + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[src], %[src], #0x10") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 14f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("ld1 {v0.s}[0], [%[src]]") + __ASM_EMIT("add %[src], %[src], #0x04") + __ASM_EMIT("8:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 10f") + __ASM_EMIT("ld1 {v0.d}[1], [%[src]]") + __ASM_EMIT("10:") + __ASM_EMIT("fsub v0.4s, v17.4s, v0.4s") // v0 = PI/2 - x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 12f") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("12:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 14f") + __ASM_EMIT("st1 {v0.d}[1], [%[dst]]") + // End + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23" + ); + } + + void cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + __ASM_EMIT("ld1r {v28.4s}, [%[k]]") /* v28 = k k k k */ + __ASM_EMIT("ld1r {v29.4s}, [%[p]]") /* v29 = p p p p */ + __ASM_EMIT("ldp q24, q25, [%[S2KP], #0x00]") /* v24 = 0 1 2 3, v25 = 4 5 6 7 */ + __ASM_EMIT("ldp q26, q27, [%[S2KP], #0x20]") /* v26 = 8 8 8 8, v27 = 4 4 4 4 */ + __ASM_EMIT("fsub v29.4s, v17.4s, v29.4s") /* v29 = PI/2 - p + PI/2 ... */ + // x16 blocks + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fmul v1.4s, v28.4s, v25.4s") // v1 = k*x1 + __ASM_EMIT("fadd v24.4s, v24.4s, v26.4s") // v24 = i0 + 8 + __ASM_EMIT("fadd v25.4s, v25.4s, v26.4s") // v25 = i1 + 8 + __ASM_EMIT("fsub v0.4s, v29.4s, v0.4s") // v0 = PI/2 - (k*x0 + p) + PI/2 + __ASM_EMIT("fsub v1.4s, v29.4s, v1.4s") // v1 = PI/2 - (k*x1 + p) + PI/2 + __ASM_EMIT("fmul v2.4s, v28.4s, v24.4s") // v2 = k*x2 + __ASM_EMIT("fmul v3.4s, v28.4s, v25.4s") // v3 = k*x3 + __ASM_EMIT("fadd v24.4s, v24.4s, v26.4s") // v24 = i0 + 8 + __ASM_EMIT("fadd v25.4s, v25.4s, v26.4s") // v25 = i1 + 8 + __ASM_EMIT("fsub v2.4s, v29.4s, v2.4s") // v2 = PI/2 - (k*x2 + p) + PI/2 + __ASM_EMIT("fsub v3.4s, v29.4s, v3.4s") // v3 = PI/2 - (k*x3 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") + __ASM_EMIT("add %[dst], %[dst], #0x40") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("adds %[count], %[count], #8") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fmul v1.4s, v28.4s, v25.4s") // v1 = k*x1 + __ASM_EMIT("fadd v24.4s, v24.4s, v26.4s") // v24 = i0 + 8 + __ASM_EMIT("fadd v25.4s, v25.4s, v26.4s") // v25 = i1 + 8 + __ASM_EMIT("fsub v0.4s, v29.4s, v0.4s") // v0 = PI/2 - (k*x0 + p) + PI/2 + __ASM_EMIT("fsub v1.4s, v29.4s, v1.4s") // v1 = PI/2 - (k*x1 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("sub %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 6f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fadd v24.4s, v24.4s, v27.4s") // v24 = i0 + 4 + __ASM_EMIT("fsub v0.4s, v29.4s, v0.4s") // v0 = PI/2 - (k*x0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 10f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fsub v0.4s, v29.4s, v0.4s") // v0 = PI/2 - (k*x0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("ext v0.16b, v0.16b, v0.16b, #4") // v0 = S1 S2 S3 S0 + __ASM_EMIT("8:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 10f") + __ASM_EMIT("st1 {v0.d}[0], [%[dst]]") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [k] "r" (&k), + [p] "r" (&p), + [S2C] "r" (&sinf_const[0]), + [S2KP] "r" (&kp_gen_const[0]) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23", + "v24", "v25", "v26", "v27", + "v28", "v29" + ); + } + + } /* namespace asimd */ +} /* namespace lsp */ + +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_COS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/lanczos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/lanczos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/lanczos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/lanczos.h 2025-08-26 18:15:43.694003602 +0000 @@ -0,0 +1,204 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 22 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_LANCZOS_H_ +#define PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_LANCZOS_H_ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL */ + +#include + +namespace lsp +{ + namespace asimd + { + IF_ARCH_AARCH64( + static const uint32_t lanczos_const[] __lsp_aligned16 = + { + LSP_DSP_VEC4(0x38d1b717), // +0x00: Sinc threshold = 1e-4 + LSP_DSP_VEC4(0x3f800000), // +0x10: 1.0 + }; + ) + + typedef struct lanczos_gen_t + { + float x1[8]; // +0x00: Computed X1 + float n[8]; // +0x20: Numerator + } lanczos_gen_t; + + #define LANCZOS_GEN_FUNC_X8 \ + /* v0 = x1[0] */ \ + /* v1 = x1[1] */ \ + __ASM_EMIT("fmul v2.4s, v0.4s, v27.4s") /* v2 = x2 = x1*a */ \ + __ASM_EMIT("fmul v3.4s, v1.4s, v27.4s") \ + __ASM_EMIT("fabs v4.4s, v0.4s") /* v4 = fabsf(x1) */ \ + __ASM_EMIT("fabs v5.4s, v1.4s") \ + __ASM_EMIT("fmul v8.4s, v0.4s, v2.4s") /* v8 = x1*x2 */ \ + __ASM_EMIT("fmul v9.4s, v1.4s, v3.4s") \ + __ASM_EMIT("frecpe v10.4s, v8.4s") /* v10 = s2 */ \ + __ASM_EMIT("frecpe v11.4s, v9.4s") \ + __ASM_EMIT("frecps v12.4s, v10.4s, v8.4s") /* v12 = (2 - R*s2) */ \ + __ASM_EMIT("frecps v13.4s, v11.4s, v9.4s") \ + __ASM_EMIT("fmul v10.4s, v12.4s, v10.4s") /* v10 = s2' = s2 * (2 - R*s2) */ \ + __ASM_EMIT("fmul v11.4s, v13.4s, v11.4s") \ + __ASM_EMIT("frecps v12.4s, v10.4s, v8.4s") /* v12 = (2 - R*s2') */ \ + __ASM_EMIT("frecps v13.4s, v11.4s, v9.4s") \ + __ASM_EMIT("fmul v8.4s, v12.4s, v10.4s") /* v8 = n = 1/(x1*x2) */ \ + __ASM_EMIT("fmul v9.4s, v13.4s, v11.4s") \ + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") /* v0 = x1 + PI/2 */ \ + __ASM_EMIT("fadd v1.4s, v1.4s, v16.4s") \ + __ASM_EMIT("fadd v2.4s, v2.4s, v16.4s") /* v2 = x2 + PI/2 */ \ + __ASM_EMIT("fadd v3.4s, v3.4s, v16.4s") \ + __ASM_EMIT("stp q4, q5, [%[state], 0x00]") /* save fabfs(x1) */ \ + __ASM_EMIT("stp q8, q9, [%[state], 0x20]") /* save n */ \ + SINF_X_PLUS_PI_2_CORE_X16 \ + /* v0 = sinf(x1[0]), v1 = sinf(x1[1]) */ \ + /* v2 = sinf(x2[0]), v3 = sinf(x2[1]) */ \ + __ASM_EMIT("ldp q4, q5, [%[state], 0x00]") /* v4 = fabsf(x1) */ \ + __ASM_EMIT("ldp q6, q7, [%[state], 0x20]") /* v6 = n = 1/(x1*x2) */ \ + __ASM_EMIT("ldp q8, q9, [%[LC]]") /* v8 = 1e-4, v9 = 1.0 */ \ + __ASM_EMIT("fmul v0.4s, v0.4s, v2.4s") /* v0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("fmul v1.4s, v1.4s, v3.4s") \ + __ASM_EMIT("fcmge v2.4s, v4.4s, v8.4s") /* v2 = [ fabsf(x1) >= 1e-4 ] */ \ + __ASM_EMIT("fcmge v3.4s, v5.4s, v8.4s") \ + __ASM_EMIT("fmul v0.4s, v0.4s, v6.4s") /* v6 = sinf(x1)*sinf(x2)/(x1*x2) */ \ + __ASM_EMIT("fmul v1.4s, v1.4s, v7.4s") \ + __ASM_EMIT("fcmgt v4.4s, v26.4s, v4.4s") /* v4 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("fcmgt v5.4s, v26.4s, v5.4s") \ + __ASM_EMIT("bif v0.16b, v9.16b, v2.16b") /* v0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("bif v1.16b, v9.16b, v3.16b") \ + __ASM_EMIT("and v0.16b, v0.16b, v4.16b") /* v0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ \ + __ASM_EMIT("and v1.16b, v1.16b, v5.16b") + + #define LANCZOS_GEN_FUNC_X4 \ + /* v0 = x1 */ \ + __ASM_EMIT("fmul v1.4s, v0.4s, v27.4s") /* v1 = x2 = x1*a */ \ + __ASM_EMIT("fabs v2.4s, v0.4s") /* v2 = fabsf(x1) */ \ + __ASM_EMIT("fmul v3.4s, v0.4s, v1.4s") /* v3 = x1*x2 */ \ + __ASM_EMIT("frecpe v10.4s, v3.4s") /* v10 = s2 */ \ + __ASM_EMIT("frecps v12.4s, v10.4s, v3.4s") /* v12 = (2 - R*s2) */ \ + __ASM_EMIT("fmul v10.4s, v12.4s, v10.4s") /* v10 = s2' = s2 * (2 - R*s2) */ \ + __ASM_EMIT("frecps v12.4s, v10.4s, v3.4s") /* v12 = (2 - R*s2') */ \ + __ASM_EMIT("fmul v3.4s, v12.4s, v10.4s") /* v3 = n = 1/(x1*x2) */ \ + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") /* v0 = x1 + PI/2 */ \ + __ASM_EMIT("fadd v1.4s, v1.4s, v16.4s") /* v1 = x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X8 \ + /* v0 = sinf(x1), v1 = sinf(x2) */ \ + __ASM_EMIT("ldp q8, q9, [%[LC]]") /* v8 = 1e-4, v9 = 1.0 */ \ + __ASM_EMIT("fmul v0.4s, v0.4s, v1.4s") /* v0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("fcmge v4.4s, v2.4s, v8.4s") /* v4 = [ fabsf(x1) >= 1e-4 ] */ \ + __ASM_EMIT("fmul v0.4s, v0.4s, v3.4s") /* v0 = sinf(x1)*sinf(x2)/(x1*x2) */ \ + __ASM_EMIT("fcmgt v5.4s, v26.4s, v2.4s") /* v5 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("bif v0.16b, v9.16b, v4.16b") /* v0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("and v0.16b, v0.16b, v5.16b") /* v0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + + void lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + IF_ARCH_AARCH64( + lanczos_gen_t state; + ); + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + __ASM_EMIT("ld1r {v24.4s}, [%[k]]") /* v24 = k */ + __ASM_EMIT("ld1r {v25.4s}, [%[p]]") /* v25 = p */ + __ASM_EMIT("ld1r {v26.4s}, [%[t]]") /* v26 = t */ + __ASM_EMIT("ld1r {v27.4s}, [%[a]]") /* v27 = a */ + __ASM_EMIT("ldp q28, q29, [%[S2KP], #0x00]") /* v28 = i0 = 0 1 2 3, v29 = i1 = 4 5 6 7 */ + __ASM_EMIT("ldp q30, q31, [%[S2KP], #0x20]") /* v30 = s0 = 8 8 8 8, v31 = s1 = 4 4 4 4 */ + // x8 blocks + __ASM_EMIT("subs %[count], %[count], #8") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*i0 + __ASM_EMIT("fmul v1.4s, v29.4s, v24.4s") // v1 = k*i1 + __ASM_EMIT("fadd v28.4s, v28.4s, v30.4s") // v28 = i0 + step + __ASM_EMIT("fadd v29.4s, v29.4s, v30.4s") // v29 = i1 + step + __ASM_EMIT("fsub v0.4s, v0.4s, v25.4s") // v0 = k*i0 - p + __ASM_EMIT("fsub v1.4s, v1.4s, v25.4s") // v1 = k*i1 - p + LANCZOS_GEN_FUNC_X8 + __ASM_EMIT("subs %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*i0 + __ASM_EMIT("fadd v28.4s, v28.4s, v31.4s") // v28 = i0 + step + __ASM_EMIT("fsub v0.4s, v0.4s, v25.4s") // v0 = k*i0 - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 8f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*i0 + __ASM_EMIT("fsub v0.4s, v0.4s, v25.4s") // v0 = k*i0 - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 6f") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("ext v0.16b, v0.16b, v0.16b, #4") // v0 = S1 S2 S3 S0 + __ASM_EMIT("6:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("st1 {v0.d}[0], [%[dst]]") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [k] "r" (&k), + [p] "r" (&p), + [t] "r" (&t), + [a] "r" (&a), + [S2C] "r" (&sinf_const[0]), + [S2KP] "r" (&kp_gen_const[0]), + [LC] "r" (&lanczos_const[0]), + [state] "r" (&state) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23", + "v24", "v25", "v26", "v27", + "v28", "v29", "v30", "v31" + ); + } + + } /* namespace asimd */ +} /* namespace lsp */ + + + + +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_LANCZOS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath/sin.h 2025-08-26 18:15:43.694003602 +0000 @@ -0,0 +1,502 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 13 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_SIN_H_ +#define PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_SIN_H_ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL */ + +namespace lsp +{ + namespace asimd + { + IF_ARCH_AARCH64( + static const float kp_gen_const[] __lsp_aligned16 = + { + 0.0f, 1.0f, 2.0f, 3.0f, // +0x00: Initial values + 4.0f, 5.0f, 6.0f, 7.0f, + LSP_DSP_VEC4(8.0), // +0x20: Step x8 + LSP_DSP_VEC4(4.0), // +0x30: Step x4 + }; + + static const uint32_t sinf_const[] __lsp_aligned16 = + { + LSP_DSP_VEC4(0x3fc90fdb), // +0x000: PI/2 + LSP_DSP_VEC4(0x40490fdb), // +0x010: PI + LSP_DSP_VEC4(0x3e22f983), // +0x020: 1/(2*PI) + LSP_DSP_VEC4(0xb2d7322b), // +0x030: C0 = -1/11! = -2.50521083854e-08 + LSP_DSP_VEC4(0x3638ef1d), // +0x040: C1 = 1/9! = 2.7557319224e-06 + LSP_DSP_VEC4(0xb9500d01), // +0x050: C2 = -1/7! = -0.000198412698413 + LSP_DSP_VEC4(0x3c088889), // +0x060: C3 = 1/5! = 0.00833333333333 + LSP_DSP_VEC4(0xbe2aaaab), // +0x070: C4 = -1/3! = -0.166666666667 + }; + ) + + #define SINF_X_PLUS_PI_2_CORE_X16 \ + /* v0 = X0 = x0 + PI/2 */ \ + /* v1 = X1 = x1 + PI/2 */ \ + /* v2 = X2 = x2 + PI/2 */ \ + /* v3 = X3 = x3 + PI/2 */ \ + /* v16 = PI/2 */ \ + /* v17 = PI */ \ + /* v18 = 1/(2*PI) */ \ + /* v19 = C0 */ \ + /* v20 = C1 */ \ + /* v21 = C2 */ \ + /* v22 = C3 */ \ + /* v23 = C4 */ \ + __ASM_EMIT("fmul v4.4s, v0.4s, v18.4s") /* v4 = x / (2*PI) */ \ + __ASM_EMIT("fmul v5.4s, v1.4s, v18.4s") \ + __ASM_EMIT("fmul v6.4s, v2.4s, v18.4s") \ + __ASM_EMIT("fmul v7.4s, v3.4s, v18.4s") \ + __ASM_EMIT("fcvtms v8.4s, v4.4s") /* v8 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("fcvtms v9.4s, v5.4s") \ + __ASM_EMIT("fcvtms v10.4s, v6.4s") \ + __ASM_EMIT("fcvtms v11.4s, v7.4s") \ + __ASM_EMIT("fadd v12.4s, v17.4s, v17.4s") /* v12 = 2*PI */ \ + __ASM_EMIT("scvtf v8.4s, v8.4s") /* v8 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("scvtf v9.4s, v9.4s") \ + __ASM_EMIT("scvtf v10.4s, v10.4s") \ + __ASM_EMIT("scvtf v11.4s, v11.4s") \ + __ASM_EMIT("fmls v0.4s, v8.4s, v12.4s") /* v0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("fmls v1.4s, v9.4s, v12.4s") \ + __ASM_EMIT("fmls v2.4s, v10.4s, v12.4s") \ + __ASM_EMIT("fmls v3.4s, v11.4s, v12.4s") \ + __ASM_EMIT("fadd v12.4s, v16.4s, v17.4s") /* v12 = 3*PI/2 */ \ + __ASM_EMIT("fcmge v4.4s, v0.4s, v17.4s") /* v4 = [ Y >= PI ] */ \ + __ASM_EMIT("fcmge v5.4s, v1.4s, v17.4s") \ + __ASM_EMIT("fcmge v6.4s, v2.4s, v17.4s") \ + __ASM_EMIT("fcmge v7.4s, v3.4s, v17.4s") \ + __ASM_EMIT("fsub v8.4s, v12.4s, v0.4s") /* v8 = 3*PI/2 - Y */ \ + __ASM_EMIT("fsub v9.4s, v12.4s, v1.4s") \ + __ASM_EMIT("fsub v10.4s, v12.4s, v2.4s") \ + __ASM_EMIT("fsub v11.4s, v12.4s, v3.4s") \ + __ASM_EMIT("fsub v0.4s, v0.4s, v16.4s") /* v0 = Y - PI/2 */ \ + __ASM_EMIT("fsub v1.4s, v1.4s, v16.4s") \ + __ASM_EMIT("fsub v2.4s, v2.4s, v16.4s") \ + __ASM_EMIT("fsub v3.4s, v3.4s, v16.4s") \ + __ASM_EMIT("bit v0.16b, v8.16b, v4.16b") /* v0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("bit v1.16b, v9.16b, v5.16b") \ + __ASM_EMIT("bit v2.16b, v10.16b, v6.16b") \ + __ASM_EMIT("bit v3.16b, v11.16b, v7.16b") \ + /* v0 = XX */ \ + __ASM_EMIT("fmul v4.4s, v0.4s, v0.4s") /* v4 = X2 = XX*XX */ \ + __ASM_EMIT("fmul v5.4s, v1.4s, v1.4s") \ + __ASM_EMIT("fmul v6.4s, v2.4s, v2.4s") \ + __ASM_EMIT("fmul v7.4s, v3.4s, v3.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v19.4s") /* v8 = X2*C0 */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v19.4s") \ + __ASM_EMIT("fmul v10.4s, v6.4s, v19.4s") \ + __ASM_EMIT("fmul v11.4s, v7.4s, v19.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v20.4s") /* v8 = C1 + X2*C0 */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v20.4s") \ + __ASM_EMIT("fadd v10.4s, v10.4s, v20.4s") \ + __ASM_EMIT("fadd v11.4s, v11.4s, v20.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fmul v10.4s, v6.4s, v10.4s") \ + __ASM_EMIT("fmul v11.4s, v7.4s, v11.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v21.4s") /* v8 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v21.4s") \ + __ASM_EMIT("fadd v10.4s, v10.4s, v21.4s") \ + __ASM_EMIT("fadd v11.4s, v11.4s, v21.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fmul v10.4s, v6.4s, v10.4s") \ + __ASM_EMIT("fmul v11.4s, v7.4s, v11.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v22.4s") /* v8 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v22.4s") \ + __ASM_EMIT("fadd v10.4s, v10.4s, v22.4s") \ + __ASM_EMIT("fadd v11.4s, v11.4s, v22.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fmul v10.4s, v6.4s, v10.4s") \ + __ASM_EMIT("fmul v11.4s, v7.4s, v11.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v23.4s") /* v8 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v23.4s") \ + __ASM_EMIT("fadd v10.4s, v10.4s, v23.4s") \ + __ASM_EMIT("fadd v11.4s, v11.4s, v23.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fmul v10.4s, v6.4s, v10.4s") \ + __ASM_EMIT("fmul v11.4s, v7.4s, v11.4s") \ + __ASM_EMIT("fmla v0.4s, v0.4s, v8.4s") /* v0 = XX*(1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("fmla v1.4s, v1.4s, v9.4s") \ + __ASM_EMIT("fmla v2.4s, v2.4s, v10.4s") \ + __ASM_EMIT("fmla v3.4s, v3.4s, v11.4s") + + #define SINF_X_PLUS_PI_2_CORE_X8 \ + /* v0 = X0 = x0 + PI/2 */ \ + /* v1 = X1 = x1 + PI/2 */ \ + /* v16 = PI/2 */ \ + /* v17 = PI */ \ + /* v18 = 1/(2*PI) */ \ + /* v19 = C0 */ \ + /* v20 = C1 */ \ + /* v21 = C2 */ \ + /* v22 = C3 */ \ + /* v23 = C4 */ \ + __ASM_EMIT("fmul v4.4s, v0.4s, v18.4s") /* v4 = x / (2*PI) */ \ + __ASM_EMIT("fmul v5.4s, v1.4s, v18.4s") \ + __ASM_EMIT("fcvtms v8.4s, v4.4s") /* v8 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("fcvtms v9.4s, v5.4s") \ + __ASM_EMIT("fadd v12.4s, v17.4s, v17.4s") /* v12 = 2*PI */ \ + __ASM_EMIT("scvtf v8.4s, v8.4s") /* v8 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("scvtf v9.4s, v9.4s") \ + __ASM_EMIT("fmls v0.4s, v8.4s, v12.4s") /* v0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("fmls v1.4s, v9.4s, v12.4s") \ + __ASM_EMIT("fadd v12.4s, v16.4s, v17.4s") /* v12 = 3*PI/2 */ \ + __ASM_EMIT("fcmge v4.4s, v0.4s, v17.4s") /* v4 = [ Y >= PI ] */ \ + __ASM_EMIT("fcmge v5.4s, v1.4s, v17.4s") \ + __ASM_EMIT("fsub v8.4s, v12.4s, v0.4s") /* v8 = 3*PI/2 - Y */ \ + __ASM_EMIT("fsub v9.4s, v12.4s, v1.4s") \ + __ASM_EMIT("fsub v0.4s, v0.4s, v16.4s") /* v0 = Y - PI/2 */ \ + __ASM_EMIT("fsub v1.4s, v1.4s, v16.4s") \ + __ASM_EMIT("bit v0.16b, v8.16b, v4.16b") /* v0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("bit v1.16b, v9.16b, v5.16b") \ + /* v0 = XX */ \ + __ASM_EMIT("fmul v4.4s, v0.4s, v0.4s") /* v4 = X2 = XX*XX */ \ + __ASM_EMIT("fmul v5.4s, v1.4s, v1.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v19.4s") /* v8 = X2*C0 */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v19.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v20.4s") /* v8 = C1 + X2*C0 */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v20.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v21.4s") /* v8 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v21.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v22.4s") /* v8 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v22.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fadd v8.4s, v8.4s, v23.4s") /* v8 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("fadd v9.4s, v9.4s, v23.4s") \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("fmul v9.4s, v5.4s, v9.4s") \ + __ASM_EMIT("fmla v0.4s, v0.4s, v8.4s") /* v0 = XX*(1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("fmla v1.4s, v1.4s, v9.4s") + + #define SINF_X_PLUS_PI_2_CORE_X4 \ + /* v0 = X = x + PI/2 */ \ + /* v16 = PI/2 */ \ + /* v17 = PI */ \ + /* v18 = 1/(2*PI) */ \ + /* v19 = C0 */ \ + /* v20 = C1 */ \ + /* v21 = C2 */ \ + /* v22 = C3 */ \ + /* v23 = C4 */ \ + __ASM_EMIT("fmul v4.4s, v0.4s, v18.4s") /* v4 = x / (2*PI) */ \ + __ASM_EMIT("fcvtms v8.4s, v4.4s") /* v8 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("fadd v12.4s, v17.4s, v17.4s") /* v12 = 2*PI */ \ + __ASM_EMIT("scvtf v8.4s, v8.4s") /* v8 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("fmls v0.4s, v8.4s, v12.4s") /* v0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("fadd v12.4s, v16.4s, v17.4s") /* v12 = 3*PI/2 */ \ + __ASM_EMIT("fcmge v4.4s, v0.4s, v17.4s") /* v4 = [ Y >= PI ] */ \ + __ASM_EMIT("fsub v8.4s, v12.4s, v0.4s") /* v8 = 3*PI/2 - Y */ \ + __ASM_EMIT("fsub v0.4s, v0.4s, v16.4s") /* v0 = Y - PI/2 */ \ + __ASM_EMIT("bit v0.16b, v8.16b, v4.16b") /* v0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* v0 = XX */ \ + __ASM_EMIT("fmul v4.4s, v0.4s, v0.4s") /* v4 = X2 = XX*XX */ \ + __ASM_EMIT("fmul v8.4s, v4.4s, v19.4s") /* v8 = X2*C0 */ \ + __ASM_EMIT("fadd v8.4s, v8.4s, v20.4s") /* v8 = C1 + X2*C0 */ \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("fadd v8.4s, v8.4s, v21.4s") /* v8 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("fadd v8.4s, v8.4s, v22.4s") /* v8 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("fadd v8.4s, v8.4s, v23.4s") /* v8 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("fmul v8.4s, v4.4s, v8.4s") /* v8 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("fmla v0.4s, v0.4s, v8.4s") /* v0 = XX*(1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + void sinf1(float *dst, size_t count) + { + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + // x16 blocks + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("ldp q0, q1, [%[dst], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("ldp q2, q3, [%[dst], #0x20]") // v2 = x2, v3 = x3 + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + __ASM_EMIT("fadd v1.4s, v1.4s, v16.4s") // v1 = x1 + PI/2 + __ASM_EMIT("fadd v2.4s, v2.4s, v16.4s") // v2 = x2 + PI/2 + __ASM_EMIT("fadd v3.4s, v3.4s, v16.4s") // v3 = x3 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") + __ASM_EMIT("add %[dst], %[dst], #0x40") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("adds %[count], %[count], #8") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("ldp q0, q1, [%[dst], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + __ASM_EMIT("fadd v1.4s, v1.4s, v16.4s") // v1 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("sub %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 6f") + __ASM_EMIT("ldr q0, [%[dst], #0x00]") // v0 = x0 + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 14f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("ld1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("8:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 10f") + __ASM_EMIT("ld1 {v0.d}[1], [%[dst]]") + __ASM_EMIT("10:") + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 12f") + __ASM_EMIT("sub %[dst], %[dst], #0x04") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("12:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 14f") + __ASM_EMIT("st1 {v0.d}[1], [%[dst]]") + // End + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23" + ); + } + + void sinf2(float *dst, const float *src, size_t count) + { + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + // x16 blocks + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("ldp q0, q1, [%[src], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("ldp q2, q3, [%[src], #0x20]") // v2 = x2, v3 = x3 + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + __ASM_EMIT("fadd v1.4s, v1.4s, v16.4s") // v1 = x1 + PI/2 + __ASM_EMIT("fadd v2.4s, v2.4s, v16.4s") // v2 = x2 + PI/2 + __ASM_EMIT("fadd v3.4s, v3.4s, v16.4s") // v3 = x3 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") + __ASM_EMIT("add %[src], %[src], #0x40") + __ASM_EMIT("add %[dst], %[dst], #0x40") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("adds %[count], %[count], #8") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("ldp q0, q1, [%[src], #0x00]") // v0 = x0, v1 = x1 + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + __ASM_EMIT("fadd v1.4s, v1.4s, v16.4s") // v1 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("sub %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[src], %[src], #0x20") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 6f") + __ASM_EMIT("ldr q0, [%[src], #0x00]") // v0 = x0 + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[src], %[src], #0x10") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 14f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("ld1 {v0.s}[0], [%[src]]") + __ASM_EMIT("add %[src], %[src], #0x04") + __ASM_EMIT("8:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 10f") + __ASM_EMIT("ld1 {v0.d}[1], [%[src]]") + __ASM_EMIT("10:") + __ASM_EMIT("fadd v0.4s, v0.4s, v16.4s") // v0 = x0 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 12f") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("12:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 14f") + __ASM_EMIT("st1 {v0.d}[1], [%[dst]]") + // End + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23" + ); + } + + void sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_AARCH64_ASM( + __ASM_EMIT("ldp q16, q17, [%[S2C], #0x00]") /* v16 = PI/2, v17 = PI */ + __ASM_EMIT("ldp q18, q19, [%[S2C], #0x20]") /* v18 = 1/(2*PI), v19 = C0 */ + __ASM_EMIT("ldp q20, q21, [%[S2C], #0x40]") /* v20 = C1, v21 = C2 */ + __ASM_EMIT("ldp q22, q23, [%[S2C], #0x60]") /* v22 = C3, v23 = C4 */ + __ASM_EMIT("ld1r {v28.4s}, [%[k]]") /* v28 = k k k k */ + __ASM_EMIT("ld1r {v29.4s}, [%[p]]") /* v29 = p p p p */ + __ASM_EMIT("ldp q24, q25, [%[S2KP], #0x00]") /* v24 = 0 1 2 3, v25 = 4 5 6 7 */ + __ASM_EMIT("ldp q26, q27, [%[S2KP], #0x20]") /* v26 = 8 8 8 8, v27 = 4 4 4 4 */ + __ASM_EMIT("fadd v29.4s, v29.4s, v16.4s") /* v29 = p + PI/2 ... */ + // x16 blocks + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("b.lo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fmul v1.4s, v28.4s, v25.4s") // v1 = k*x1 + __ASM_EMIT("fadd v24.4s, v24.4s, v26.4s") // v24 = i0 + 8 + __ASM_EMIT("fadd v25.4s, v25.4s, v26.4s") // v25 = i1 + 8 + __ASM_EMIT("fadd v0.4s, v0.4s, v29.4s") // v0 = k*x0 + p + PI/2 + __ASM_EMIT("fadd v1.4s, v1.4s, v29.4s") // v1 = k*x1 + p + PI/2 + __ASM_EMIT("fmul v2.4s, v28.4s, v24.4s") // v2 = k*x2 + __ASM_EMIT("fmul v3.4s, v28.4s, v25.4s") // v3 = k*x3 + __ASM_EMIT("fadd v24.4s, v24.4s, v26.4s") // v24 = i0 + 8 + __ASM_EMIT("fadd v25.4s, v25.4s, v26.4s") // v25 = i1 + 8 + __ASM_EMIT("fadd v2.4s, v2.4s, v29.4s") // v2 = k*x2 + p + PI/2 + __ASM_EMIT("fadd v3.4s, v3.4s, v29.4s") // v3 = k*x3 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("subs %[count], %[count], #16") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("stp q2, q3, [%[dst], #0x20]") + __ASM_EMIT("add %[dst], %[dst], #0x40") + __ASM_EMIT("b.hs 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("adds %[count], %[count], #8") + __ASM_EMIT("b.lt 4f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fmul v1.4s, v28.4s, v25.4s") // v1 = k*x1 + __ASM_EMIT("fadd v24.4s, v24.4s, v26.4s") // v24 = i0 + 8 + __ASM_EMIT("fadd v25.4s, v25.4s, v26.4s") // v25 = i1 + 8 + __ASM_EMIT("fadd v0.4s, v0.4s, v29.4s") // v0 = k*x0 + p + PI/2 + __ASM_EMIT("fadd v1.4s, v1.4s, v29.4s") // v1 = k*x1 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("sub %[count], %[count], #8") + __ASM_EMIT("stp q0, q1, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x20") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.lt 6f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fadd v24.4s, v24.4s, v27.4s") // v24 = i0 + 4 + __ASM_EMIT("fadd v0.4s, v0.4s, v29.4s") // v0 = k*x0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], %[count], #4") + __ASM_EMIT("str q0, [%[dst], #0x00]") + __ASM_EMIT("add %[dst], %[dst], #0x10") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], %[count], #4") + __ASM_EMIT("b.ls 10f") + __ASM_EMIT("fmul v0.4s, v28.4s, v24.4s") // v0 = k*x0 + __ASM_EMIT("fadd v0.4s, v0.4s, v29.4s") // v0 = k*x0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("b.eq 8f") + __ASM_EMIT("st1 {v0.s}[0], [%[dst]]") + __ASM_EMIT("add %[dst], %[dst], #0x04") + __ASM_EMIT("ext v0.16b, v0.16b, v0.16b, #4") // v0 = S1 S2 S3 S0 + __ASM_EMIT("8:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("b.eq 10f") + __ASM_EMIT("st1 {v0.d}[0], [%[dst]]") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [k] "r" (&k), + [p] "r" (&p), + [S2C] "r" (&sinf_const[0]), + [S2KP] "r" (&kp_gen_const[0]) + : "cc", "memory", + "v0", "v1", "v2", "v3", + "v4", "v5", "v6", "v7", + "v8", "v9", "v10", "v11", + "v12", "v13", "v14", "v15", + "v16", "v17", "v18", "v19", + "v20", "v21", "v22", "v23", + "v24", "v25", "v26", "v27", + "v28", "v29" + ); + } + + } /* namespace asimd */ +} /* namespace lsp */ + + + +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_SIN_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/aarch64/asimd/pmath.h 2025-08-26 18:15:43.694003602 +0000 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 13 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_H_ +#define PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_H_ + +#ifndef PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_IMPL */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* PRIVATE_DSP_ARCH_AARCH64_ASIMD_PMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/msmatrix.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/msmatrix.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/msmatrix.h 2025-03-01 12:42:56.784648435 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/msmatrix.h 2025-08-26 18:15:43.702003524 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -41,138 +41,79 @@ namespace lsp { ARCH_ARM_ASM ( - __ASM_EMIT("subs %[count], #24") - __ASM_EMIT("vld1.32 {q0-q1}, [%[X_HALF]]") // q0 = 0.5, q1 = 0.5 + __ASM_EMIT("subs %[count], #16") + __ASM_EMIT("vld1.32 {q12}, [%[X_HALF]]") // q12 = 0.5 __ASM_EMIT("blo 2f") - // x24 blocks + // x16 blocks __ASM_EMIT("1:") - __ASM_EMIT("vld1.32 {q2-q3}, [%[left]]!") // q2 = l, q3 = l - __ASM_EMIT("vld1.32 {q4-q5}, [%[right]]!") // q4 = r, q5 = r - __ASM_EMIT("vmov q14, q2") // q14 = l - __ASM_EMIT("vmov q15, q3") // q15 = r - __ASM_EMIT("vld1.32 {q6-q7}, [%[left]]!") - __ASM_EMIT("vld1.32 {q8-q9}, [%[right]]!") - __ASM_EMIT("vadd.f32 q2, q2, q4") // q2 = l + r - __ASM_EMIT("vadd.f32 q3, q3, q5") // q3 = l + r - __ASM_EMIT("vld1.32 {q10-q11}, [%[left]]!") - __ASM_EMIT("vld1.32 {q12-q13}, [%[right]]!") - __ASM_EMIT("vsub.f32 q4, q14, q4") // q4 = l - r - __ASM_EMIT("vsub.f32 q5, q15, q5") // q5 = l - r - __ASM_EMIT("vmul.f32 q2, q0") // q2 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q3, q1") // q3 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q4, q0") // q4 = (l - r) * 0.5f - __ASM_EMIT("vmul.f32 q5, q1") // q5 = (l - r) * 0.5f - __ASM_EMIT("vmov q14, q6") - __ASM_EMIT("vmov q15, q7") - __ASM_EMIT("vst1.32 {q2-q3}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q4-q5}, [%[side]]!") - __ASM_EMIT("vadd.f32 q6, q6, q8") - __ASM_EMIT("vadd.f32 q7, q7, q9") - __ASM_EMIT("vsub.f32 q8, q14, q8") - __ASM_EMIT("vsub.f32 q9, q15, q9") - __ASM_EMIT("vmul.f32 q6, q0") - __ASM_EMIT("vmul.f32 q7, q1") - __ASM_EMIT("vmul.f32 q8, q0") - __ASM_EMIT("vmul.f32 q9, q1") - __ASM_EMIT("vmov q14, q10") - __ASM_EMIT("vmov q15, q11") - __ASM_EMIT("vst1.32 {q6-q7}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q8-q9}, [%[side]]!") - __ASM_EMIT("vadd.f32 q10, q10, q12") - __ASM_EMIT("vadd.f32 q11, q11, q13") - __ASM_EMIT("vsub.f32 q12, q14, q12") - __ASM_EMIT("vsub.f32 q13, q15, q13") - __ASM_EMIT("vmul.f32 q10, q0") - __ASM_EMIT("vmul.f32 q11, q1") - __ASM_EMIT("vmul.f32 q12, q0") - __ASM_EMIT("vmul.f32 q13, q1") - __ASM_EMIT("vst1.32 {q10-q11}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q12-q13}, [%[side]]!") - __ASM_EMIT("subs %[count], #24") + __ASM_EMIT("vldm %[left]!, {q0-q3}") // q0 = l + __ASM_EMIT("vldm %[right]!, {q4-q7}") // q4 = r + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = l - r + __ASM_EMIT("vsub.f32 q9, q1, q5") + __ASM_EMIT("vsub.f32 q10, q2, q6") + __ASM_EMIT("vsub.f32 q11, q3, q7") + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l + r + __ASM_EMIT("vadd.f32 q1, q1, q5") + __ASM_EMIT("vadd.f32 q2, q2, q6") + __ASM_EMIT("vadd.f32 q3, q3, q7") + __ASM_EMIT("vmul.f32 q4, q8, q12") // q4 = (l - r) * 0.5f + __ASM_EMIT("vmul.f32 q5, q9, q12") + __ASM_EMIT("vmul.f32 q6, q10, q12") + __ASM_EMIT("vmul.f32 q7, q11, q12") + __ASM_EMIT("vmul.f32 q0, q0, q12") // q0 = (l + r) * 0.5f + __ASM_EMIT("vmul.f32 q1, q1, q12") + __ASM_EMIT("vmul.f32 q2, q2, q12") + __ASM_EMIT("vmul.f32 q3, q3, q12") + __ASM_EMIT("vstm %[mid]!, {q0-q3}") + __ASM_EMIT("vstm %[side]!, {q4-q7}") + __ASM_EMIT("subs %[count], #16") __ASM_EMIT("bhs 1b") - // x16 block - __ASM_EMIT("2:") - __ASM_EMIT("adds %[count], #8") // 24 - 16 - __ASM_EMIT("blt 4f") - __ASM_EMIT("vld1.32 {q2-q3}, [%[left]]!") // q2 = l, q3 = l - __ASM_EMIT("vld1.32 {q4-q5}, [%[right]]!") // q4 = r, q5 = r - __ASM_EMIT("vld1.32 {q6-q7}, [%[left]]!") - __ASM_EMIT("vld1.32 {q8-q9}, [%[right]]!") - __ASM_EMIT("vmov q14, q2") // q14 = l - __ASM_EMIT("vmov q15, q3") // q15 = r - __ASM_EMIT("vadd.f32 q2, q2, q4") // q2 = l + r - __ASM_EMIT("vadd.f32 q3, q3, q5") // q3 = l + r - __ASM_EMIT("vsub.f32 q4, q14, q4") // q4 = l - r - __ASM_EMIT("vsub.f32 q5, q15, q5") // q5 = l - r - __ASM_EMIT("vmul.f32 q2, q0") // q2 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q3, q1") // q3 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q4, q0") // q4 = (l - r) * 0.5f - __ASM_EMIT("vmul.f32 q5, q1") // q5 = (l - r) * 0.5f - __ASM_EMIT("vmov q14, q6") - __ASM_EMIT("vmov q15, q7") - __ASM_EMIT("vadd.f32 q6, q6, q8") - __ASM_EMIT("vadd.f32 q7, q7, q9") - __ASM_EMIT("vsub.f32 q8, q14, q8") - __ASM_EMIT("vsub.f32 q9, q15, q9") - __ASM_EMIT("vmul.f32 q6, q0") - __ASM_EMIT("vmul.f32 q7, q1") - __ASM_EMIT("vmul.f32 q8, q0") - __ASM_EMIT("vmul.f32 q9, q1") - __ASM_EMIT("vst1.32 {q2-q3}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q4-q5}, [%[side]]!") - __ASM_EMIT("vst1.32 {q6-q7}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q8-q9}, [%[side]]!") - __ASM_EMIT("sub %[count], #16") // x8 block - __ASM_EMIT("4:") + __ASM_EMIT("2:") __ASM_EMIT("adds %[count], #8") // 16 - 8 - __ASM_EMIT("blt 6f") - __ASM_EMIT("vld1.32 {q2-q3}, [%[left]]!") // q2 = l, q3 = l - __ASM_EMIT("vld1.32 {q4-q5}, [%[right]]!") // q4 = r, q5 = r - __ASM_EMIT("vmov q14, q2") // q14 = l - __ASM_EMIT("vmov q15, q3") // q15 = r - __ASM_EMIT("vadd.f32 q2, q2, q4") // q2 = l + r - __ASM_EMIT("vadd.f32 q3, q3, q5") // q3 = l + r - __ASM_EMIT("vsub.f32 q4, q14, q4") // q4 = l - r - __ASM_EMIT("vsub.f32 q5, q15, q5") // q5 = l - r - __ASM_EMIT("vmul.f32 q2, q0") // q2 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q3, q1") // q3 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q4, q0") // q4 = (l - r) * 0.5f - __ASM_EMIT("vmul.f32 q5, q1") // q5 = (l - r) * 0.5f - __ASM_EMIT("vst1.32 {q2-q3}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q4-q5}, [%[side]]!") + __ASM_EMIT("blt 4f") + __ASM_EMIT("vldm %[left]!, {q0-q1}") // q0 = l + __ASM_EMIT("vldm %[right]!, {q4-q5}") // q4 = r + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = l - r + __ASM_EMIT("vsub.f32 q9, q1, q5") + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l + r + __ASM_EMIT("vadd.f32 q1, q1, q5") + __ASM_EMIT("vmul.f32 q4, q8, q12") // q4 = (l - r) * 0.5f + __ASM_EMIT("vmul.f32 q5, q9, q12") + __ASM_EMIT("vmul.f32 q0, q0, q12") // q0 = (l + r) * 0.5f + __ASM_EMIT("vmul.f32 q1, q1, q12") + __ASM_EMIT("vstm %[mid]!, {q0-q1}") + __ASM_EMIT("vstm %[side]!, {q4-q5}") __ASM_EMIT("sub %[count], #8") // x4 block - __ASM_EMIT("6:") + __ASM_EMIT("4:") __ASM_EMIT("adds %[count], #4") // 8 - 4 - __ASM_EMIT("blt 8f") - __ASM_EMIT("vld1.32 {q2}, [%[left]]!") // q2 = l - __ASM_EMIT("vld1.32 {q4}, [%[right]]!") // q4 = r - __ASM_EMIT("vmov q14, q2") // q14 = l - __ASM_EMIT("vadd.f32 q2, q2, q4") // q2 = l + r - __ASM_EMIT("vsub.f32 q4, q14, q4") // q4 = l - r - __ASM_EMIT("vmul.f32 q2, q0") // q2 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 q4, q0") // q4 = (l - r) * 0.5f - __ASM_EMIT("vst1.32 {q2}, [%[mid]]!") - __ASM_EMIT("vst1.32 {q4}, [%[side]]!") + __ASM_EMIT("blt 6f") + __ASM_EMIT("vldm %[left]!, {q0}") // q0 = l + __ASM_EMIT("vldm %[right]!, {q4}") // q4 = r + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = l - r + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l + r + __ASM_EMIT("vmul.f32 q4, q8, q12") // q4 = (l - r) * 0.5f + __ASM_EMIT("vmul.f32 q0, q0, q12") // q0 = (l + r) * 0.5f + __ASM_EMIT("vstm %[mid]!, {q0}") + __ASM_EMIT("vstm %[side]!, {q4}") __ASM_EMIT("sub %[count], #4") // x1 blocks - __ASM_EMIT("8:") + __ASM_EMIT("6:") __ASM_EMIT("adds %[count], #3") // 4 - 1 - __ASM_EMIT("blt 10f") - __ASM_EMIT("9:") - __ASM_EMIT("vldm %[left]!, {s2}") // s2 = l - __ASM_EMIT("vldm %[right]!, {s4}") // s4 = r - __ASM_EMIT("vmov s14, s2") // s12 = l - __ASM_EMIT("vadd.f32 s2, s2, s4") // s0 = l + r - __ASM_EMIT("vsub.f32 s4, s14, s4") // s2 = l - r - __ASM_EMIT("vmul.f32 s2, s0") // s0 = (l + r) * 0.5f - __ASM_EMIT("vmul.f32 s4, s0") // s2 = (l - r) * 0.5f - __ASM_EMIT("vstm %[mid]!, {q2}") - __ASM_EMIT("vstm %[side]!, {q4}") + __ASM_EMIT("blt 8f") + __ASM_EMIT("7:") + __ASM_EMIT("vld1.32 {d0[], d1[]}, [%[left]]!") + __ASM_EMIT("vld1.32 {d8[], d9[]}, [%[right]]!") + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = l - r + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l + r + __ASM_EMIT("vmul.f32 q4, q8, q12") // q4 = (l - r) * 0.5f + __ASM_EMIT("vmul.f32 q0, q0, q12") // q0 = (l + r) * 0.5f + __ASM_EMIT("vst1.32 {d0[0]}, [%[mid]]!") + __ASM_EMIT("vst1.32 {d8[0]}, [%[side]]!") __ASM_EMIT("subs %[count], #1") - __ASM_EMIT("bge 9b") - __ASM_EMIT("10:") + __ASM_EMIT("bge 7b") + __ASM_EMIT("8:") : [mid] "+r" (m), [side] "+r" (s), [left] "+r" (l), [right] "+r" (r), @@ -180,7 +121,7 @@ namespace lsp : [X_HALF] "r" (&msmatrix_const[0]) : "cc", "memory", "q0", "q1", "q2", "q3" , "q4", "q5", "q6", "q7", - "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15" + "q8", "q9", "q10", "q11", "q12" ); } @@ -188,203 +129,127 @@ namespace lsp { ARCH_ARM_ASM ( - __ASM_EMIT("subs %[count], #24") + __ASM_EMIT("subs %[count], #16") __ASM_EMIT("blo 2f") - // x24 blocks + // x16 blocks __ASM_EMIT("1:") - __ASM_EMIT("vld1.32 {q0-q1}, [%[mid]]!") // q0, q1 = m - __ASM_EMIT("vld1.32 {q2-q3}, [%[side]]!") // q2, q3 = s - __ASM_EMIT("vmov q12, q0") // q12 = m - __ASM_EMIT("vmov q13, q1") // q13 = m - __ASM_EMIT("vld1.32 {q4-q5}, [%[mid]]!") - __ASM_EMIT("vld1.32 {q6-q7}, [%[side]]!") - __ASM_EMIT("vadd.f32 q0, q0, q2") // q0 = m + s - __ASM_EMIT("vadd.f32 q1, q1, q3") // q1 = m + s - __ASM_EMIT("vld1.32 {q8-q9}, [%[mid]]!") - __ASM_EMIT("vld1.32 {q10-q11}, [%[side]]!") - __ASM_EMIT("vsub.f32 q2, q12, q2") // q2 = m - s - __ASM_EMIT("vsub.f32 q3, q13, q3") // q3 = m - s - __ASM_EMIT("vmov q12, q4") - __ASM_EMIT("vmov q13, q5") - __ASM_EMIT("vadd.f32 q4, q4, q6") - __ASM_EMIT("vadd.f32 q5, q5, q7") - __ASM_EMIT("vsub.f32 q6, q12, q6") - __ASM_EMIT("vsub.f32 q7, q13, q7") - __ASM_EMIT("vmov q12, q8") - __ASM_EMIT("vmov q13, q9") - __ASM_EMIT("vst1.32 {q0-q1}, [%[left]]!") - __ASM_EMIT("vst1.32 {q2-q3}, [%[right]]!") - __ASM_EMIT("vadd.f32 q8, q8, q10") - __ASM_EMIT("vadd.f32 q9, q9, q11") - __ASM_EMIT("vst1.32 {q4-q5}, [%[left]]!") - __ASM_EMIT("vst1.32 {q6-q7}, [%[right]]!") - __ASM_EMIT("vsub.f32 q10, q12, q10") - __ASM_EMIT("vsub.f32 q11, q13, q11") - __ASM_EMIT("vst1.32 {q8-q9}, [%[left]]!") - __ASM_EMIT("vst1.32 {q10-q11}, [%[right]]!") - __ASM_EMIT("subs %[count], #24") + __ASM_EMIT("vldm %[mid]!, {q0-q3}") // q0 = m + __ASM_EMIT("vldm %[side]!, {q4-q7}") // q4 = s + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = r = m - s + __ASM_EMIT("vsub.f32 q9, q1, q5") + __ASM_EMIT("vsub.f32 q10, q2, q6") + __ASM_EMIT("vsub.f32 q11, q3, q7") + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l = m + s + __ASM_EMIT("vadd.f32 q1, q1, q5") + __ASM_EMIT("vadd.f32 q2, q2, q6") + __ASM_EMIT("vadd.f32 q3, q3, q7") + __ASM_EMIT("vstm %[left]!, {q0-q3}") + __ASM_EMIT("vstm %[right]!, {q8-q11}") + __ASM_EMIT("subs %[count], #16") __ASM_EMIT("bhs 1b") - // x16 block - __ASM_EMIT("2:") - __ASM_EMIT("adds %[count], #8") // 24 - 16 - __ASM_EMIT("blt 4f") - __ASM_EMIT("vld1.32 {q0-q1}, [%[mid]]!") // q0, q1 = m - __ASM_EMIT("vld1.32 {q2-q3}, [%[side]]!") // q2, q3 = s - __ASM_EMIT("vld1.32 {q4-q5}, [%[mid]]!") - __ASM_EMIT("vld1.32 {q6-q7}, [%[side]]!") - __ASM_EMIT("vmov q12, q0") // q12 = m - __ASM_EMIT("vmov q13, q1") // q13 = m - __ASM_EMIT("vadd.f32 q0, q0, q2") // q0 = m + s - __ASM_EMIT("vadd.f32 q1, q1, q3") // q1 = m + s - __ASM_EMIT("vsub.f32 q2, q12, q2") // q2 = m - s - __ASM_EMIT("vsub.f32 q3, q13, q3") // q3 = m - s - __ASM_EMIT("vmov q12, q4") - __ASM_EMIT("vmov q13, q5") - __ASM_EMIT("vadd.f32 q4, q4, q6") - __ASM_EMIT("vadd.f32 q5, q5, q7") - __ASM_EMIT("vsub.f32 q6, q12, q6") - __ASM_EMIT("vsub.f32 q7, q13, q7") - __ASM_EMIT("vst1.32 {q0-q1}, [%[left]]!") - __ASM_EMIT("vst1.32 {q2-q3}, [%[right]]!") - __ASM_EMIT("vst1.32 {q4-q5}, [%[left]]!") - __ASM_EMIT("vst1.32 {q6-q7}, [%[right]]!") - __ASM_EMIT("sub %[count], #16") // x8 block - __ASM_EMIT("4:") + __ASM_EMIT("2:") __ASM_EMIT("adds %[count], #8") // 16 - 8 - __ASM_EMIT("blt 6f") - __ASM_EMIT("vld1.32 {q0-q1}, [%[mid]]!") // q0, q1 = m - __ASM_EMIT("vld1.32 {q2-q3}, [%[side]]!") // q2, q3 = s - __ASM_EMIT("vmov q12, q0") // q12 = m - __ASM_EMIT("vmov q13, q1") // q13 = m - __ASM_EMIT("vadd.f32 q0, q0, q2") // q0 = m + s - __ASM_EMIT("vadd.f32 q1, q1, q3") // q1 = m + s - __ASM_EMIT("vsub.f32 q2, q12, q2") // q2 = m - s - __ASM_EMIT("vsub.f32 q3, q13, q3") // q3 = m - s - __ASM_EMIT("vst1.32 {q0-q1}, [%[left]]!") - __ASM_EMIT("vst1.32 {q2-q3}, [%[right]]!") + __ASM_EMIT("blt 4f") + __ASM_EMIT("vldm %[mid]!, {q0-q1}") // q0 = m + __ASM_EMIT("vldm %[side]!, {q4-q5}") // q4 = s + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = r = m - s + __ASM_EMIT("vsub.f32 q9, q1, q5") + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l = m + s + __ASM_EMIT("vadd.f32 q1, q1, q5") + __ASM_EMIT("vstm %[left]!, {q0-q1}") + __ASM_EMIT("vstm %[right]!, {q8-q9}") __ASM_EMIT("sub %[count], #8") // x4 block - __ASM_EMIT("6:") + __ASM_EMIT("4:") __ASM_EMIT("adds %[count], #4") // 8 - 4 - __ASM_EMIT("blt 8f") - __ASM_EMIT("vld1.32 {q0}, [%[mid]]!") // q0 = m - __ASM_EMIT("vld1.32 {q2}, [%[side]]!") // q2 = s - __ASM_EMIT("vmov q12, q0") // q12 = m - __ASM_EMIT("vadd.f32 q0, q0, q2") // q0 = m + s - __ASM_EMIT("vsub.f32 q2, q12, q2") // q2 = m - s - __ASM_EMIT("vst1.32 {q0}, [%[left]]!") - __ASM_EMIT("vst1.32 {q2}, [%[right]]!") + __ASM_EMIT("blt 6f") + __ASM_EMIT("vldm %[mid]!, {q0}") // q0 = m + __ASM_EMIT("vldm %[side]!, {q4}") // q4 = s + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = r = m - s + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l = m + s + __ASM_EMIT("vstm %[left]!, {q0}") + __ASM_EMIT("vstm %[right]!, {q8}") __ASM_EMIT("sub %[count], #4") // x1 blocks - __ASM_EMIT("8:") + __ASM_EMIT("6:") __ASM_EMIT("adds %[count], #3") // 4 - 1 - __ASM_EMIT("blt 10f") - __ASM_EMIT("9:") - __ASM_EMIT("vldm %[mid]!, {s0}") // s0 = m - __ASM_EMIT("vldm %[side]!, {s2}") // s2 = s - __ASM_EMIT("vmov s12, s0") // s12 = m - __ASM_EMIT("vadd.f32 s0, s0, s2") // s0 = m + s - __ASM_EMIT("vsub.f32 s2, s12, s2") // s2 = m - s - __ASM_EMIT("vstm %[left]!, {s2}") - __ASM_EMIT("vstm %[right]!, {s4}") + __ASM_EMIT("blt 8f") + __ASM_EMIT("7:") + __ASM_EMIT("vld1.32 {d0[], d1[]}, [%[mid]]!") + __ASM_EMIT("vld1.32 {d8[], d9[]}, [%[side]]!") + __ASM_EMIT("vsub.f32 q8, q0, q4") // q8 = r = m - s + __ASM_EMIT("vadd.f32 q0, q0, q4") // q0 = l = m + s + __ASM_EMIT("vst1.32 {d0[0]}, [%[left]]!") + __ASM_EMIT("vst1.32 {d16[0]}, [%[right]]!") __ASM_EMIT("subs %[count], #1") - __ASM_EMIT("bge 9b") - __ASM_EMIT("10:") + __ASM_EMIT("bge 7b") + __ASM_EMIT("8:") : [mid] "+r" (m), [side] "+r" (s), [left] "+r" (l), [right] "+r" (r), [count] "+r" (count) : : "cc", "memory", - "q0", "q1", "q2", "q3" , "q4", "q5", "q6", "q7", - "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15" + "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11" ); } #define LR_CVT_BODY(d, l, r, op) \ - __ASM_EMIT("subs %[count], #24") \ - __ASM_EMIT("vld1.32 {q0-q1}, [%[X_HALF]]") /* q0 = 0.5, q1 = 0.5 */ \ + __ASM_EMIT("subs %[count], #16") \ + __ASM_EMIT("vld1.32 {q8}, [%[X_HALF]]") /* q8 = 0.5 */ \ __ASM_EMIT("blo 2f") \ - /* x24 blocks */ \ + /* x16 blocks */ \ __ASM_EMIT("1:") \ - __ASM_EMIT("vld1.32 {q2-q3}, [%[" l "]]!") /* q2 = l, q3 = l */ \ - __ASM_EMIT("vld1.32 {q4-q5}, [%[" r "]]!") /* q4 = r, q5 = r */ \ - __ASM_EMIT("vld1.32 {q6-q7}, [%[" l "]]!") \ - __ASM_EMIT("vld1.32 {q8-q9}, [%[" r "]]!") \ - __ASM_EMIT(op ".f32 q2, q2, q4") /* q2 = l <+-> r */ \ - __ASM_EMIT(op ".f32 q3, q3, q5") /* q3 = l <+-> r */ \ - __ASM_EMIT("vld1.32 {q10-q11}, [%[" l "]]!") \ - __ASM_EMIT("vld1.32 {q12-q13}, [%[" r "]]!") \ - __ASM_EMIT(op ".f32 q6, q6, q8") \ - __ASM_EMIT(op ".f32 q7, q7, q9") \ - __ASM_EMIT(op ".f32 q10, q10, q12") \ - __ASM_EMIT(op ".f32 q11, q11, q13") \ - __ASM_EMIT("vmul.f32 q2, q0") /* q2 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vmul.f32 q3, q1") /* q3 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vmul.f32 q6, q0") \ - __ASM_EMIT("vmul.f32 q7, q1") \ - __ASM_EMIT("vst1.32 {q2-q3}, [%[" d "]]!") \ - __ASM_EMIT("vmul.f32 q10, q0") \ - __ASM_EMIT("vmul.f32 q11, q1") \ - __ASM_EMIT("vst1.32 {q6-q7}, [%[" d "]]!") \ - __ASM_EMIT("vst1.32 {q10-q11}, [%[" d "]]!") \ - __ASM_EMIT("subs %[count], #24") \ + __ASM_EMIT("vldm %[" l "]!, {q0-q3}") /* q0 = l */ \ + __ASM_EMIT("vldm %[" r "]!, {q4-q7}") /* q4 = r */ \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = l <+-> r */ \ + __ASM_EMIT(op ".f32 q1, q1, q5") \ + __ASM_EMIT(op ".f32 q2, q2, q6") \ + __ASM_EMIT(op ".f32 q3, q3, q7") \ + __ASM_EMIT("vmul.f32 q0, q0, q8") /* q0 = (l <+-> r) * 0.5f */ \ + __ASM_EMIT("vmul.f32 q1, q1, q8") \ + __ASM_EMIT("vmul.f32 q2, q2, q8") \ + __ASM_EMIT("vmul.f32 q3, q3, q8") \ + __ASM_EMIT("vstm %[" d "]!, {q0-q3}") \ + __ASM_EMIT("subs %[count], #16") \ __ASM_EMIT("bhs 1b") \ - /* x16 block */ \ - __ASM_EMIT("2:") \ - __ASM_EMIT("adds %[count], #8") /* 24 - 16 */ \ - __ASM_EMIT("blt 4f") \ - __ASM_EMIT("vld1.32 {q2-q3}, [%[" l "]]!") /* q2 = l, q3 = l */ \ - __ASM_EMIT("vld1.32 {q4-q5}, [%[" r "]]!") /* q4 = r, q5 = r */ \ - __ASM_EMIT("vld1.32 {q6-q7}, [%[" l "]]!") \ - __ASM_EMIT("vld1.32 {q8-q9}, [%[" r "]]!") \ - __ASM_EMIT(op ".f32 q2, q2, q4") /* q2 = l <+-> r */ \ - __ASM_EMIT(op ".f32 q3, q3, q5") /* q3 = l <+-> r */ \ - __ASM_EMIT(op ".f32 q6, q6, q8") \ - __ASM_EMIT(op ".f32 q7, q7, q9") \ - __ASM_EMIT("vmul.f32 q2, q0") /* q2 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vmul.f32 q3, q1") /* q3 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vmul.f32 q6, q0") \ - __ASM_EMIT("vmul.f32 q7, q1") \ - __ASM_EMIT("vst1.32 {q2-q3}, [%[" d "]]!") \ - __ASM_EMIT("vst1.32 {q6-q7}, [%[" d "]]!") \ - __ASM_EMIT("sub %[count], #16") \ /* x8 block */ \ - __ASM_EMIT("4:") \ + __ASM_EMIT("2:") \ __ASM_EMIT("adds %[count], #8") /* 16 - 8 */ \ - __ASM_EMIT("blt 6f") \ - __ASM_EMIT("vld1.32 {q2-q3}, [%[" l "]]!") /* q2 = l, q3 = l */ \ - __ASM_EMIT("vld1.32 {q4-q5}, [%[" r "]]!") /* q4 = r, q5 = r */ \ - __ASM_EMIT(op ".f32 q2, q2, q4") /* q2 = l <+-> r */ \ - __ASM_EMIT(op ".f32 q3, q3, q5") /* q3 = l <+-> r */ \ - __ASM_EMIT("vmul.f32 q2, q0") /* q2 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vmul.f32 q3, q1") /* q3 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vst1.32 {q2-q3}, [%[" d "]]!") \ + __ASM_EMIT("blt 4f") \ + __ASM_EMIT("vldm %[" l "]!, {q0-q1}") /* q0 = l */ \ + __ASM_EMIT("vldm %[" r "]!, {q4-q5}") /* q4 = r */ \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = l <+-> r */ \ + __ASM_EMIT(op ".f32 q1, q1, q5") \ + __ASM_EMIT("vmul.f32 q0, q0, q8") /* q0 = (l <+-> r) * 0.5f */ \ + __ASM_EMIT("vmul.f32 q1, q1, q8") \ + __ASM_EMIT("vstm %[" d "]!, {q0-q1}") \ __ASM_EMIT("sub %[count], #8") \ /* x4 block */ \ - __ASM_EMIT("6:") \ + __ASM_EMIT("4:") \ __ASM_EMIT("adds %[count], #4") /* 8 - 4 */ \ - __ASM_EMIT("blt 8f") \ - __ASM_EMIT("vld1.32 {q2}, [%[" l "]]!") /* q2 = l */ \ - __ASM_EMIT("vld1.32 {q4}, [%[" r "]]!") /* q4 = r */ \ - __ASM_EMIT(op ".f32 q2, q2, q4") /* q2 = l <+-> r */ \ - __ASM_EMIT("vmul.f32 q2, q0") /* q2 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vst1.32 {q2}, [%[" d "]]!") \ + __ASM_EMIT("blt 6f") \ + __ASM_EMIT("vldm %[" l "]!, {q0}") /* q0 = l */ \ + __ASM_EMIT("vldm %[" r "]!, {q4}") /* q4 = r */ \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = l <+-> r */ \ + __ASM_EMIT("vmul.f32 q0, q0, q8") /* q0 = (l <+-> r) * 0.5f */ \ + __ASM_EMIT("vstm %[" d "]!, {q0}") \ __ASM_EMIT("sub %[count], #4") \ /* x1 blocks */ \ - __ASM_EMIT("8:") \ + __ASM_EMIT("6:") \ __ASM_EMIT("adds %[count], #3") /* 4 - 1 */ \ - __ASM_EMIT("blt 10f") \ - __ASM_EMIT("9:") \ - __ASM_EMIT("vldm %[" l "]!, {s2}") /* s2 = l */ \ - __ASM_EMIT("vldm %[" r "]!, {s4}") /* s4 = r */ \ - __ASM_EMIT(op ".f32 s2, s2, s4") /* q2 = l <+-> r */ \ - __ASM_EMIT("vmul.f32 s2, s0") /* q2 = (l <+-> r) * 0.5f */ \ - __ASM_EMIT("vstm %[" d "]!, {s2}") \ + __ASM_EMIT("blt 8f") \ + __ASM_EMIT("7:") \ + __ASM_EMIT("vld1.32 {d0[], d1[]}, [%[" l "]]!") \ + __ASM_EMIT("vld1.32 {d8[], d9[]}, [%[" r "]]!") \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = l <+-> r */ \ + __ASM_EMIT("vmul.f32 q0, q0, q8") /* q0 = (l <+-> r) * 0.5f */ \ + __ASM_EMIT("vst1.32 {d0[0]}, [%[" d "]]!") \ __ASM_EMIT("subs %[count], #1") \ - __ASM_EMIT("bge 9b") \ - __ASM_EMIT("10:") + __ASM_EMIT("bge 7b") \ + __ASM_EMIT("8:") void lr_to_mid(float *m, const float *l, const float *r, size_t count) @@ -397,8 +262,8 @@ namespace lsp [count] "+r" (count) : [X_HALF] "r" (&msmatrix_const[0]) : "cc", "memory", - "q0", "q1", "q2", "q3" , "q4", "q5", "q6", "q7", - "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15" + "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", + "q8" ); } @@ -412,86 +277,58 @@ namespace lsp [count] "+r" (count) : [X_HALF] "r" (&msmatrix_const[0]) : "cc", "memory", - "q0", "q1", "q2", "q3" , "q4", "q5", "q6", "q7", - "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15" + "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", + "q8" ); } - #undef LR_CVT_BODY + #undef LR_CVT_BODY - #define MS_CVT_BODY(d, m, s, op) \ - __ASM_EMIT("subs %[count], #32") \ - __ASM_EMIT("blo 2f") \ - /* x24 blocks */ \ - __ASM_EMIT("1:") \ - __ASM_EMIT("vld1.32 {q0-q1}, [%[" m "]]!") /* q0 = m, q1 = m */ \ - __ASM_EMIT("vld1.32 {q8-q9}, [%[" s "]]!") /* q8 = s, q9 = s */ \ - __ASM_EMIT("vld1.32 {q2-q3}, [%[" m "]]!") \ - __ASM_EMIT("vld1.32 {q10-q11}, [%[" s "]]!") \ - __ASM_EMIT(op ".f32 q0, q8") /* q0 = m <+-> s */ \ - __ASM_EMIT(op ".f32 q1, q9") /* q1 = m <+-> s */ \ - __ASM_EMIT("vld1.32 {q4-q5}, [%[" m "]]!") \ - __ASM_EMIT("vld1.32 {q12-q13}, [%[" s "]]!") \ - __ASM_EMIT(op ".f32 q2, q10") \ - __ASM_EMIT(op ".f32 q3, q11") \ - __ASM_EMIT("vst1.32 {q0-q1}, [%[" d "]]!") \ - __ASM_EMIT("vld1.32 {q6-q7}, [%[" m "]]!") \ - __ASM_EMIT("vld1.32 {q14-q15}, [%[" s "]]!") \ - __ASM_EMIT(op ".f32 q4, q12") \ - __ASM_EMIT(op ".f32 q5, q13") \ - __ASM_EMIT("vst1.32 {q2-q3}, [%[" d "]]!") \ - __ASM_EMIT(op ".f32 q6, q14") \ - __ASM_EMIT(op ".f32 q7, q15") \ - __ASM_EMIT("vst1.32 {q4-q5}, [%[" d "]]!") \ - __ASM_EMIT("vst1.32 {q6-q7}, [%[" d "]]!") \ - __ASM_EMIT("subs %[count], #32") \ - __ASM_EMIT("bhs 1b") \ - /* x16 block */ \ - __ASM_EMIT("2:") \ - __ASM_EMIT("adds %[count], #16") /* 32 - 16 */ \ - __ASM_EMIT("blt 4f") \ - __ASM_EMIT("vld1.32 {q0-q1}, [%[" m "]]!") /* q0 = m, q1 = m */ \ - __ASM_EMIT("vld1.32 {q8-q9}, [%[" s "]]!") /* q8 = s, q9 = s */ \ - __ASM_EMIT("vld1.32 {q2-q3}, [%[" m "]]!") \ - __ASM_EMIT("vld1.32 {q10-q11}, [%[" s "]]!") \ - __ASM_EMIT(op ".f32 q0, q8") /* q0 = m <+-> s */ \ - __ASM_EMIT(op ".f32 q1, q9") /* q1 = m <+-> s */ \ - __ASM_EMIT(op ".f32 q2, q10") \ - __ASM_EMIT(op ".f32 q3, q11") \ - __ASM_EMIT("vst1.32 {q0-q1}, [%[" d "]]!") \ - __ASM_EMIT("vst1.32 {q2-q3}, [%[" d "]]!") \ - __ASM_EMIT("sub %[count], #16") \ - /* x8 block */ \ - __ASM_EMIT("4:") \ - __ASM_EMIT("adds %[count], #8") /* 16 - 8 */ \ - __ASM_EMIT("blt 6f") \ - __ASM_EMIT("vld1.32 {q0-q1}, [%[" m "]]!") /* q0 = m, q1 = m */ \ - __ASM_EMIT("vld1.32 {q8-q9}, [%[" s "]]!") /* q8 = s, q9 = s */ \ - __ASM_EMIT(op ".f32 q0, q8") /* q0 = m <+-> s */ \ - __ASM_EMIT(op ".f32 q1, q9") /* q1 = m <+-> s */ \ - __ASM_EMIT("vst1.32 {q0-q1}, [%[" d "]]!") \ - __ASM_EMIT("sub %[count], #8") \ - /* x4 block */ \ - __ASM_EMIT("6:") \ - __ASM_EMIT("adds %[count], #4") /* 8 - 4 */ \ - __ASM_EMIT("blt 8f") \ - __ASM_EMIT("vld1.32 {q0}, [%[" m "]]!") /* q0 = m, q1 = m */ \ - __ASM_EMIT("vld1.32 {q8}, [%[" s "]]!") /* q8 = s, q9 = s */ \ - __ASM_EMIT(op ".f32 q0, q8") /* q0 = m <+-> s */ \ - __ASM_EMIT("vst1.32 {q0}, [%[" d "]]!") \ - __ASM_EMIT("sub %[count], #4") \ - /* x1 blocks */ \ - __ASM_EMIT("8:") \ - __ASM_EMIT("adds %[count], #3") /* 4 - 1 */ \ - __ASM_EMIT("blt 10f") \ - __ASM_EMIT("9:") \ - __ASM_EMIT("vldm %[" m "]!, {s0}") /* s0 = m */ \ - __ASM_EMIT("vldm %[" s "]!, {s8}") /* s4 = s */ \ - __ASM_EMIT(op ".f32 s0, s8") /* q0 = m <+-> s */ \ - __ASM_EMIT("vstm %[" d "]!, {s0}") \ - __ASM_EMIT("subs %[count], #1") \ - __ASM_EMIT("bge 9b") \ - __ASM_EMIT("10:") + #define MS_CVT_BODY(d, m, s, op) \ + __ASM_EMIT("subs %[count], #16") \ + __ASM_EMIT("blo 2f") \ + /* x16 blocks */ \ + __ASM_EMIT("1:") \ + __ASM_EMIT("vldm %[" m "]!, {q0-q3}") /* q0 = m */ \ + __ASM_EMIT("vldm %[" s "]!, {q4-q7}") /* q4 = s */ \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = m <+-> s */ \ + __ASM_EMIT(op ".f32 q1, q1, q5") \ + __ASM_EMIT(op ".f32 q2, q2, q6") \ + __ASM_EMIT(op ".f32 q3, q3, q7") \ + __ASM_EMIT("vstm %[" d "]!, {q0-q3}") \ + __ASM_EMIT("subs %[count], #16") \ + __ASM_EMIT("bhs 1b") \ + /* x8 block */ \ + __ASM_EMIT("2:") \ + __ASM_EMIT("adds %[count], #8") /* 16 - 8 */ \ + __ASM_EMIT("blt 4f") \ + __ASM_EMIT("vldm %[" m "]!, {q0-q1}") /* q0 = m */ \ + __ASM_EMIT("vldm %[" s "]!, {q4-q5}") /* q4 = s */ \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = m <+-> s */ \ + __ASM_EMIT(op ".f32 q1, q1, q5") \ + __ASM_EMIT("vstm %[" d "]!, {q0-q1}") \ + __ASM_EMIT("sub %[count], #8") \ + /* x4 block */ \ + __ASM_EMIT("4:") \ + __ASM_EMIT("adds %[count], #4") /* 8 - 4 */ \ + __ASM_EMIT("blt 6f") \ + __ASM_EMIT("vldm %[" m "]!, {q0}") /* q0 = l */ \ + __ASM_EMIT("vldm %[" s "]!, {q4}") /* q4 = r */ \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = l <+-> r */ \ + __ASM_EMIT("vstm %[" d "]!, {q0}") \ + __ASM_EMIT("sub %[count], #4") \ + /* x1 blocks */ \ + __ASM_EMIT("6:") \ + __ASM_EMIT("adds %[count], #3") /* 4 - 1 */ \ + __ASM_EMIT("blt 8f") \ + __ASM_EMIT("7:") \ + __ASM_EMIT("vld1.32 {d0[], d1[]}, [%[" m "]]!") \ + __ASM_EMIT("vld1.32 {d8[], d9[]}, [%[" s "]]!") \ + __ASM_EMIT(op ".f32 q0, q0, q4") /* q0 = l <+-> r */ \ + __ASM_EMIT("vst1.32 {d0[0]}, [%[" d "]]!") \ + __ASM_EMIT("subs %[count], #1") \ + __ASM_EMIT("bge 7b") \ + __ASM_EMIT("8:") void ms_to_left(float *l, const float *m, const float *s, size_t count) { @@ -503,8 +340,7 @@ namespace lsp [count] "+r" (count) : : "cc", "memory", - "q0", "q1", "q2", "q3" , "q4", "q5", "q6", "q7", - "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15" + "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7" ); } @@ -518,13 +354,12 @@ namespace lsp [count] "+r" (count) : : "cc", "memory", - "q0", "q1", "q2", "q3" , "q4", "q5", "q6", "q7", - "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15" + "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7" ); } #undef MS_CVT_BODY - } -} + } /* namespace neon_d32 */ +} /* namespace lsp */ #endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_MSMATRIX_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/cos.h 2025-08-26 18:15:43.706003485 +0000 @@ -0,0 +1,204 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_COS_H_ +#define PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_COS_H_ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL */ + +#include + +namespace lsp +{ + namespace neon_d32 + { + void cosf1(float *dst, size_t count) + { + ARCH_ARM_ASM( + __ASM_EMIT("vldm %[S2C], {q8-q15}") + // x8 blocks + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vldm %[dst], {q0-q1}") + __ASM_EMIT("vsub.f32 q0, q9, q0") // q0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsub.f32 q1, q9, q1") // q1 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("vstm %[dst]!, {q0-q1}") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("blt 4f") + __ASM_EMIT("vld1.32 {q0}, [%[dst]]") + __ASM_EMIT("vsub.f32 q0, q9, q0") // q0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 12f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vld1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("6:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 8f") + __ASM_EMIT("vld1.32 {d1}, [%[dst]]") + __ASM_EMIT("8:") + __ASM_EMIT("vsub.f32 q0, q9, q0") // q0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 10f") + __ASM_EMIT("sub %[dst], #0x04") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("10:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 12f") + __ASM_EMIT("vst1.32 {d1}, [%[dst]]") + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + void cosf2(float *dst, const float *src, size_t count) + { + ARCH_ARM_ASM( + __ASM_EMIT("vldm %[S2C], {q8-q15}") + // x8 blocks + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vldm %[src]!, {q0-q1}") + __ASM_EMIT("vsub.f32 q0, q9, q0") // q0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsub.f32 q1, q9, q1") // q1 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("vstm %[dst]!, {q0-q1}") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("blt 4f") + __ASM_EMIT("vld1.32 {q0}, [%[src]]!") + __ASM_EMIT("vsub.f32 q0, q9, q0") // q0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 12f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vld1.32 {d0[0]}, [%[src]]!") + __ASM_EMIT("6:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 8f") + __ASM_EMIT("vld1.32 {d1}, [%[src]]") + __ASM_EMIT("8:") + __ASM_EMIT("vsub.f32 q0, q9, q0") // q0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 10f") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("10:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 12f") + __ASM_EMIT("vst1.32 {d1}, [%[dst]]") + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + void cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_ARM_ASM( + __ASM_EMIT("vld1.f32 {d8[], d9[]}, [%[k]]") // q4 = k + __ASM_EMIT("vld1.f32 {d10[], d11[]}, [%[p]]") // q5 = p + __ASM_EMIT("vldm %[S2C], {q8-q15}") + __ASM_EMIT("vldm %[S2KP], {q6-q7}") // q6 = i = 0 1 2 3, q7 = 4 ... + __ASM_EMIT("vsub.f32 q5, q9, q5") // q5 = PI/2 - p + PI/2 + // x4 blocks + __ASM_EMIT("subs %[count], #4") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmul.f32 q0, q6, q4") // q0 = k * i + __ASM_EMIT("vadd.f32 q6, q6, q7") // q6 = i + 4 + __ASM_EMIT("vsub.f32 q0, q5, q0") // q0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("subs %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 6f") + __ASM_EMIT("vmul.f32 q0, q6, q4") // q0 = k * i + __ASM_EMIT("vsub.f32 q0, q5, q0") // q0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 4f") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("vext.32 q0, q0, q0, #1") + __ASM_EMIT("4:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vst1.32 {d0}, [%[dst]]") + // End + __ASM_EMIT("6:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [k] "r" (&k), + [p] "r" (&p), + [S2C] "r" (&sinf_const[0]), + [S2KP] "r" (&kp_gen_const[0]) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + } /* namespace neon_d32 */ +} /* namespace lsp */ + + +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_COS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/lanczos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/lanczos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/lanczos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/lanczos.h 2025-08-26 18:15:43.706003485 +0000 @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 21 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_LANCZOS_H_ +#define PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_LANCZOS_H_ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL */ + +#include + +namespace lsp +{ + namespace neon_d32 + { + IF_ARCH_ARM( + static const uint32_t lanczos_const[] __lsp_aligned16 = + { + LSP_DSP_VEC4(0x38d1b717), // +0x00: Sinc threshold = 1e-4 + LSP_DSP_VEC4(0x3f800000), // +0x10: 1.0 + }; + ) + + typedef struct lanczos_gen_t + { + float k[4]; // +0x00: Multiplier + float p[4]; // +0x10: Initial phase + float a[4]; // +0x20: Number of lobes + float i[4]; // +0x30: Indices + float t[4]; // +0x40: Time range + float x1[4]; // +0x50: Computed X1 + float n[4]; // +0x60: Numerator + float step[4]; // +0x70: Step + } lanczos_gen_t; + + #define LANCZOS_GEN_FUNC_X4 \ + /* q0 = x1 */ \ + __ASM_EMIT("vmul.f32 q1, q0, q10") /* q1 = x2 = x1*a */ \ + __ASM_EMIT("vabs.f32 q13, q0") /* q13 = fabsf(x1) */ \ + __ASM_EMIT("vmul.f32 q14, q0, q1") /* q14 = x1*x2 */ \ + __ASM_EMIT("vrecpe.f32 q2, q14") /* q2 = s2 */ \ + __ASM_EMIT("vrecps.f32 q4, q2, q14") /* q4 = (2 - R*s2) */ \ + __ASM_EMIT("vmul.f32 q2, q4, q2") /* q2 = s2' = s2 * (2 - R*s2) */ \ + __ASM_EMIT("vrecps.f32 q4, q2, q14") /* q4 = (2 - R*s2') */ \ + __ASM_EMIT("vmul.f32 q14, q4, q2") /* q14 = n = 1/(x1 * x2) */ \ + __ASM_EMIT("vstm %[state], {q8-q15}") /* save state */ \ + __ASM_EMIT("vldm %[S2C], {q8-q15}") /* load sine coefficients */ \ + __ASM_EMIT("vadd.f32 q0, q0, q8") /* q0 = x1 + PI/2 */ \ + __ASM_EMIT("vadd.f32 q1, q1, q8") /* q1 = x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X8 /* q0 = sinf(x1), q1 = sinf(x2) */ \ + __ASM_EMIT("vldm %[state], {q8-q15}") /* load state */ \ + __ASM_EMIT("vldm %[LC], {q6-q7}") /* q6 = 1e-4, q7 = 1.0 */ \ + __ASM_EMIT("vmul.f32 q0, q0, q1") /* q0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vcge.f32 q2, q13, q6") /* q2 = [ fabsf(x1) >= 1e-4 ] */ \ + __ASM_EMIT("vmul.f32 q0, q0, q14") /* q0 = f = sinf(x1)*sinf(x2)/(x1*x2) */ \ + __ASM_EMIT("vcgt.f32 q3, q12, q13") /* q3 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vbif q0, q7, q2") /* q0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vand q0, q0, q3") /* q0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + IF_ARCH_ARM( + lanczos_gen_t state __lsp_aligned16; + ); + + ARCH_ARM_ASM( + __ASM_EMIT("vldm %[S2KP], {q11-q12}") // q11 = i = 0 1 2 3, q12 = 4 ... + __ASM_EMIT("vld1.f32 {d16[], d17[]}, [%[k]]") // q8 = k + __ASM_EMIT("vld1.f32 {d18[], d19[]}, [%[p]]") // q9 = p + __ASM_EMIT("vmov q15, q12") // q15 = step = 4 + __ASM_EMIT("vld1.f32 {d20[], d21[]}, [%[a]]") // q10 = a + __ASM_EMIT("vld1.f32 {d24[], d25[]}, [%[t]]") // q12 = t + // x4 blocks + __ASM_EMIT("subs %[count], #4") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmul.f32 q0, q8, q11") // q0 = k * i + __ASM_EMIT("vadd.f32 q11, q11, q15") // q11 = i' = i + 4 + __ASM_EMIT("vsub.f32 q0, q0, q9") // q0 = k*i - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("subs %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 6f") + __ASM_EMIT("vmul.f32 q0, q8, q11") // q0 = k * i + __ASM_EMIT("vsub.f32 q0, q0, q9") // q0 = k*i - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 4f") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("vext.32 q0, q0, q0, #1") + __ASM_EMIT("4:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vst1.32 {d0}, [%[dst]]") + // End + __ASM_EMIT("6:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [k] "r" (&k), + [p] "r" (&p), + [t] "r" (&t), + [a] "r" (&a), + [S2C] "r" (&sinf_const[0]), + [S2KP] "r" (&kp_gen_const[0]), + [LC] "r" (&lanczos_const[0]), + [state] "r" (&state) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + } /* namespace neon_d32 */ +} /* namespace lsp */ + + + + +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_LANCZOS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath/sin.h 2025-08-26 18:15:43.706003485 +0000 @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 13 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_SIN_H_ +#define PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_SIN_H_ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL */ + +namespace lsp +{ + namespace neon_d32 + { + IF_ARCH_ARM( + static const float kp_gen_const[] __lsp_aligned16 = + { + 0.0f, 1.0f, 2.0f, 3.0f, // +0x00: Initial values + LSP_DSP_VEC4(4.0), // +0x10: Step x4 + }; + + static const uint32_t sinf_const[] __lsp_aligned16 = + { + LSP_DSP_VEC4(0x3fc90fdb), // +0x000: PI/2 + LSP_DSP_VEC4(0x40490fdb), // +0x010: PI + LSP_DSP_VEC4(0x3e22f983), // +0x020: 1/(2*PI) + LSP_DSP_VEC4(0xb2d7322b), // +0x030: C0 = -1/11! = -2.50521083854e-08 + LSP_DSP_VEC4(0x3638ef1d), // +0x040: C1 = 1/9! = 2.7557319224e-06 + LSP_DSP_VEC4(0xb9500d01), // +0x050: C2 = -1/7! = -0.000198412698413 + LSP_DSP_VEC4(0x3c088889), // +0x060: C3 = 1/5! = 0.00833333333333 + LSP_DSP_VEC4(0xbe2aaaab), // +0x070: C4 = -1/3! = -0.166666666667 + }; + ) + + #define SINF_X_PLUS_PI_2_CORE_X8 \ + /* q0 = X = x + PI/2 */ \ + /* q8 = PI/2 */ \ + /* q9 = PI */ \ + /* q10 = 1/(2*PI) */ \ + /* q11 = C0 */ \ + /* q12 = C1 */ \ + /* q13 = C2 */ \ + /* q14 = C3 */ \ + /* q15 = C4 */ \ + __ASM_EMIT("vmul.f32 q2, q0, q10") /* q2 = x / (2*PI) */ \ + __ASM_EMIT("vmul.f32 q3, q1, q10") \ + __ASM_EMIT("vcvt.s32.f32 q4, q2") /* q4 = int(X / (2*PI)) */ \ + __ASM_EMIT("vcvt.s32.f32 q5, q3") \ + __ASM_EMIT("vadd.f32 q6, q9, q9") /* q6 = 2*PI */ \ + __ASM_EMIT("vsra.s32 q4, q0, #31") /* q4 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vsra.s32 q5, q1, #31") \ + __ASM_EMIT("vcvt.f32.s32 q4, q4") /* q4 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvt.f32.s32 q5, q5") \ + __ASM_EMIT("vmls.f32 q0, q4, q6") /* q0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmls.f32 q1, q5, q6") \ + __ASM_EMIT("vadd.f32 q6, q8, q9") /* q6 = 3*PI/2 */ \ + __ASM_EMIT("vcge.f32 q2, q0, q9") /* q2 = [ Y >= PI ] */ \ + __ASM_EMIT("vcge.f32 q3, q1, q9") \ + __ASM_EMIT("vsub.f32 q4, q6, q0") /* q4 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsub.f32 q5, q6, q1") \ + __ASM_EMIT("vsub.f32 q0, q0, q8") /* q0 = Y - PI/2 */ \ + __ASM_EMIT("vsub.f32 q1, q1, q8") \ + __ASM_EMIT("vbit q0, q4, q2") /* q0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("vbit q1, q5, q3") \ + /* q0 = XX */ \ + __ASM_EMIT("vmul.f32 q2, q0, q0") /* q2 = X2 = XX*XX */ \ + __ASM_EMIT("vmul.f32 q3, q1, q1") \ + __ASM_EMIT("vmul.f32 q4, q2, q11") /* q4 = X2*C0 */ \ + __ASM_EMIT("vmul.f32 q5, q3, q11") \ + __ASM_EMIT("vadd.f32 q4, q4, q12") /* q4 = C1 + X2*C0 */ \ + __ASM_EMIT("vadd.f32 q5, q5, q12") \ + __ASM_EMIT("vmul.f32 q4, q2, q4") /* q4 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vmul.f32 q5, q3, q5") \ + __ASM_EMIT("vadd.f32 q4, q4, q13") /* q4 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vadd.f32 q5, q5, q13") \ + __ASM_EMIT("vmul.f32 q4, q2, q4") /* q4 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vmul.f32 q5, q3, q5") \ + __ASM_EMIT("vadd.f32 q4, q4, q14") /* q4 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vadd.f32 q5, q5, q14") \ + __ASM_EMIT("vmul.f32 q4, q2, q4") /* q4 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vmul.f32 q5, q3, q5") \ + __ASM_EMIT("vadd.f32 q4, q4, q15") /* q4 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vadd.f32 q5, q5, q15") \ + __ASM_EMIT("vmul.f32 q4, q2, q4") /* q4 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmul.f32 q5, q3, q5") \ + __ASM_EMIT("vmla.f32 q0, q0, q4") /* q0 = XX*(1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("vmla.f32 q1, q1, q5") + + #define SINF_X_PLUS_PI_2_CORE_X4 \ + /* q0 = X = x + PI/2 */ \ + /* q8 = PI/2 */ \ + /* q9 = PI */ \ + /* q10 = 1/(2*PI) */ \ + /* q11 = C0 */ \ + /* q12 = C1 */ \ + /* q13 = C2 */ \ + /* q14 = C3 */ \ + /* q15 = C4 */ \ + __ASM_EMIT("vmul.f32 q1, q0, q10") /* q1 = x / (2*PI) */ \ + __ASM_EMIT("vcvt.s32.f32 q2, q1") /* q2 = int(X / (2*PI)) */ \ + __ASM_EMIT("vadd.f32 q3, q9, q9") /* q3 = 2*PI */ \ + __ASM_EMIT("vsra.s32 q2, q0, #31") /* q2 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvt.f32.s32 q2, q2") /* q2 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vmls.f32 q0, q2, q3") /* q0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vadd.f32 q3, q8, q9") /* q3 = 3*PI/2 */ \ + __ASM_EMIT("vcge.f32 q1, q0, q9") /* q1 = [ Y >= PI ] */ \ + __ASM_EMIT("vsub.f32 q2, q3, q0") /* q2 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsub.f32 q0, q0, q8") /* q0 = Y - PI/2 */ \ + __ASM_EMIT("vbit q0, q2, q1") /* q0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* q0 = XX */ \ + __ASM_EMIT("vmul.f32 q1, q0, q0") /* q1 = X2 = XX*XX */ \ + __ASM_EMIT("vmul.f32 q2, q1, q11") /* q2 = X2*C0 */ \ + __ASM_EMIT("vadd.f32 q2, q2, q12") /* q2 = C1 + X2*C0 */ \ + __ASM_EMIT("vmul.f32 q2, q1, q2") /* q2 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vadd.f32 q2, q2, q13") /* q2 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vmul.f32 q2, q1, q2") /* q2 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vadd.f32 q2, q2, q14") /* q2 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vmul.f32 q2, q1, q2") /* q2 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vadd.f32 q2, q2, q15") /* q2 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vmul.f32 q2, q1, q2") /* q2 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmla.f32 q0, q0, q2") /* q0 = XX*(1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + void sinf1(float *dst, size_t count) + { + ARCH_ARM_ASM( + __ASM_EMIT("vldm %[S2C], {q8-q15}") + // x8 blocks + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vldm %[dst], {q0-q1}") + __ASM_EMIT("vadd.f32 q0, q0, q8") // q0 = x1 + PI/2 + __ASM_EMIT("vadd.f32 q1, q1, q8") // q1 = x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("vstm %[dst]!, {q0-q1}") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("blt 4f") + __ASM_EMIT("vld1.32 {q0}, [%[dst]]") + __ASM_EMIT("vadd.f32 q0, q0, q8") // q0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 12f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vld1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("6:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 8f") + __ASM_EMIT("vld1.32 {d1}, [%[dst]]") + __ASM_EMIT("8:") + __ASM_EMIT("vadd.f32 q0, q0, q8") // q0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 10f") + __ASM_EMIT("sub %[dst], #0x04") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("10:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 12f") + __ASM_EMIT("vst1.32 {d1}, [%[dst]]") + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + void sinf2(float *dst, const float *src, size_t count) + { + ARCH_ARM_ASM( + __ASM_EMIT("vldm %[S2C], {q8-q15}") + // x8 blocks + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vldm %[src]!, {q0-q1}") + __ASM_EMIT("vadd.f32 q0, q0, q8") // q0 = x1 + PI/2 + __ASM_EMIT("vadd.f32 q1, q1, q8") // q1 = x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("subs %[count], #8") + __ASM_EMIT("vstm %[dst]!, {q0-q1}") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("blt 4f") + __ASM_EMIT("vld1.32 {q0}, [%[src]]!") + __ASM_EMIT("vadd.f32 q0, q0, q8") // q0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("sub %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 12f") + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vld1.32 {d0[0]}, [%[src]]!") + __ASM_EMIT("6:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 8f") + __ASM_EMIT("vld1.32 {d1}, [%[src]]") + __ASM_EMIT("8:") + __ASM_EMIT("vadd.f32 q0, q0, q8") // q0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 10f") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("10:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 12f") + __ASM_EMIT("vst1.32 {d1}, [%[dst]]") + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "r" (&sinf_const[0]) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + void sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_ARM_ASM( + __ASM_EMIT("vld1.f32 {d8[], d9[]}, [%[k]]") // q4 = k + __ASM_EMIT("vld1.f32 {d10[], d11[]}, [%[p]]") // q5 = p + __ASM_EMIT("vldm %[S2C], {q8-q15}") + __ASM_EMIT("vldm %[S2KP], {q6-q7}") // q6 = i = 0 1 2 3, q7 = 4 ... + __ASM_EMIT("vadd.f32 q5, q5, q8") // q5 = p + PI/2 + // x4 blocks + __ASM_EMIT("subs %[count], #4") + __ASM_EMIT("blo 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmul.f32 q0, q6, q4") // q0 = k * i + __ASM_EMIT("vadd.f32 q6, q6, q7") // q6 = i + 4 + __ASM_EMIT("vadd.f32 q0, q0, q5") // q0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("subs %[count], #4") + __ASM_EMIT("vst1.32 {q0}, [%[dst]]!") + __ASM_EMIT("bhs 1b") + __ASM_EMIT("2:") + // Tail: 1x-3x block + __ASM_EMIT("adds %[count], #4") + __ASM_EMIT("bls 6f") + __ASM_EMIT("vmul.f32 q0, q6, q4") // q0 = k * i + __ASM_EMIT("vadd.f32 q0, q0, q5") // q0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("tst %[count], #1") + __ASM_EMIT("beq 4f") + __ASM_EMIT("vst1.32 {d0[0]}, [%[dst]]!") + __ASM_EMIT("vext.32 q0, q0, q0, #1") + __ASM_EMIT("4:") + __ASM_EMIT("tst %[count], #2") + __ASM_EMIT("beq 6f") + __ASM_EMIT("vst1.32 {d0}, [%[dst]]") + // End + __ASM_EMIT("6:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [k] "r" (&k), + [p] "r" (&p), + [S2C] "r" (&sinf_const[0]), + [S2KP] "r" (&kp_gen_const[0]) + : "cc", "memory", + "q0", "q1", "q2", "q3", + "q4", "q5", "q6", "q7", + "q8", "q9", "q10", "q11", + "q12", "q13", "q14", "q15" + ); + } + + } /* namespace neon_d32 */ +} /* namespace lsp */ + + + +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_SIN_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/arm/neon-d32/pmath.h 2025-08-26 18:15:43.702003524 +0000 @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 13 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_H_ +#define PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_H_ + +#ifndef PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_IMPL */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* PRIVATE_DSP_ARCH_ARM_NEON_D32_PMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/generic/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/generic/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/generic/3dmath.h 2025-03-01 12:42:56.788648410 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/generic/3dmath.h 2025-08-26 18:15:43.706003485 +0000 @@ -210,344 +210,6 @@ namespace lsp normalize_vector(p); } - void init_ray_xyz(ray3d_t *l, - float x0, float y0, float z0, - float x1, float y1, float z1 - ) - { - l->z.x = x0; - l->z.y = y0; - l->z.z = z0; - l->z.w = 1.0f; - - l->v.dx = (x1 - x0); - l->v.dy = (y1 - y0); - l->v.dz = (z1 - z0); - l->v.dw = 0.0f; - } - - void init_ray_dxyz(ray3d_t *l, - float x0, float y0, float z0, - float dx, float dy, float dz - ) - { - l->z.x = x0; - l->z.y = y0; - l->z.z = z0; - l->z.w = 1.0f; - - l->v.dx = dx; - l->v.dy = dy; - l->v.dz = dz; - l->v.dw = 0.0f; - } - - void init_ray_pdv(ray3d_t *l, const point3d_t *p, const vector3d_t *v) - { - l->z = *p; - l->v = *v; - } - - void init_ray_p2(ray3d_t *l, const point3d_t *p1, const point3d_t *p2) - { - l->z = *p1; - l->v.dx = (p2->x - p1->x); - l->v.dx = (p2->y - p1->y); - l->v.dx = (p2->z - p1->z); - l->v.dw = 0.0f; - } - - void init_ray_pv(ray3d_t *l, const point3d_t *p) - { - l->z = p[0]; - l->v.dx = (p[1].x - p[0].x); - l->v.dx = (p[1].y - p[0].y); - l->v.dx = (p[1].z - p[0].z); - l->v.dw = 0.0f; - } - - void init_ray(ray3d_t *l, const ray3d_t *r) - { - *l = *r; - } - - void calc_ray_xyz(ray3d_t *l, - float x0, float y0, float z0, - float x1, float y1, float z1 - ) - { - l->z.x = x0; - l->z.y = y0; - l->z.z = z0; - l->z.w = 1.0f; - - l->v.dx = (x1 - x0); - l->v.dy = (y1 - y0); - l->v.dz = (z1 - z0); - l->v.dw = 0.0f; - - normalize_vector(&l->v); - } - - void calc_ray_dxyz(ray3d_t *l, - float x0, float y0, float z0, - float dx, float dy, float dz - ) - { - l->z.x = x0; - l->z.y = y0; - l->z.z = z0; - l->z.w = 0.0f; - - l->v.dx = dx; - l->v.dy = dy; - l->v.dz = dz; - l->v.dw = 0.0f; - normalize_vector(&l->v); - } - - void calc_ray_pdv(ray3d_t *l, const point3d_t *p, const vector3d_t *v) - { - l->z = *p; - l->v = *v; - normalize_vector(&l->v); - } - - void calc_ray_p2(ray3d_t *l, const point3d_t *p1, const point3d_t *p2) - { - l->z = *p1; - l->v.dx = (p2->x - p1->x); - l->v.dx = (p2->y - p1->y); - l->v.dx = (p2->z - p1->z); - l->v.dw = 0.0f; - normalize_vector(&l->v); - } - - void calc_ray_pv(ray3d_t *l, const point3d_t *p) - { - l->z = p[0]; - l->v.dx = (p[1].x - p[0].x); - l->v.dx = (p[1].y - p[0].y); - l->v.dx = (p[1].z - p[0].z); - l->v.dw = 0.0f; - normalize_vector(&l->v); - } - - void calc_ray(ray3d_t *l, const ray3d_t *r) - { - *l = *r; - normalize_vector(&l->v); - } - - void init_segment_xyz(segment3d_t *s, - float x0, float y0, float z0, - float x1, float y1, float z1 - ) - { - s->p[0].x = x0; - s->p[0].y = y0; - s->p[0].z = z0; - s->p[0].w = 0.0f; - - s->p[1].x = x1; - s->p[1].y = y1; - s->p[1].z = z1; - s->p[1].w = 0.0f; - } - - void init_segment_p2(segment3d_t *s, const point3d_t *p1, const point3d_t *p2) - { - s->p[0] = *p1; - s->p[1] = *p2; - } - - void init_segment_pv(segment3d_t *s, const point3d_t *p) - { - s->p[0] = p[0]; - s->p[1] = p[1]; - } - - void calc_triangle3d_params(triangle3d_t *t) - { - // Calculate edge parameters - vector3d_t d[3]; - d[0].dx = t->p[1].x - t->p[0].x; - d[0].dy = t->p[1].y - t->p[0].y; - d[0].dz = t->p[1].z - t->p[0].z; - d[0].dw = t->p[1].w - t->p[0].w; - - d[1].dx = t->p[2].x - t->p[1].x; - d[1].dy = t->p[2].y - t->p[1].y; - d[1].dz = t->p[2].z - t->p[1].z; - d[1].dw = t->p[2].w - t->p[1].w; - - d[2].dx = t->p[2].x - t->p[0].x; - d[2].dy = t->p[2].y - t->p[0].y; - d[2].dz = t->p[2].z - t->p[0].z; - d[2].dw = t->p[2].w - t->p[0].w; - - // Do vector multiplication to calculate the normal vector - t->n.dx = + d[0].dy*d[2].dz - d[0].dz*d[2].dy; - t->n.dy = - d[0].dx*d[2].dz + d[0].dz*d[2].dx; - t->n.dz = + d[0].dx*d[2].dy - d[0].dy*d[2].dx; - t->n.dw = - ( t->n.dx * t->p[0].x + t->n.dy * t->p[0].y + t->n.dz * t->p[0].z); // Parameter for the plane equation - - // Calculate lengths of edges and (additionally) length of normal - float l[4]; - l[0] = sqrtf(d[0].dx*d[0].dx + d[0].dy*d[0].dy + d[0].dz*d[0].dz); - l[1] = sqrtf(d[1].dx*d[1].dx + d[1].dy*d[1].dy + d[1].dz*d[1].dz); - l[2] = sqrtf(d[2].dx*d[2].dx + d[2].dy*d[2].dy + d[2].dz*d[2].dz); - l[3] = sqrtf(t->n.dx*t->n.dx + t->n.dy*t->n.dy + t->n.dz*t->n.dz); - - // Calculate normal length and normalize normal - t->n.dx /= l[3]; - t->n.dy /= l[3]; - t->n.dz /= l[3]; - t->n.dw /= l[3]; - - // Additionally, calculate the length of edges - t->p[0].w = l[0]; - t->p[1].w = l[1]; - t->p[2].w = l[2]; - } - - void init_triangle3d_xyz(triangle3d_t *t, - float x0, float y0, float z0, - float x1, float y1, float z1, - float x2, float y2, float z2 - ) - { - // Initalize points - t->p[0].x = x0; - t->p[0].y = y0; - t->p[0].z = z0; - t->p[0].w = 0.0f; - - t->p[1].x = x1; - t->p[1].y = y1; - t->p[1].z = z1; - t->p[1].w = 0.0f; - - t->p[2].x = x2; - t->p[2].y = y2; - t->p[2].z = z2; - t->p[2].w = 0.0f; - - // Init normal - t->n.dx = 0.0f; - t->n.dy = 0.0f; - t->n.dz = 0.0f; - t->n.dw = 0.0f; - } - - void init_triangle3d_p3( - triangle3d_t *t, - const point3d_t *p1, - const point3d_t *p2, - const point3d_t *p3 - ) - { - // Initalize points - t->p[0] = *p1; - t->p[1] = *p2; - t->p[2] = *p3; - - // Init normal - t->n.dx = 0.0f; - t->n.dy = 0.0f; - t->n.dz = 0.0f; - t->n.dw = 0.0f; - } - - void init_triangle3d_pv( - triangle3d_t *t, - const point3d_t *p - ) - { - // Initalize points - t->p[0] = p[0]; - t->p[1] = p[1]; - t->p[2] = p[2]; - - // Init normal - t->n.dx = 0.0f; - t->n.dy = 0.0f; - t->n.dz = 0.0f; - t->n.dw = 0.0f; - } - - void init_triangle3d(triangle3d_t *dst, const triangle3d_t *src) - { - dst->p[0] = src->p[0]; - dst->p[1] = src->p[1]; - dst->p[2] = src->p[2]; - dst->n = src->n; - } - - void calc_triangle3d_xyz(triangle3d_t *t, - float x0, float y0, float z0, - float x1, float y1, float z1, - float x2, float y2, float z2 - ) - { - // Initalize points - t->p[0].x = x0; - t->p[0].y = y0; - t->p[0].z = z0; - t->p[0].w = 0.0f; - - t->p[1].x = x1; - t->p[1].y = y1; - t->p[1].z = z1; - t->p[1].w = 0.0f; - - t->p[2].x = x2; - t->p[2].y = y2; - t->p[2].z = z2; - t->p[2].w = 0.0f; - - // Calc parameters - calc_triangle3d_params(t); - } - - void calc_triangle3d_p3( - triangle3d_t *t, - const point3d_t *p1, - const point3d_t *p2, - const point3d_t *p3 - ) - { - // Initalize points - t->p[0] = *p1; - t->p[1] = *p2; - t->p[2] = *p3; - - // Calc parameters - calc_triangle3d_params(t); - } - - void calc_triangle3d_pv( - triangle3d_t *t, - const point3d_t *p - ) - { - // Initalize points - t->p[0] = p[0]; - t->p[1] = p[1]; - t->p[2] = p[2]; - - // Calc parameters - calc_triangle3d_params(t); - } - - void calc_triangle3d(triangle3d_t *dst, const triangle3d_t *src) - { - dst->p[0] = src->p[0]; - dst->p[1] = src->p[1]; - dst->p[2] = src->p[2]; - calc_triangle3d_params(dst); - } - void init_matrix3d(matrix3d_t *dst, const matrix3d_t *src) { *dst = *src; @@ -738,14 +400,17 @@ namespace lsp M[1] = 0.0f; M[2] = 0.0f; M[3] = 0.0f; + M[4] = 0.0f; M[5] = c; M[6] = s; M[7] = 0.0f; + M[8] = 0.0f; M[9] = -s; M[10] = c; M[11] = 0.0f; + M[12] = 0.0f; M[13] = 0.0f; M[14] = 0.0f; @@ -762,14 +427,17 @@ namespace lsp M[1] = 0.0f; M[2] = -s; M[3] = 0.0f; + M[4] = 0.0f; M[5] = 1.0f; M[6] = 0.0f; M[7] = 0.0f; + M[8] = s; M[9] = 0.0f; M[10] = c; M[11] = 0.0f; + M[12] = 0.0f; M[13] = 0.0f; M[14] = 0.0f; @@ -786,14 +454,17 @@ namespace lsp M[1] = s; M[2] = 0.0f; M[3] = 0.0f; + M[4] = -s; M[5] = c; M[6] = 0.0f; M[7] = 0.0f; + M[8] = 0.0f; M[9] = 0.0f; M[10] = 1.0f; M[11] = 0.0f; + M[12] = 0.0f; M[13] = 0.0f; M[14] = 0.0f; @@ -1176,132 +847,6 @@ namespace lsp } } - void calc_matrix3d_transform_p1v1(matrix3d_t *m, const point3d_t *p, const vector3d_t *v) - { - matrix3d_t xm; - - // Initialize matrix with translation and scaling parameters - float l = sqrtf(v->dx * v->dx + v->dy * v->dy + v->dz * v->dz); - m->m[0] = l; - m->m[1] = 0.0f; - m->m[2] = 0.0f; - m->m[3] = 0.0f; - - m->m[4] = 0.0f; - m->m[5] = l; - m->m[6] = 0.0f; - m->m[7] = 0.0f; - - m->m[8] = 0.0f; - m->m[9] = 0.0f; - m->m[10] = l; - m->m[11] = 0.0f; - - m->m[12] = p->x; - m->m[13] = p->y; - m->m[14] = p->z; - m->m[15] = 1.0f; - - if (l <= 0.0f) - return; - - // Compute normalized vector (with length = 1) - vector3d_t tv; - tv.dx = v->dx / l; - tv.dy = v->dy / l; - tv.dz = v->dz / l; - tv.dw = 0.0f; - - // Compute theta and phi - float sinp = tv.dx; - float cosp = sqrtf(tv.dy*tv.dy + tv.dz*tv.dz); - - // Apply rotation matrix around X axis - if (cosp > 0.0f) - { - float cost = tv.dz/cosp; - float sint = tv.dy/cosp; - - dsp::init_matrix3d_identity(&xm); - xm.m[5] = cost; - xm.m[6] = -sint; - xm.m[9] = sint; - xm.m[10] = cost; - dsp::apply_matrix3d_mm1(m, &xm); - } - - // Apply rotation matrix around Y axis - dsp::init_matrix3d_identity(&xm); - xm.m[0] = cosp; - xm.m[2] = -sinp; - xm.m[8] = sinp; - xm.m[10] = cosp; - dsp::apply_matrix3d_mm1(m, &xm); - } - - void calc_matrix3d_transform_r1(matrix3d_t *m, const ray3d_t *r) - { - matrix3d_t xm; - - // Initialize matrix with translation and scaling parameters - float l = sqrtf(r->v.dx * r->v.dx + r->v.dy * r->v.dy + r->v.dz * r->v.dz); - m->m[0] = l; - m->m[1] = 0.0f; - m->m[2] = 0.0f; - m->m[3] = 0.0f; - - m->m[4] = 0.0f; - m->m[5] = l; - m->m[6] = 0.0f; - m->m[7] = 0.0f; - - m->m[8] = 0.0f; - m->m[9] = 0.0f; - m->m[10] = l; - m->m[11] = 0.0f; - - m->m[12] = r->z.x; - m->m[13] = r->z.y; - m->m[14] = r->z.z; - m->m[15] = 1.0f; - - if (l <= 0.0f) - return; - - // Compute normalized vector (with length = 1) - vector3d_t tv; - tv.dx = r->v.dx / l; - tv.dy = r->v.dy / l; - tv.dz = r->v.dz / l; - tv.dw = 0.0f; - - // Compute theta and phi - float sinp = tv.dx; - float cosp = sqrtf(tv.dy*tv.dy + tv.dz*tv.dz); - - // Apply rotation matrix around X axis - if (cosp > 0.0f) - { - float cost = tv.dz/cosp; - float sint = tv.dy/cosp; - - dsp::init_matrix3d_identity(&xm); - xm.m[5] = cost; - xm.m[6] = -sint; - xm.m[9] = sint; - xm.m[10] = cost; - dsp::apply_matrix3d_mm1(m, &xm); - } - - // Apply rotation matrix around Y axis - dsp::init_matrix3d_identity(&xm); - xm.m[0] = cosp; - xm.m[2] = -sinp; - xm.m[8] = sinp; - xm.m[10] = cosp; - dsp::apply_matrix3d_mm1(m, &xm); - } - void apply_matrix3d_mv2(vector3d_t *r, const vector3d_t *v, const matrix3d_t *m) { const float *M = m->m; @@ -1520,48 +1065,6 @@ namespace lsp return v[2].dx * vt.dx + v[2].dy * vt.dy + v[2].dz * vt.dz; } - float check_triplet3d_t(const triangle3d_t *t) - { - // Calculate two vectors - vector3d_t v[3]; - v[0].dx = t->p[1].x - t->p[0].x; - v[0].dy = t->p[1].y - t->p[0].y; - v[0].dz = t->p[1].z - t->p[0].z; - - v[1].dx = t->p[2].x - t->p[1].x; - v[1].dy = t->p[2].y - t->p[1].y; - v[1].dz = t->p[2].z - t->p[1].z; - - // Calculate vector multiplication - v[2].dx = v[0].dy * v[1].dz - v[0].dz * v[1].dy; - v[2].dy = v[0].dz * v[1].dx - v[0].dx * v[1].dz; - v[2].dz = v[0].dx * v[1].dy - v[0].dy * v[1].dx; - - // Return result of scalar multiplication to the normal - return t->n.dx * v[2].dx + t->n.dy * v[2].dy + t->n.dz * v[2].dz; - } - - float check_triplet3d_tn(const triangle3d_t *t, const vector3d_t *n) - { - // Calculate two vectors - vector3d_t v[3]; - v[0].dx = t->p[1].x - t->p[0].x; - v[0].dy = t->p[1].y - t->p[0].y; - v[0].dz = t->p[1].z - t->p[0].z; - - v[1].dx = t->p[2].x - t->p[1].x; - v[1].dy = t->p[2].y - t->p[1].y; - v[1].dz = t->p[2].z - t->p[1].z; - - // Calculate vector multiplication - v[2].dx = v[0].dy * v[1].dz - v[0].dz * v[1].dy; - v[2].dy = v[0].dz * v[1].dx - v[0].dx * v[1].dz; - v[2].dz = v[0].dx * v[1].dy - v[0].dy * v[1].dx; - - // Return result of scalar multiplication to the normal - return n->dx * v[2].dx + n->dy * v[2].dy + n->dz * v[2].dz; - } - float check_point3d_on_triangle_p3p(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3, const point3d_t *p) { // Vector parameters @@ -1609,16 +1112,7 @@ namespace lsp if (r[2] < 0.0f) return r[2]; - // Check 4 - r[2] = r[0]*r[1]*r[2]; - if (r[2] != 0.0f) - return r[2]; - - // Edge check: 3 scalar multiplications - r[0] = v[0].dx * v[1].dx + v[0].dy * v[1].dy + v[0].dz * v[1].dz; - r[1] = v[1].dx * v[2].dx + v[1].dy * v[2].dy + v[1].dz * v[2].dz; - r[2] = v[2].dx * v[0].dx + v[2].dy * v[0].dy + v[2].dz * v[0].dz; - + // The point may be located on the edge or on the vertex return r[0]*r[1]*r[2]; } @@ -1669,76 +1163,7 @@ namespace lsp if (r[2] < 0.0f) return r[2]; - // Check 4 - r[2] = r[0]*r[1]*r[2]; - if (r[2] != 0.0f) - return r[2]; - - // Edge check: 3 scalar multiplications - r[0] = v[0].dx * v[1].dx + v[0].dy * v[1].dy + v[0].dz * v[1].dz; - r[1] = v[1].dx * v[2].dx + v[1].dy * v[2].dy + v[1].dz * v[2].dz; - r[2] = v[2].dx * v[0].dx + v[2].dy * v[0].dy + v[2].dz * v[0].dz; - - return r[0]*r[1]*r[2]; - } - - inline float check_point3d_on_triangle_tp(const triangle3d_t *t, const point3d_t *p) - { - // Vector parameters - vector3d_t v[3]; - v[0].dx = t->p[0].x - p->x; - v[0].dy = t->p[0].y - p->y; - v[0].dz = t->p[0].z - p->z; - - v[1].dx = t->p[1].x - p->x; - v[1].dy = t->p[1].y - p->y; - v[1].dz = t->p[1].z - p->z; - - v[2].dx = t->p[2].x - p->x; - v[2].dy = t->p[2].y - p->y; - v[2].dz = t->p[2].z - p->z; - - // Do logic - vector3d_t m[3]; - float r[3]; - - // Check 1: 2 vector multiplications and 1 scalar - m[0].dx = v[0].dy * v[1].dz - v[0].dz * v[1].dy; - m[0].dy = v[0].dz * v[1].dx - v[0].dx * v[1].dz; - m[0].dz = v[0].dx * v[1].dy - v[0].dy * v[1].dx; - - m[1].dx = v[1].dy * v[2].dz - v[1].dz * v[2].dy; - m[1].dy = v[1].dz * v[2].dx - v[1].dx * v[2].dz; - m[1].dz = v[1].dx * v[2].dy - v[1].dy * v[2].dx; - - r[0] = m[0].dx * m[1].dx + m[0].dy * m[1].dy + m[0].dz * m[1].dz; - if (r[0] < 0.0f) - return r[0]; - - // Check 2: 1 vector multiplication and 1 scalar - m[2].dx = v[2].dy * v[0].dz - v[2].dz * v[0].dy; - m[2].dy = v[2].dz * v[0].dx - v[2].dx * v[0].dz; - m[2].dz = v[2].dx * v[0].dy - v[2].dy * v[0].dx; - - r[1] = m[1].dx * m[2].dx + m[1].dy * m[2].dy + m[1].dz * m[2].dz; - if (r[1] < 0.0f) - return r[1]; - - // Check 3: 1 scalar multiplication - r[2] = m[2].dx * m[0].dx + m[2].dy * m[0].dy + m[2].dz * m[0].dz; - if (r[2] < 0.0f) - return r[2]; - - // Check 4 - r[2] = r[0]*r[1]*r[2]; - if (r[2] != 0.0f) - return r[2]; - - // Edge check: 3 scalar multiplications - r[0] = v[0].dx * v[1].dx + v[0].dy * v[1].dy + v[0].dz * v[1].dz; - r[1] = v[1].dx * v[2].dx + v[1].dy * v[2].dy + v[1].dz * v[2].dz; - r[2] = v[2].dx * v[0].dx + v[2].dy * v[0].dy + v[2].dz * v[0].dz; - + // The point may be located on the edge or on the vertex return r[0]*r[1]*r[2]; } @@ -1808,9 +1233,9 @@ namespace lsp r[1] = v[1].dx * v[1].dx + v[1].dy * v[1].dy + v[1].dz * v[1].dz; r[2] = v[2].dx * v[2].dx + v[2].dy * v[2].dy + v[2].dz * v[2].dz; - if (r[0] > r[1]) - return (r[0] > r[2]) ? 0 : 2; - return (r[1] > r[2]) ? 1 : 2; + if (r[0] >= r[1]) + return (r[0] >= r[2]) ? 0 : 2; + return (r[1] >= r[2]) ? 1 : 2; } size_t longest_edge3d_pv(const point3d_t *p) @@ -1833,9 +1258,9 @@ namespace lsp r[1] = v[1].dx * v[1].dx + v[1].dy * v[1].dy + v[1].dz * v[1].dz; r[2] = v[2].dx * v[2].dx + v[2].dy * v[2].dy + v[2].dz * v[2].dz; - if (r[0] > r[1]) - return (r[0] > r[2]) ? 0 : 2; - return (r[1] > r[2]) ? 1 : 2; + if (r[0] >= r[1]) + return (r[0] >= r[2]) ? 0 : 2; + return (r[1] >= r[2]) ? 1 : 2; } float calc_angle3d_v2(const vector3d_t *v1, const vector3d_t *v2) diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/cos.h 2025-08-26 18:15:43.714003408 +0000 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 10 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_GENERIC_PMATH_COS_H_ +#define PRIVATE_DSP_ARCH_GENERIC_PMATH_COS_H_ + +#ifndef PRIVATE_DSP_ARCH_GENERIC_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_GENERIC_IMPL */ + +namespace lsp +{ + namespace generic + { + void cosf1(float *dst, size_t count) + { + for (size_t i=0; i + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 10 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_GENERIC_PMATH_LANCZOS_H_ +#define PRIVATE_DSP_ARCH_GENERIC_PMATH_LANCZOS_H_ + +#ifndef PRIVATE_DSP_ARCH_GENERIC_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_GENERIC_IMPL */ + +namespace lsp +{ + namespace generic + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + for (size_t j=0; j= 1e-4f) ? (sinf(x1) * sinf(x2)) / (x1 * x2) : 1.0f; + } + else + dst[j] = 0.0f; + } + } + + } /* namespace generic */ +} /* namespace lsp */ + + +#endif /* PRIVATE_DSP_ARCH_GENERIC_PMATH_LANCZOS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/generic/pmath/sin.h 2025-08-26 18:15:43.714003408 +0000 @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 10 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_GENERIC_PMATH_SIN_H_ +#define PRIVATE_DSP_ARCH_GENERIC_PMATH_SIN_H_ + +#ifndef PRIVATE_DSP_ARCH_GENERIC_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_GENERIC_IMPL */ + +namespace lsp +{ + namespace generic + { + void sinf1(float *dst, size_t count) + { + for (size_t i=0; i +#include #include #include #include +#include #include #include #include @@ -37,6 +39,7 @@ #include #include #include +#include #include #include diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx/3dmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx/3dmath.h 2025-08-26 18:15:43.718003369 +0000 @@ -0,0 +1,3112 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 13 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX_3DMATH_H_ +#define PRIVATE_DSP_ARCH_X86_AVX_3DMATH_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX_IMPL */ + +// Normalize vector/point +// Input: +// x0 = vector/point to normalize, w = 0 +// x1 = temp +// x2 = temp +// Output: +// x0 = normalized vector/point +#define NORMALIZE(x0, x1, x2) /* x0 = vector/point to normalize */ \ + __ASM_EMIT("vmulps %" x0 ", %" x0 ", %" x2) /* x2 = x*x y*y z*z 0 */ \ + __ASM_EMIT("vhaddps %" x2 ", %" x2 ", %" x1) /* x1 = x*x+y*y z*z x*x+y*y z*z */ \ + __ASM_EMIT("vhaddps %" x1 ", %" x1 ", %" x1) /* x1 = w2 w2 w2 w2 = x*x + y*y + z*z ... */ \ + __ASM_EMIT("vxorps %" x2 ", %" x2 ", %" x2) /* x2 = 0 */ \ + __ASM_EMIT("vsqrtps %" x1 ", %" x1) /* x1 = w = sqrt(w2) */ \ + __ASM_EMIT("vcmpps $4, %" x2 ", %" x0 ", %" x2) /* x2 = (w != 0) */ \ + __ASM_EMIT("vdivps %" x1 ", %" x0 ", %" x0) /* x0 = x/w y/w z/w w/w */ \ + __ASM_EMIT("vandps %" x2 ", %" x0 ", %" x0) /* x0 = (w != 0) ? x/w y/w z/w w/w : 0 */ \ + +// Load matrix +// Input: +// ptr = address of matrix +// Output: +// x0 = row 0 +// x1 = row 1 +// x2 = row 2 +// x3 = row 3 +#define MATRIX_LOAD(ptr, x0, x1, x2, x3) \ + __ASM_EMIT("vmovups 0x00(%[" ptr "]), %" x0 ) \ + __ASM_EMIT("vmovups 0x10(%[" ptr "]), %" x1 ) \ + __ASM_EMIT("vmovups 0x20(%[" ptr "]), %" x2 ) \ + __ASM_EMIT("vmovups 0x30(%[" ptr "]), %" x3 ) + +// Store matrix +// Input: +// ptr = address of matrix +// x0 = row 0 +// x1 = row 1 +// x2 = row 2 +// x3 = row 3 +#define MATRIX_STORE(ptr, x0, x1, x2, x3) \ + __ASM_EMIT("vmovups %" x0 ", 0x00(%[" ptr "])") \ + __ASM_EMIT("vmovups %" x1 ", 0x10(%[" ptr "])") \ + __ASM_EMIT("vmovups %" x2 ", 0x20(%[" ptr "])") \ + __ASM_EMIT("vmovups %" x3 ", 0x30(%[" ptr "])") + +// Transpose 4x4 matrix +// Input: +// x0 = row 0 +// x1 = row 1 +// x2 = row 2 +// x3 = row 3 +// x4 = temp +// Output: +// x0 = row 0 +// x1 = row 1 +// x2 = row 2 +// x3 = row 3 +#define MAT4_TRANSPOSE(x0, x1, x2, x3, x4) \ + __ASM_EMIT("vpunpckhdq %" x3 ", %" x2 ", %" x4) /* x4 = c3 d3 c4 d4 */ \ + __ASM_EMIT("vpunpckldq %" x3 ", %" x2 ", %" x2) /* x2 = c1 d1 c2 d2 */ \ + __ASM_EMIT("vpunpckhdq %" x1 ", %" x0 ", %" x3) /* x3 = a3 b3 a4 b4 */ \ + __ASM_EMIT("vpunpckldq %" x1 ", %" x0 ", %" x0) /* x0 = a1 b1 a2 b2 */ \ + __ASM_EMIT("vpunpckhqdq %" x2 ", %" x0 ", %" x1) /* x1 = a2 b2 c2 d2 */ \ + __ASM_EMIT("vpunpcklqdq %" x2 ", %" x0 ", %" x0) /* x0 = a1 b1 c1 d1 */ \ + __ASM_EMIT("vpunpcklqdq %" x4 ", %" x3 ", %" x2) /* x2 = a3 b3 c3 d3 */ \ + __ASM_EMIT("vpunpckhqdq %" x4 ", %" x3 ", %" x3) /* x3 = a4 b4 c4 d4 */ + +// Transpose 3x3 matrix +// Input: +// x0 = row 0 = a0 a1 a2 ? +// x1 = row 1 = b0 b1 b2 ? +// x2 = row 2 = c0 c1 c2 ? +// x3 = temp +// Output: +// x0 = row 0 = a0 b0 c0 ? +// x1 = row 1 = a1 b1 c1 ? +// x2 = row 2 = a2 b2 c2 ? +#define MAT3_TRANSPOSE(x0, x1, x2, x3) \ + __ASM_EMIT("vunpckhps %" x1 ", %" x0 ", %" x3) /* x3 = a2 b2 ? ? */ \ + __ASM_EMIT("vunpcklps %" x1 ", %" x0 ", %" x0) /* x0 = a0 b0 a1 b1 */ \ + __ASM_EMIT("vmovhlps %" x0 ", %" x1 ", %" x1) /* x1 = a1 b1 b2 ? */ \ + __ASM_EMIT("vmovlhps %" x2 ", %" x0 ", %" x0) /* x0 = a0 b0 c0 c1 */ \ + __ASM_EMIT("vshufps $0x54, %" x2 ", %" x1", %" x1) /* x1 = a1 b1 c1 c1 */ \ + __ASM_EMIT("vshufps $0xa4, %" x2 ", %" x3", %" x2) /* x2 = a2 b2 c2 c2 */ + +// Multiply martix by vector +// Input: +// x0 = martix row 0 (A) +// x1 = matrix row 1 (B) +// x2 = matrix row 2 (C) +// x3 = matrix row 3 (D) +// x4 = in vector, modified +// x5 = tmp +// x6 = tmp +// x7 = tmp +// Output: +// x8 = out vector +#define MATMUL_CORE(x0, x1, x2, x3, x4, x5, x6, x7, x8) \ + __ASM_EMIT("vshufps $0xff, %" x4 ", %" x4 ", %" x7) /* x7 = v3 v3 v3 v3 */ \ + __ASM_EMIT("vshufps $0xaa, %" x4 ", %" x4 ", %" x6) /* x6 = v2 v2 v2 v2 */ \ + __ASM_EMIT("vshufps $0x55, %" x4 ", %" x4 ", %" x5) /* x5 = v1 v1 v1 v1 */ \ + __ASM_EMIT("vshufps $0x00, %" x4 ", %" x4 ", %" x4) /* x4 = v0 v0 v0 v0 */ \ + __ASM_EMIT("vmulps %" x7 ", %" x3 ", %" x7) /* x7 = d0*v3 d1*v3 d2*v3 d3*v3 */ \ + __ASM_EMIT("vmulps %" x6 ", %" x2 ", %" x6) /* x6 = c0*v2 c1*v2 c2*v2 c3*v2 */ \ + __ASM_EMIT("vmulps %" x5 ", %" x1 ", %" x5) /* x5 = b0*v1 d1*v1 d2*v1 d3*v1 */ \ + __ASM_EMIT("vmulps %" x4 ", %" x0 ", %" x4) /* x4 = a0*v0 c1*v0 c2*v0 c3*v0 */ \ + __ASM_EMIT("vaddps %" x7 ", %" x6 ", %" x6) \ + __ASM_EMIT("vaddps %" x5 ", %" x4 ", %" x4) \ + __ASM_EMIT("vaddps %" x6 ", %" x4 ", %" x8) + +// Multiply martix by vector (FMA3) +// Input: +// x0 = martix row 0 (A) +// x1 = matrix row 1 (B) +// x2 = matrix row 2 (C) +// x3 = matrix row 3 (D) +// x4 = in vector, modified +// x5 = tmp +// x6 = tmp +// x7 = tmp +// Output: +// x8 = out vector + #define MATMUL_CORE_FMA3(x0, x1, x2, x3, x4, x5, x6, x7, x8) \ + __ASM_EMIT("vshufps $0xff, %" x4 ", %" x4 ", %" x7) /* x7 = v3 v3 v3 v3 */ \ + __ASM_EMIT("vshufps $0xaa, %" x4 ", %" x4 ", %" x6) /* x6 = v2 v2 v2 v2 */ \ + __ASM_EMIT("vshufps $0x55, %" x4 ", %" x4 ", %" x5) /* x5 = v1 v1 v1 v1 */ \ + __ASM_EMIT("vshufps $0x00, %" x4 ", %" x4 ", %" x4) /* x4 = v0 v0 v0 v0 */ \ + __ASM_EMIT("vmulps %" x6 ", %" x2 ", %" x6) /* x6 = c0*v2 c1*v2 c2*v2 c3*v2 */ \ + __ASM_EMIT("vmulps %" x4 ", %" x0 ", %" x4) /* x4 = a0*v0 c1*v0 c2*v0 c3*v0 */ \ + __ASM_EMIT("vfmadd231ps %" x7 ", %" x3 ", %" x6) \ + __ASM_EMIT("vfmadd231ps %" x5 ", %" x1 ", %" x4) \ + __ASM_EMIT("vaddps %" x6 ", %" x4 ", %" x8) + +// 1x vector cross-product (3 coordinates) +// Input: +// x0 = vector1 [dx1 dy1 dz1 0 ] +// x1 = vector2 [dx2 dy2 dz2 0 ] +// x2 = temporary +// x3 = temporary +// +// Output: +// x0 = vector1 * vector2 [ vz vx vy 0 ] +#define VECTOR_CROSS3(x0, x1, x2, x3) \ + __ASM_EMIT("vshufps $0xc9, %" x0 ", %" x0 ", %" x2) /* x2 = dy1 dz1 dx1 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x1 ", %" x1 ", %" x3) /* x3 = dy2 dz2 dx2 0 */ \ + __ASM_EMIT("vmulps %" x2 ", %" x1 ", %" x1) /* x1 = dx2*dy1 dy2*dz1 dz2*dx1 0 */ \ + __ASM_EMIT("vmulps %" x3 ", %" x0 ", %" x0) /* x0 = dx1*dy2 dy1*dz2 dz1*dx2 0 */ \ + __ASM_EMIT("vsubps %" x1 ", %" x0 ", %" x0) /* x0 = dx1*dy2-dx2*dy1 dy1*dz2-dy2*dz1 dz1*dx2-dz2*dx1 0 = NY NZ NX 0 */ \ + +// 1x vector cross-product (3 coordinates), FMA3 +// Input: +// x0 = vector1 [dx1 dy1 dz1 0 ] +// x1 = vector2 [dx2 dy2 dz2 0 ] +// x2 = temporary +// x3 = temporary +// +// Output: +// x0 = vector1 * vector2 [ vz vx vy 0 ] +#define VECTOR_CROSS3_FMA3(x0, x1, x2, x3) \ + __ASM_EMIT("vshufps $0xc9, %" x0 ", %" x0 ", %" x2) /* x2 = dy1 dz1 dx1 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x1 ", %" x1 ", %" x3) /* x3 = dy2 dz2 dx2 0 */ \ + __ASM_EMIT("vmulps %" x2 ", %" x1 ", %" x1) /* x1 = dx2*dy1 dy2*dz1 dz2*dx1 0 */ \ + __ASM_EMIT("vfmsub213ps %" x1 ", %" x3 ", %" x0) /* x0 = dx1*dy2-dx2*dy1 dy1*dz2-dy2*dz1 dz1*dx2-dz2*dx1 0 = NY NZ NX 0 */ + +/* 1x vector dot-product (3 coordinates) + * Input: + * x0 = vector1 [dx1 dy1 dz1 0 ] + * x1 = vector2 [dx2 dy2 dz2 0 ] + * x2 = temporary + * x3 = temporary + * + * Output: + * x0 = result (scalar) + */ +#define VECTOR_DOT3(x0, x1, x2, x3) \ + /* do not use DPPS as it is slow */ \ + /* shuffles and adds work faster than vhaddps */ \ + __ASM_EMIT("vmulps %" x1 ", %" x0 ", %" x0) /* x0 = dx1*dx2 dy1*dy2 dz1*dz2 ? */ \ + __ASM_EMIT("vshufps $0x55, %" x0 ", %" x0 ", %" x3) /* x3 = dy1*dy2 */ \ + __ASM_EMIT("vmovhlps %" x0 ", %" x0 ", %" x2) /* x2 = dz1*dz2 ? ? ? */ \ + __ASM_EMIT("vaddss %" x3 ", %" x0 ", %" x0) /* x0 = dx1*dx2 + dy1*dy2 */ \ + __ASM_EMIT("vaddss %" x2 ", %" x0 ", %" x0) /* x0 = dx1*dx2 + dy1*dy2 + dz1*dz2 */ \ + +/* Compute projection of the normal to the result of cross product of two vectors (mixed product) + * Input: + * x0 = vector a [ x0 y0 z0 0 ] + * x1 = vector b [ x1 y1 z1 0 ] + * x2 = vector c [ x2 y2 z2 0 ] + * x3 = temporary + * x4 = temporary + * + * Output: + * x0 = cross product: a dot (b cross c) + */ +#define MIXED_PRODUCT3(x0, x1, x2, x3, x4) \ + __ASM_EMIT("vshufps $0xc9, %" x1 ", %" x1 ", %" x3) /* x3 = y1 z1 x1 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x2 ", %" x2 ", %" x4) /* x4 = y2 z2 x2 0 */ \ + __ASM_EMIT("vshufps $0xd2, %" x0 ", %" x0 ", %" x0) /* x0 = z0 x0 y0 0 */ \ + __ASM_EMIT("vmulps %" x4 ", %" x1 ", %" x1) /* x1 = x1*y2 y1*z2 z1*x2 w1*w2 */ \ + __ASM_EMIT("vmulps %" x3 ", %" x2 ", %" x2) /* x2 = y1*x2 z1*y2 x1*z2 w1*w2 */ \ + __ASM_EMIT("vsubps %" x2 ", %" x1 ", %" x1) /* x1 = x1*y2-y1*x2 y1*z2-z1*y2 z1*x2-x1*z2 0 = vz vx vy 0 */ \ + __ASM_EMIT("vmulps %" x1 ", %" x0 ", %" x0) /* x0 = z0*vz x0*vx y0*vy 0 */ \ + __ASM_EMIT("vmovhlps %" x0 ", %" x2 ", %" x2) /* x2 = y0*vy 0 ? ? */ \ + __ASM_EMIT("vunpcklps %" x0 ", %" x0 ", %" x0) /* x0 = z0*vz z0*vz x0*vx x0*vx */ \ + __ASM_EMIT("vmovhlps %" x0 ", %" x1 ", %" x1) /* x1 = x0*vx x0*vx ? ? */ \ + __ASM_EMIT("vaddss %" x2 ", %" x0 ", %" x0) /* x0 = z0*vz + y0*vy */ \ + __ASM_EMIT("vaddss %" x1 ", %" x0 ", %" x0) /* x0 = z0*vz + y0*vy + x0*vx */ + +/* Compute projection of the normal to the result of cross product of two vectors (mixed product), FMA3 implementation + * Input: + * x0 = vector a [ x0 y0 z0 0 ] + * x1 = vector b [ x1 y1 z1 0 ] + * x2 = vector c [ x2 y2 z2 0 ] + * x3 = temporary + * x4 = temporary + * + * Output: + * x0 = cross product: a dot (b cross c) + */ +#define MIXED_PRODUCT3_FMA3(x0, x1, x2, x3, x4) \ + __ASM_EMIT("vshufps $0xc9, %" x1 ", %" x1 ", %" x3) /* x3 = y1 z1 x1 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x2 ", %" x2 ", %" x4) /* x4 = y2 z2 x2 0 */ \ + __ASM_EMIT("vshufps $0xd2, %" x0 ", %" x0 ", %" x0) /* x0 = z0 x0 y0 0 */ \ + __ASM_EMIT("vmulps %" x4 ", %" x1 ", %" x1) /* x1 = x1*y2 y1*z2 z1*x2 w1*w2 */ \ + __ASM_EMIT("vfnmadd231ps %" x3 ", %" x2 ", %" x1) /* x1 = x1*y2-y1*x2 y1*z2-z1*y2 z1*x2-x1*z2 0 = vz vx vy 0 */ \ + __ASM_EMIT("vmulps %" x1 ", %" x0 ", %" x0) /* x0 = z0*vz x0*vx y0*vy 0 */ \ + __ASM_EMIT("vmovhlps %" x0 ", %" x2 ", %" x2) /* x2 = y0*vy 0 ? ? */ \ + __ASM_EMIT("vunpcklps %" x0 ", %" x0 ", %" x0) /* x0 = z0*vz z0*vz x0*vx x0*vx */ \ + __ASM_EMIT("vmovhlps %" x0 ", %" x1 ", %" x1) /* x1 = x0*vx x0*vx ? ? */ \ + __ASM_EMIT("vaddss %" x2 ", %" x0 ", %" x0) /* x0 = z0*vz + y0*vy */ \ + __ASM_EMIT("vaddss %" x1 ", %" x0 ", %" x0) /* x0 = z0*vz + y0*vy + x0*vx */ + + +/* 3x vector multiplication + * Input: + * x0 = vector1 [dx0 dy0 dz0 0 ] + * x1 = vector2 [dx1 dy1 dz1 0 ] + * x2 = vector3 [dx2 dy2 dz2 0 ] + * + * Output: + * x0 = vector1 * vector2 [ vz vx vy 0 ] + * x1 = vector2 * vector3 [ vz vx vy 0 ] + * x2 = vector3 * vector1 [ vz vx vy 0 ] + */ +#define VECTOR_CROSS3_X3(x0, x1, x2, x3, x4, x5, x6, x7) \ + __ASM_EMIT("vshufps $0xc9, %" x0 ", %" x0 ", %" x3) /* x3 = dy0 dz0 dx0 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x1 ", %" x1 ", %" x4) /* x4 = dy1 dz1 dx1 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x2 ", %" x2 ", %" x5) /* x5 = dy2 dz2 dx2 0 */ \ + __ASM_EMIT("vmulps %" x4 ", %" x0 ", %" x6) /* x6 = dx0*dy1 dy0*dz1 dz0*dx1 0 */ \ + __ASM_EMIT("vmulps %" x3 ", %" x1 ", %" x7) /* x7 = dy0*dx1 dz0*dy1 dx0*dz1 0 */ \ + __ASM_EMIT("vmulps %" x5 ", %" x1 ", %" x1) /* x1 = dx1*dy2 dy1*dz2 dz1*dx2 0 */ \ + __ASM_EMIT("vmulps %" x2 ", %" x4 ", %" x4) /* x4 = dy1*dx2 dz1*dy2 dx1*dz2 0 */ \ + __ASM_EMIT("vmulps %" x3 ", %" x2 ", %" x2) /* x2 = dx2*dy0 dy2*dz0 dz2*dx0 0 */ \ + __ASM_EMIT("vmulps %" x0 ", %" x5 ", %" x5) /* x5 = dy2*dx0 dz2*dy0 dx2*dz0 0 */ \ + __ASM_EMIT("vsubps %" x7 ", %" x6 ", %" x0) /* x0 = N0 = (dx0*dy1-dy0*dx1 dy0*dz1-dz0*dy1 dz0*dx1-dx0*dz1 0) */ \ + __ASM_EMIT("vsubps %" x4 ", %" x1 ", %" x1) /* x1 = N1 = (dx1*dy2-dy1*dx2 dy1*dz2-dz1*dy2 dz1*dx2-dx1*dz2 0) */ \ + __ASM_EMIT("vsubps %" x5 ", %" x2 ", %" x2) /* x2 = N2 = (dx2*dy0-dy2*dx0 dy2*dz0-dz2*dy0 dz2*dx0-dx2*dz0 0)*/ + +#define VECTOR_CROSS3_X3_FMA3(x0, x1, x2, x3, x4, x5, x6, x7) \ + __ASM_EMIT("vshufps $0xc9, %" x0 ", %" x0 ", %" x3) /* x3 = dy0 dz0 dx0 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x1 ", %" x1 ", %" x4) /* x4 = dy1 dz1 dx1 0 */ \ + __ASM_EMIT("vshufps $0xc9, %" x2 ", %" x2 ", %" x5) /* x5 = dy2 dz2 dx2 0 */ \ + __ASM_EMIT("vmulps %" x4 ", %" x0 ", %" x6) /* x6 = dx0*dy1 dy0*dz1 dz0*dx1 0 */ \ + __ASM_EMIT("vmulps %" x3 ", %" x1 ", %" x7) /* x7 = dy0*dx1 dz0*dy1 dx0*dz1 0 */ \ + __ASM_EMIT("vmulps %" x2 ", %" x4 ", %" x4) /* x4 = dy1*dx2 dz1*dy2 dx1*dz2 0 */ \ + __ASM_EMIT("vmulps %" x3 ", %" x2 ", %" x2) /* x2 = dx2*dy0 dy2*dz0 dz2*dx0 0 */ \ + __ASM_EMIT("vfmsub213ps %" x4 ", %" x5 ", %" x1) /* x1 = N1 = (dx1*dy2-dy1*dx2 dy1*dz2-dz1*dy2 dz1*dx2-dx1*dz2 0) */ \ + __ASM_EMIT("vfnmadd231ps %" x0 ", %" x5 ", %" x2) /* x2 = N2 = (dx2*dy0-dy2*dx0 dy2*dz0-dz2*dy0 dz2*dx0-dx2*dz0 0)*/ \ + __ASM_EMIT("vsubps %" x7 ", %" x6 ", %" x0) /* x0 = N0 = (dx0*dy1-dy0*dx1 dy0*dz1-dz0*dy1 dz0*dx1-dx0*dz1 0) */ + + +/* 3x scalar multiplication + * Input: + * x0 = vector1 [dx0 dy0 dz0 0 ] + * x1 = vector2 [dx1 dy1 dz1 0 ] + * x2 = vector3 [dx2 dy2 dz2 0 ] + * + * Output: + * x0 = vector1 * vector2 [ a ? ? ? ] + * x1 = vector2 * vector3 [ b ? ? ? ] + * x2 = vector3 * vector1 [ c ? ? ? ] + */ +#define VECTOR_DOT3_X3(x0, x1, x2, x3) \ + __ASM_EMIT("vmulps %" x1 ", %" x0 ", %" x3) /* x3 = A = dx0*dx1 dy0*dy1 dz0*dz1 0 */ \ + __ASM_EMIT("vmulps %" x2 ", %" x1 ", %" x1) /* x1 = B = dx1*dx2 dy1*dy2 dz1*dz2 0 */ \ + __ASM_EMIT("vmulps %" x0 ", %" x2 ", %" x2) /* x2 = C = dx2*dx0 dy2*dy0 dz2*dz0 0 */ \ + __ASM_EMIT("vhaddps %" x3 ", %" x3 ", %" x0) /* x0 = ax+ay az ax+ay az */ \ + __ASM_EMIT("vhaddps %" x1 ", %" x1 ", %" x1) /* x1 = bx+by bz bx+by bz */ \ + __ASM_EMIT("vhaddps %" x2 ", %" x2 ", %" x2) /* x2 = cx+cy cz cx+cy cz */ \ + __ASM_EMIT("vhaddps %" x0 ", %" x0 ", %" x0) /* x0 = A = ax+ay+az ... */ \ + __ASM_EMIT("vhaddps %" x1 ", %" x1 ", %" x1) /* x1 = B = bx+by+bz ... */ \ + __ASM_EMIT("vhaddps %" x2 ", %" x2 ", %" x2) /* x2 = C = cx+cy+cz ... */ + +namespace lsp +{ + namespace avx + { + using namespace dsp; + + IF_ARCH_X86( + static const float IDENTITY[16] __lsp_aligned32 = + { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }; + static const float ONE[] __lsp_aligned32 = { LSP_DSP_VEC8(1.0f) }; + static const uint32_t IONE[] __lsp_aligned16 = { LSP_DSP_VEC4(1) }; + + static const float X_3D_MTOLERANCE[] __lsp_aligned16 = { LSP_DSP_VEC4(-DSP_3D_TOLERANCE) }; + static const float X_3D_TOLERANCE[] __lsp_aligned16 = { LSP_DSP_VEC4(DSP_3D_TOLERANCE) }; + static const uint32_t X_MASK0111[] __lsp_aligned16 = { 0xffffffff, 0xffffffff, 0xffffffff, 0 }; + static const uint32_t X_SMASK0001[] __lsp_aligned16 = { 0x80000000, 0, 0, 0 }; + static const uint32_t X_SMASK0010[] __lsp_aligned16 = { 0, 0x80000000, 0, 0 }; + static const uint32_t X_SMASK0100[] __lsp_aligned16 = { 0, 0, 0x80000000, 0 }; + static const uint32_t X_SMASK0111[] __lsp_aligned16 = { 0x80000000, 0x80000000, 0x80000000, 0 }; + + static const uint32_t ICULL3[] __lsp_aligned16 = { 0x01, 0x04, 0x10, 0 }; + ) + + void init_point_xyz(point3d_t *p, float x, float y, float z) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vmovlhps %[x1], %[x0], %[x0]") // x0 = x ? y ? + __ASM_EMIT("vmovhps %[id], %[x2], %[x2]") // x2 = z ? 1 0 + __ASM_EMIT("vshufps $0x88, %[x2], %[x0], %[x0]") // x0 = x y z 1 + __ASM_EMIT("vmovups %[x0], (%[p])") + + : [x0] "+x" (x), [x1] "+x" (y), [x2] "+x"(z) + : [p] "r" (p), + [id] "m" (IDENTITY) + : "memory" + ); + } + + void init_point(point3d_t *p, const point3d_t *s) + { + float x0; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[s]), %[x0]") + __ASM_EMIT("vmovups %[x0], (%[p])") + : [x0] "=&x" (x0) + : [s] "r" (s), [p] "r" (p) + : "memory" + ); + } + + void normalize_point(point3d_t *p) + { + float x0, x1, x2; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p]), %[x0]") // x0 = x y z w + __ASM_EMIT("vandps %[mask], %[x0], %[x0]") // x0 = x y z 0 + NORMALIZE("[x0]", "[x1]", "[x2]") + __ASM_EMIT("vinsertps $0x30, %[id], %[x0], %[x0]") // x0 = x y z 1 + __ASM_EMIT("vmovups %[x0], (%[p])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) + : [p] "r" (p), + [id] "m" (IDENTITY), + [mask] "m" (X_MASK0111) + : "cc", "memory" + ); + } + + void init_vector_dxyz(vector3d_t *p, float dx, float dy, float dz) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vmovlhps %[x1], %[x0], %[x0]") // x0 = dx ? dy ? + __ASM_EMIT("vmovhps %[id], %[x2], %[x2]") // x2 = dz ? 1 0 + __ASM_EMIT("vshufps $0xc8, %[x2], %[x0], %[x0]") // x0 = dx dy dz 0 + __ASM_EMIT("vmovups %[x0], (%[p])") + + : [x0] "+x" (dx), [x1] "+x" (dy), [x2] "+x"(dz) + : [p] "r" (p), + [id] "m" (IDENTITY) + : "memory" + ); + } + + void init_vector(vector3d_t *p, const vector3d_t *s) + { + float x0; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[s]), %[x0]") + __ASM_EMIT("vmovups %[x0], (%[p])") + : [x0] "=&x" (x0) + : [s] "r" (s), [p] "r" (p) + : "memory" + ); + } + + void normalize_vector(vector3d_t *v) + { + float x0, x1, x2; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[v]), %[x0]") // x0 = dx dy dz dw + __ASM_EMIT("vandps %[mask], %[x0], %[x0]") // x0 = dx dy dz 0 + NORMALIZE("[x0]", "[x1]", "[x2]") + __ASM_EMIT("vmovups %[x0], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) + : [v] "r" (v), + [id] "m" (IDENTITY), + [mask] "m" (X_MASK0111) + : "cc", "memory" + ); + } + + void normalize_vector2(vector3d_t *v, const vector3d_t *sv) + { + float x0, x1, x2; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[sv]), %[x0]") // x0 = dx dy dz dw + __ASM_EMIT("vandps %[mask], %[x0], %[x0]") // x0 = dx dy dz 0 + NORMALIZE("[x0]", "[x1]", "[x2]") + __ASM_EMIT("vmovups %[x0], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) + : [v] "r" (v), + [sv] "r" (sv), + [id] "m" (IDENTITY), + [mask] "m" (X_MASK0111) + : "cc", "memory" + ); + } + + void init_matrix3d(matrix3d_t *dst, const matrix3d_t *src) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[s]), %%ymm0") + __ASM_EMIT("vmovups 0x20(%[s]), %%ymm1") + __ASM_EMIT("vmovups %%ymm0, 0x00(%[d])") + __ASM_EMIT("vmovups %%ymm1, 0x20(%[d])") + : + : [s] "r" (src), [d] "r" (dst) + : "memory", + "%xmm0", "%xmm1" + ); + } + + void init_matrix3d_zero(matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vxorps %%ymm0, %%ymm0, %%ymm0") + __ASM_EMIT("vmovups %%ymm0, 0x00(%[m])") + __ASM_EMIT("vmovups %%ymm0, 0x20(%[m])") + : + : [m] "r" (m) + : "memory", + "%xmm0" + ); + } + + void init_matrix3d_one(matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vmovaps %[one], %%ymm0") + __ASM_EMIT("vmovups %%ymm0, 0x00(%[m])") + __ASM_EMIT("vmovups %%ymm0, 0x20(%[m])") + : + : [m] "r" (m), + [one] "m" (ONE) + : "memory", + "%xmm0" + ); + } + + void init_matrix3d_identity(matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vmovaps 0x00 + %[id], %%ymm0") + __ASM_EMIT("vmovaps 0x20 + %[id], %%ymm1") + __ASM_EMIT("vmovups %%ymm0, 0x00(%[m])") + __ASM_EMIT("vmovups %%ymm1, 0x20(%[m])") + : + : [m] "r" (m), + [id] "o" (IDENTITY) + : "memory", + "%xmm0", "%xmm1" + ); + } + + void init_matrix3d_translate(matrix3d_t *m, float dx, float dy, float dz) + { + float x3, x4, x5; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovaps 0x00 + %[id], %[x3]") // x3 = 1 0 0 0 + __ASM_EMIT("vmovaps 0x10 + %[id], %[x4]") // x4 = 0 1 0 0 + __ASM_EMIT("vmovlhps %[x1], %[x0], %[x0]") // x0 = x ? y ? + __ASM_EMIT("vmovaps 0x20 + %[id], %[x5]") // x5 = 0 0 1 0 + __ASM_EMIT("vmovhps 0x00 + %[id], %[x2], %[x2]") // x2 = z ? 1 0 + __ASM_EMIT("vshufps $0x88, %[x2], %[x0], %[x0]") // x0 = x y z 1 + MATRIX_STORE("m", "[x3]", "[x4]", "[x5]", "[x0]") + + : [x0] "+x" (dx), [x1] "+x" (dy), [x2] "+x"(dz), + [x3] "=&x" (x3), [x4] "=&x" (x4), [x5] "=&x" (x5) + : [m] "r" (m), + [id] "o" (IDENTITY) + : "memory" + ); + } + + void init_matrix3d_scale(matrix3d_t *m, float sx, float sy, float sz) + { + float x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 0 0 0 + __ASM_EMIT("vinsertps $0x00, %[x0], %[x3], %[x0]") // x0 = sx 0 0 0 + __ASM_EMIT("vinsertps $0x10, %[x1], %[x3], %[x1]") // x0 = 0 sy 0 0 + __ASM_EMIT("vinsertps $0x20, %[x2], %[x3], %[x2]") // x0 = 0 0 sz 0 + __ASM_EMIT("vmovaps 0x30 + %[id], %[x3]") // x3 = 0 0 0 1 + + MATRIX_STORE("m", "[x0]", "[x1]", "[x2]", "[x3]") + + : [x0] "+x" (sx), [x1] "+x" (sy), [x2] "+x"(sz), + [x3] "=&x" (x3) + : [m] "r" (m), + [id] "o" (IDENTITY) + : "memory" + ); + } + + void init_matrix3d_rotate_x(matrix3d_t *m, float angle) + { + float s = sinf(angle); + float c = cosf(angle); + float x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 0 0 0 + __ASM_EMIT("vmovaps 0x00 + %[id], %[x2]") // x2 = 1 0 0 0 + __ASM_EMIT("vinsertps $0x10, %[x0], %[x3], %[x3]") // x3 = 0 s 0 0 + __ASM_EMIT("vinsertps $0x20, %[x1], %[x3], %[x3]") // x3 = 0 s c 0 + __ASM_EMIT("vmovaps 0x30 + %[id], %[x0]") // x0 = 0 0 0 1 + __ASM_EMIT("vxorps %[mask], %[x3], %[x1]") // x1 = 0 -s c 0 + __ASM_EMIT("vshufps $0xd8, %[x3], %[x3], %[x3]") // x3 = 0 c s 0 + + MATRIX_STORE("m", "[x2]", "[x3]", "[x1]", "[x0]") + + : [x0] "+x" (s), [x1] "+x" (c), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [m] "r" (m), + [id] "o" (IDENTITY), + [mask] "m" (X_SMASK0010) + : "memory" + ); + } + + void init_matrix3d_rotate_y(matrix3d_t *m, float angle) + { + float s = sinf(angle); + float c = cosf(angle); + float x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 0 0 0 + __ASM_EMIT("vmovaps 0x10 + %[id], %[x2]") // x2 = 0 1 0 0 + __ASM_EMIT("vinsertps $0x20, %[x0], %[x3], %[x3]") // x3 = 0 0 s 0 + __ASM_EMIT("vinsertps $0x00, %[x1], %[x3], %[x3]") // x3 = c 0 s 0 + __ASM_EMIT("vmovaps 0x30 + %[id], %[x0]") // x0 = 0 0 0 1 + __ASM_EMIT("vxorps %[mask], %[x3], %[x1]") // x1 = c 0 -s 0 + __ASM_EMIT("vshufps $0xc6, %[x3], %[x3], %[x3]") // x3 = s 0 c 0 + + MATRIX_STORE("m", "[x1]", "[x2]", "[x3]", "[x0]") + + : [x0] "+x" (s), [x1] "+x" (c), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [m] "r" (m), + [id] "o" (IDENTITY), + [mask] "m" (X_SMASK0100) + : "memory" + ); + } + + void init_matrix3d_rotate_z(matrix3d_t *m, float angle) + { + float s = sinf(angle); + float c = cosf(angle); + float x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 0 0 0 + __ASM_EMIT("vmovaps 0x20 + %[id], %[x2]") // x2 = 0 0 1 0 + __ASM_EMIT("vinsertps $0x00, %[x0], %[x3], %[x3]") // x3 = s 0 0 0 + __ASM_EMIT("vinsertps $0x10, %[x1], %[x3], %[x3]") // x3 = s c 0 0 + __ASM_EMIT("vmovaps 0x30 + %[id], %[x0]") // x0 = 0 0 0 1 + __ASM_EMIT("vxorps %[mask], %[x3], %[x1]") // x1 = -s c 0 0 + __ASM_EMIT("vshufps $0xe1, %[x3], %[x3], %[x3]") // x3 = c s 0 0 + + MATRIX_STORE("m", "[x3]", "[x1]", "[x2]", "[x0]") + + : [x0] "+x" (s), [x1] "+x" (c), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [m] "r" (m), + [id] "o" (IDENTITY), + [mask] "m" (X_SMASK0001) + : "memory" + ); + } + + void init_matrix3d_rotate_xyz(matrix3d_t *m, float x, float y, float z, float angle) + { + if (x == 0.0f) + { + if (y == 0.0f) + { + if (z > 0.0f) + init_matrix3d_rotate_z(m, angle); + else if (z < 0.0f) + init_matrix3d_rotate_z(m, -angle); + else // (z == 0.0) + init_matrix3d_identity(m); + return; + } + else if (z == 0.0f) + { + if (y > 0.0f) + init_matrix3d_rotate_y(m, angle); + else if (y < 0.0f) + init_matrix3d_rotate_y(m, -angle); + return; + } + } + else if ((y == 0.0) && (z == 0.0)) + { + if (x > 0.0f) + init_matrix3d_rotate_x(m, angle); + else + init_matrix3d_rotate_x(m, -angle); + return; + } + + float s = sinf(angle); + float c = cosf(angle); + + float xx, yy, zz, xy, yz, zx, xs, ys, zs, one_c; + float mag = sqrtf(x*x + y*y + z*z); + + x /= mag; + y /= mag; + z /= mag; + + xx = x * x; + yy = y * y; + zz = z * z; + xy = x * y; + yz = y * z; + zx = z * x; + xs = x * s; + ys = y * s; + zs = z * s; + one_c = 1.0f - c; + + float *M = m->m; + M[0] = (one_c * xx) + c; + M[1] = (one_c * xy) + zs; + M[2] = (one_c * zx) - ys; + M[3] = 0.0f; + M[4] = (one_c * xy) - zs; + M[5] = (one_c * yy) + c; + M[6] = (one_c * yz) + xs; + M[7] = 0.0f; + M[8] = (one_c * zx) + ys; + M[9] = (one_c * yz) - xs; + M[10] = (one_c * zz) + c; + M[11] = 0.0f; + M[12] = 0.0f; + M[13] = 0.0f; + M[14] = 0.0f; + M[15] = 0.0f; + } + + void transpose_matrix3d1(matrix3d_t *r) + { + ARCH_X86_ASM + ( + MATRIX_LOAD("m", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + MAT4_TRANSPOSE("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4") + MATRIX_STORE("m", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + : + : [m] "r" (r) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4" + ); + } + + void transpose_matrix3d2(matrix3d_t *r, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + MATRIX_LOAD("m", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + MAT4_TRANSPOSE("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4") + MATRIX_STORE("r", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + : + : [r] "r" (r), [m] "r" (m) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4" + ); + } + + void apply_matrix3d_mm2(matrix3d_t *r, const matrix3d_t *s, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + MATRIX_LOAD("A", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + + // Multiply matrix and store + __ASM_EMIT("vmovups 0x00(%[B]), %%xmm4") // xmm4 = b0 b1 b2 b3 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm4") + __ASM_EMIT("vmovups %%xmm4, 0x00(%[R])") + + __ASM_EMIT("vmovups 0x10(%[B]), %%xmm5") // xmm5 = b4 b5 b6 b7 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm5", "%xmm6", "%xmm7", "%xmm4", + "%xmm5") + __ASM_EMIT("vmovups %%xmm5, 0x10(%[R])") + + __ASM_EMIT("vmovups 0x20(%[B]), %%xmm6") // xmm6 = b4 b5 b6 b7 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm6", "%xmm7", "%xmm4", "%xmm5", + "%xmm6") + __ASM_EMIT("vmovups %%xmm6, 0x20(%[R])") + + __ASM_EMIT("vmovups 0x30(%[B]), %%xmm7") // xmm7 = b4 b5 b6 b7 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm7", "%xmm4", "%xmm5", "%xmm6", + "%xmm7") + __ASM_EMIT("vmovups %%xmm7, 0x30(%[R])") + + : + : [A] "r" (s), [B] "r" (m), [R] "r" (r) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void apply_matrix3d_mm1(matrix3d_t *r, const matrix3d_t *m) + { + IF_ARCH_I386( + matrix3d_t __lsp_aligned32 t; + ); + + ARCH_X86_ASM + ( + MATRIX_LOAD("A", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + + // Multiply matrix and store + __ASM_EMIT("vmovups 0x00(%[B]), %%xmm4") // xmm4 = b0 b1 b2 b3 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + __IF_32("%xmm4") __IF_64("%xmm8")) + __ASM_EMIT32("vmovaps %%xmm4, 0x00(%[T])") + + __ASM_EMIT("vmovups 0x10(%[B]), %%xmm5") // xmm5 = b4 b5 b6 b7 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm5", "%xmm6", "%xmm7", "%xmm4", + __IF_32("%xmm5") __IF_64("%xmm9")) + __ASM_EMIT32("vmovaps %%xmm5, 0x10(%[T])") + + __ASM_EMIT("vmovups 0x20(%[B]), %%xmm6") // xmm6 = b4 b5 b6 b7 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm6", "%xmm7", "%xmm4", "%xmm5", + __IF_32("%xmm6") __IF_64("%xmm10")) + __ASM_EMIT32("vmovaps %%xmm6, 0x20(%[T])") + + __ASM_EMIT("vmovups 0x30(%[B]), %%xmm7") // xmm7 = b4 b5 b6 b7 + MATMUL_CORE( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm7", "%xmm4", "%xmm5", "%xmm6", + __IF_32("%xmm7") __IF_64("%xmm11")) + + // Save matrix (32-bit) + __ASM_EMIT32("vmovaps 0x00(%[T]), %%ymm4") + __ASM_EMIT32("vmovaps 0x20(%[T]), %%xmm6") + __ASM_EMIT32("vmovups %%ymm4, 0x00(%[A])") + __ASM_EMIT32("vmovups %%xmm6, 0x20(%[A])") + __ASM_EMIT32("vmovups %%xmm7, 0x30(%[A])") + + // Save matrix (64-bit) + __ASM_EMIT64("vmovups %%xmm8, 0x00(%[A])") + __ASM_EMIT64("vmovups %%xmm9, 0x10(%[A])") + __ASM_EMIT64("vmovups %%xmm10, 0x20(%[A])") + __ASM_EMIT64("vmovups %%xmm11, 0x30(%[A])") + + : + : [A] "r" (r), [B] "r" (m) + __IF_32(, [T] "r" (&t)) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + , "%xmm4", "%xmm5", "%xmm6", "%xmm7" + __IF_64(, "%xmm8", "%xmm9", "%xmm10", "%xmm11") + ); + } + + void apply_matrix3d_mm2_fma3(matrix3d_t *r, const matrix3d_t *s, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + MATRIX_LOAD("A", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + + // Multiply matrix and store + __ASM_EMIT("vmovups 0x00(%[B]), %%xmm4") // xmm4 = b0 b1 b2 b3 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm4") + __ASM_EMIT("vmovups %%xmm4, 0x00(%[R])") + + __ASM_EMIT("vmovups 0x10(%[B]), %%xmm5") // xmm5 = b4 b5 b6 b7 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm5", "%xmm6", "%xmm7", "%xmm4", + "%xmm5") + __ASM_EMIT("vmovups %%xmm5, 0x10(%[R])") + + __ASM_EMIT("vmovups 0x20(%[B]), %%xmm6") // xmm6 = b4 b5 b6 b7 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm6", "%xmm7", "%xmm4", "%xmm5", + "%xmm6") + __ASM_EMIT("vmovups %%xmm6, 0x20(%[R])") + + __ASM_EMIT("vmovups 0x30(%[B]), %%xmm7") // xmm7 = b4 b5 b6 b7 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm7", "%xmm4", "%xmm5", "%xmm6", + "%xmm7") + __ASM_EMIT("vmovups %%xmm7, 0x30(%[R])") + + : + : [A] "r" (s), [B] "r" (m), [R] "r" (r) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void apply_matrix3d_mm1_fma3(matrix3d_t *r, const matrix3d_t *m) + { + IF_ARCH_I386( + matrix3d_t __lsp_aligned32 t; + ); + + ARCH_X86_ASM + ( + MATRIX_LOAD("A", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + + // Multiply matrix and store + __ASM_EMIT("vmovups 0x00(%[B]), %%xmm4") // xmm4 = b0 b1 b2 b3 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + __IF_32("%xmm4") __IF_64("%xmm8")) + __ASM_EMIT32("vmovaps %%xmm4, 0x00(%[T])") + + __ASM_EMIT("vmovups 0x10(%[B]), %%xmm5") // xmm5 = b4 b5 b6 b7 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm5", "%xmm6", "%xmm7", "%xmm4", + __IF_32("%xmm5") __IF_64("%xmm9")) + __ASM_EMIT32("vmovaps %%xmm5, 0x10(%[T])") + + __ASM_EMIT("vmovups 0x20(%[B]), %%xmm6") // xmm6 = b4 b5 b6 b7 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm6", "%xmm7", "%xmm4", "%xmm5", + __IF_32("%xmm6") __IF_64("%xmm10")) + __ASM_EMIT32("vmovaps %%xmm6, 0x20(%[T])") + + __ASM_EMIT("vmovups 0x30(%[B]), %%xmm7") // xmm7 = b4 b5 b6 b7 + MATMUL_CORE_FMA3( + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm7", "%xmm4", "%xmm5", "%xmm6", + __IF_32("%xmm7") __IF_64("%xmm11")) + + // Save matrix (32-bit) + __ASM_EMIT32("vmovaps 0x00(%[T]), %%ymm4") + __ASM_EMIT32("vmovaps 0x20(%[T]), %%xmm6") + __ASM_EMIT32("vmovups %%ymm4, 0x00(%[A])") + __ASM_EMIT32("vmovups %%xmm6, 0x20(%[A])") + __ASM_EMIT32("vmovups %%xmm7, 0x30(%[A])") + + // Save matrix (64-bit) + __ASM_EMIT64("vmovups %%xmm8, 0x00(%[A])") + __ASM_EMIT64("vmovups %%xmm9, 0x10(%[A])") + __ASM_EMIT64("vmovups %%xmm10, 0x20(%[A])") + __ASM_EMIT64("vmovups %%xmm11, 0x30(%[A])") + + : + : [A] "r" (r), [B] "r" (m) + __IF_32(, [T] "r" (&t)) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + , "%xmm4", "%xmm5", "%xmm6", "%xmm7" + __IF_64(, "%xmm8", "%xmm9", "%xmm10", "%xmm11") + ); + } + + void apply_matrix3d_mv2(vector3d_t *r, const vector3d_t *v, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[v]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[v]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[v]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vmulps 0x10(%[m]), %%xmm1, %%xmm1") // xmm1 = vy * (m4 m5 m6 m7) + __ASM_EMIT("vmulps 0x20(%[m]), %%xmm2, %%xmm2") // xmm2 = vz * (m8 m9 m10 m11) + __ASM_EMIT("vaddps %%xmm1, %%xmm0, %%xmm0") + __ASM_EMIT("vxorps %%xmm3, %%xmm3, %%xmm3") // xmm3 = 0 0 0 0 + __ASM_EMIT("vaddps %%xmm2, %%xmm0, %%xmm0") // xmm0 = rx ry rz rw + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm1") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm1, %%xmm3") // xmm1 =?= xmm1 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm1, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[r])") + : + : [r] "r" (r), [v] "r" (v), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mv1(vector3d_t *r, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[r]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[r]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[r]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vmulps 0x10(%[m]), %%xmm1, %%xmm1") // xmm1 = vy * (m4 m5 m6 m7) + __ASM_EMIT("vmulps 0x20(%[m]), %%xmm2, %%xmm2") // xmm2 = vz * (m8 m9 m10 m11) + __ASM_EMIT("vaddps %%xmm1, %%xmm0, %%xmm0") + __ASM_EMIT("vxorps %%xmm3, %%xmm3, %%xmm3") // xmm3 = 0 0 0 0 + __ASM_EMIT("vaddps %%xmm2, %%xmm0, %%xmm0") // xmm0 = rx ry rz rw + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm1") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm1, %%xmm3") // xmm1 =?= 0 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm1, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[r])") + : + : [r] "r" (r), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mv2_fma3(vector3d_t *r, const vector3d_t *v, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[v]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[v]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[v]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vxorps %%xmm3, %%xmm3, %%xmm3") // xmm3 = 0 0 0 0 + __ASM_EMIT("vfmadd231ps 0x10(%[m]), %%xmm1, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vfmadd231ps 0x20(%[m]), %%xmm2, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm1") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm1, %%xmm3") // xmm1 =?= xmm1 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm1, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[r])") + : + : [r] "r" (r), [v] "r" (v), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mv1_fma3(vector3d_t *r, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[r]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[r]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[r]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vxorps %%xmm3, %%xmm3, %%xmm3") // xmm3 = 0 0 0 0 + __ASM_EMIT("vfmadd231ps 0x10(%[m]), %%xmm1, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vfmadd231ps 0x20(%[m]), %%xmm2, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm1") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm1, %%xmm3") // xmm1 =?= xmm1 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm1, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[r])") + : + : [r] "r" (r), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mp2(point3d_t *p, const point3d_t *s, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[s]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[s]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[s]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vmulps 0x10(%[m]), %%xmm1, %%xmm1") // xmm1 = vy * (m4 m5 m6 m7) + __ASM_EMIT("vmulps 0x20(%[m]), %%xmm2, %%xmm2") // xmm2 = vz * (m8 m9 m10 m11) + __ASM_EMIT("vaddps %%xmm1, %%xmm0, %%xmm0") + __ASM_EMIT("vaddps 0x30(%[m]), %%xmm2, %%xmm2") + __ASM_EMIT("vxorps %%xmm3, %%xmm3, %%xmm3") // xmm3 = 0 0 0 0 + __ASM_EMIT("vaddps %%xmm2, %%xmm0, %%xmm0") // xmm0 = rx ry rz rw + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm1") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm1, %%xmm3") // xmm1 =?= xmm1 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm1, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[p])") + : + : [p] "r" (p), [s] "r" (s), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mp1(point3d_t *p, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[p]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[p]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[p]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vmulps 0x10(%[m]), %%xmm1, %%xmm1") // xmm1 = vy * (m4 m5 m6 m7) + __ASM_EMIT("vmulps 0x20(%[m]), %%xmm2, %%xmm2") // xmm2 = vz * (m8 m9 m10 m11) + __ASM_EMIT("vaddps %%xmm1, %%xmm0, %%xmm0") + __ASM_EMIT("vaddps 0x30(%[m]), %%xmm2, %%xmm2") + __ASM_EMIT("vxorps %%xmm3, %%xmm3, %%xmm3") // xmm3 = 0 0 0 0 + __ASM_EMIT("vaddps %%xmm2, %%xmm0, %%xmm0") // xmm0 = rx ry rz rw + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm1") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm1, %%xmm3") // xmm1 =?= xmm1 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm1, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[p])") + : + : [p] "r" (p), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mp2_fma3(point3d_t *p, const point3d_t *s, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[s]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[s]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[s]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[m]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vmovups 0x30(%[m]), %%xmm3") // xmm3 = (m12 m13 m14 m15) + __ASM_EMIT("vfmadd231ps 0x10(%[m]), %%xmm1, %%xmm0") + __ASM_EMIT("vfmadd231ps 0x20(%[m]), %%xmm2, %%xmm3") + __ASM_EMIT("vxorps %%xmm1, %%xmm1, %%xmm1") // xmm1 = 0 0 0 0 + __ASM_EMIT("vaddps %%xmm3, %%xmm0, %%xmm0") // xmm0 = rx ry rz rw + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm2") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm2, %%xmm1") // xmm2 =?= xmm2 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm2, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[p])") + : + : [p] "r" (p), [s] "r" (s), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + void apply_matrix3d_mp1_fma3(point3d_t *p, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + __ASM_EMIT("vbroadcastss 0x00(%[p]), %%xmm0") // xmm0 = vx vx vx vx + __ASM_EMIT("vbroadcastss 0x04(%[p]), %%xmm1") // xmm1 = vy vy vy vy + __ASM_EMIT("vbroadcastss 0x08(%[p]), %%xmm2") // xmm2 = vz vz vz vz + __ASM_EMIT("vmulps 0x00(%[p]), %%xmm0, %%xmm0") // xmm0 = vx * (m0 m1 m2 m3) + __ASM_EMIT("vmovups 0x30(%[m]), %%xmm3") // xmm3 = (m12 m13 m14 m15) + __ASM_EMIT("vfmadd231ps 0x10(%[m]), %%xmm1, %%xmm0") + __ASM_EMIT("vfmadd231ps 0x20(%[m]), %%xmm2, %%xmm3") + __ASM_EMIT("vxorps %%xmm1, %%xmm1, %%xmm1") // xmm1 = 0 0 0 0 + __ASM_EMIT("vaddps %%xmm3, %%xmm0, %%xmm0") // xmm0 = rx ry rz rw + __ASM_EMIT("vshufps $0xff, %%xmm0, %%xmm0, %%xmm2") // xmm1 = rw rw rw rw + __ASM_EMIT("vucomiss %%xmm2, %%xmm1") // xmm2 =?= xmm2 + __ASM_EMIT("je 1f") + __ASM_EMIT("vdivps %%xmm2, %%xmm0, %%xmm0") // xmm0 = rx/r2 ry/r2 rz/rw rw/rw + __ASM_EMIT("1:") + __ASM_EMIT("vmovups %%xmm0, (%[p])") + : + : [p] "r" (p), [m] "r" (m) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3" + ); + } + + float calc_area_p3(const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p0]), %[x2]") /* x2 = p0 = x0 y0 z0 w0 */ + __ASM_EMIT("vmovups (%[p1]), %[x0]") /* x1 = p1 = x1 y1 z1 w1 */ + __ASM_EMIT("vmovups (%[p2]), %[x1]") /* x2 = p2 = x2 y2 z2 w2 */ + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") /* x0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") /* x1 = p2 - p0 = dx2 dy2 dz2 0 */ + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") /* x0 = NZ NX NY 0 */ + VECTOR_DOT3("[x0]", "[x0]", "[x1]", "[x2]") /* x0 = NX*NX + NY*NY + NZ*NZ */ + __ASM_EMIT("vsqrtss %[x0], %[x0], %[x0]") /* x0 = sqrtf(NX*NX + NY*NY + NZ*NZ) */ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2) + : "memory" + ); + + return x0; + } + + float calc_area_pv(const point3d_t *pv) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[pv]), %[x2]") /* x0 = p0 = x0 y0 z0 w0 */ + __ASM_EMIT("vmovups 0x10(%[pv]), %[x0]") /* x1 = p1 = x1 y1 z1 w1 */ + __ASM_EMIT("vmovups 0x20(%[pv]), %[x1]") /* x2 = p2 = x2 y2 z2 w2 */ + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") /* x0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") /* x1 = p2 - p0 = dx2 dy2 dz2 0 */ + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") /* x0 = NZ NX NY 0 */ + VECTOR_DOT3("[x0]", "[x0]", "[x1]", "[x2]") /* x0 = NX*NX + NY*NY + NZ*NZ */ + __ASM_EMIT("vsqrtss %[x0], %[x0], %[x0]") /* x0 = sqrtf(NX*NX + NY*NY + NZ*NZ) */ + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [pv] "r" (pv) + : "memory" + ); + + return x0; + } + + float calc_area_p3_fma3(const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p0]), %[x2]") /* x2 = x0 y0 z0 w0 */ + __ASM_EMIT("vmovups (%[p1]), %[x0]") /* x1 = x1 y1 z1 w1 */ + __ASM_EMIT("vmovups (%[p2]), %[x1]") /* x2 = x2 y2 z2 w2 */ + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") /* x0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") /* x1 = p2 - p0 = dx2 dy2 dz2 0 */ + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") /* x0 = NZ NX NY 0 */ + VECTOR_DOT3("[x0]", "[x0]", "[x1]", "[x2]") /* x0 = NX*NX + NY*NY + NZ*NZ */ + __ASM_EMIT("vsqrtss %[x0], %[x0], %[x0]") /* x0 = sqrtf(NX*NX + NY*NY + NZ*NZ) */ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2) + : "memory" + ); + + return x0; + } + + float calc_area_pv_fma3(const point3d_t *pv) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[pv]), %[x2]") /* x0 = x0 y0 z0 w0 */ + __ASM_EMIT("vmovups 0x10(%[pv]), %[x0]") /* x1 = x1 y1 z1 w1 */ + __ASM_EMIT("vmovups 0x20(%[pv]), %[x1]") /* x2 = x2 y2 z2 w2 */ + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") /* x0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") /* x1 = p2 - p0 = dx2 dy2 dz2 0 */ + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") /* x0 = NZ NX NY 0 */ + VECTOR_DOT3("[x0]", "[x0]", "[x1]", "[x2]") /* x0 = NX*NX + NY*NY + NZ*NZ */ + __ASM_EMIT("vsqrtss %[x0], %[x0], %[x0]") /* x0 = sqrtf(NX*NX + NY*NY + NZ*NZ) */ + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [pv] "r" (pv) + : "memory" + ); + + return x0; + } + + size_t colocation_x2_v1p2(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1) + { + float x0, x1, x2; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[pl]), %[x2]") /* x2 = pl */ + __ASM_EMIT("vmulps (%[p0]), %[x2], %[x0]") /* x0 = x0*px y0*py z0*pz w0*pw */ + __ASM_EMIT("vmulps (%[p1]), %[x2], %[x1]") /* x1 = x1*px y1*py z1*pz w1*pw */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") /* x0 = x0*px+y0*py z0*pz+w0*pw x1*px+y1*py z1*pz+w1*pw */ + __ASM_EMIT("vhaddps %[x0], %[x0], %[x0]") /* x0 = x1*px+y1*py+z1*pz+w1*pw x1*px+y1*py+z1*pz+w1*pw ? ? = k0 k1 ? ? */ + + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("vpand %[IONE], %[x1], %[x1]") /* x1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("vpand %[IONE], %[x2], %[x2]") /* x2 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("vpaddd %[x1], %[x2], %[x0]") + __ASM_EMIT("vextractps $0x00, %[x0], %[p0]") + __ASM_EMIT("vextractps $0x01, %[x0], %[p1]") + __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") + : [p0] "+r" (p0), [p1] "+r" (p1), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) + : [pl] "r" (pl), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc", "memory" + ); + + return size_t(p0); + } + + size_t colocation_x2_v1pv(const vector3d_t *pl, const point3d_t *pv) + { + float x0, x1, x2; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[pl]), %[x2]") /* x2 = pl */ + __ASM_EMIT("vmulps 0x00(%[pv]), %[x2], %[x0]") /* x0 = x0*px y0*py z0*pz w0*pw */ + __ASM_EMIT("vmulps 0x10(%[pv]), %[x2], %[x1]") /* x1 = x1*px y1*py z1*pz w1*pw */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") /* x0 = x0*px+y0*py z0*pz+w0*pw x1*px+y1*py z1*pz+w1*pw */ + __ASM_EMIT("vhaddps %[x0], %[x0], %[x0]") /* x0 = x1*px+y1*py+z1*pz+w1*pw x1*px+y1*py+z1*pz+w1*pw ? ? = k0 k1 ? ? */ + + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("vpand %[IONE], %[x1], %[x1]") /* x1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("vpand %[IONE], %[x2], %[x2]") /* x2 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("vpaddd %[x1], %[x2], %[x0]") + __ASM_EMIT("vextractps $0x00, %[x0], %[pl]") + __ASM_EMIT("vextractps $0x01, %[x0], %[pv]") + __ASM_EMIT("lea (%[pl], %[pv], 4), %[pl]") + : [pl] "+r" (pl), [pv] "+r" (pv), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) + : [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc", "memory" + ); + + return size_t(pl); + } + + size_t colocation_x3_v1p3(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[pl]), %[x3]") /* x3 = pl */ + __ASM_EMIT("vmulps (%[p0]), %[x3], %[x0]") /* x0 = p0 * pl */ + __ASM_EMIT("vmulps (%[p1]), %[x3], %[x1]") /* x1 = p1 * pl */ + __ASM_EMIT("vmulps (%[p2]), %[x3], %[x2]") /* x2 = p2 * pl */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") + __ASM_EMIT("vhaddps %[x3], %[x2], %[x2]") + __ASM_EMIT("vhaddps %[x2], %[x0], %[x0]") /* x0 = k0 k1 k2 ? */ + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("vpand %[IONE], %[x1], %[x1]") /* x1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("vpand %[IONE], %[x2], %[x2]") /* x2 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("vpaddd %[x1], %[x2], %[x0]") + __ASM_EMIT("vextractps $0x00, %[x0], %[p0]") + __ASM_EMIT("vextractps $0x01, %[x0], %[p1]") + __ASM_EMIT("vextractps $0x02, %[x0], %[p2]") + __ASM_EMIT("lea (%[p1], %[p2], 4), %[p1]") + __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") + : [p0] "+r" (p0), [p1] "+r" (p1), [p2] "+r" (p2), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [pl] "r" (pl), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc", "memory" + ); + + return size_t(p0); + } + + size_t colocation_x3_v1pv(const vector3d_t *pl, const point3d_t *pv) + { + float x0, x1, x2, x3; + size_t pt; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[pl]), %[x3]") /* x3 = pl */ + __ASM_EMIT("vmulps 0x00(%[pv]), %[x3], %[x0]") /* x0 = p0 * pl */ + __ASM_EMIT("vmulps 0x10(%[pv]), %[x3], %[x1]") /* x1 = p1 * pl */ + __ASM_EMIT("vmulps 0x20(%[pv]), %[x3], %[x2]") /* x2 = p2 * pl */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") + __ASM_EMIT("vhaddps %[x3], %[x2], %[x2]") + __ASM_EMIT("vhaddps %[x2], %[x0], %[x0]") /* x0 = k0 k1 k2 ? */ + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("vpand %[IONE], %[x1], %[x1]") /* x1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("vpand %[IONE], %[x2], %[x2]") /* x2 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("vpaddd %[x1], %[x2], %[x0]") + __ASM_EMIT("vextractps $0x00, %[x0], %[pt]") + __ASM_EMIT("vextractps $0x01, %[x0], %[pl]") + __ASM_EMIT("vextractps $0x02, %[x0], %[pv]") + __ASM_EMIT("lea (%[pl], %[pv], 4), %[pl]") + __ASM_EMIT("lea (%[pt], %[pl], 4), %[pt]") + : [pl] "+r" (pl), [pv] "+r" (pv), [pt] "=&r" (pt), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc", "memory" + ); + + return pt; + } + + size_t colocation_x3_v3p1(const vector3d_t *v0, const vector3d_t *v1, const vector3d_t *v2, const point3d_t *p) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p]), %[x3]") /* x3 = p */ + __ASM_EMIT("vmulps (%[v0]), %[x3], %[x0]") /* x0 = v0 * p */ + __ASM_EMIT("vmulps (%[v1]), %[x3], %[x1]") /* x1 = v1 * p */ + __ASM_EMIT("vmulps (%[v2]), %[x3], %[x2]") /* x2 = v2 * p */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") + __ASM_EMIT("vhaddps %[x3], %[x2], %[x2]") + __ASM_EMIT("vhaddps %[x2], %[x0], %[x0]") /* x0 = k0 k1 k2 ? */ + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("vpand %[IONE], %[x1], %[x1]") /* x1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("vpand %[IONE], %[x2], %[x2]") /* x2 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("vpaddd %[x1], %[x2], %[x0]") + __ASM_EMIT("vextractps $0x00, %[x0], %[v0]") + __ASM_EMIT("vextractps $0x01, %[x0], %[v1]") + __ASM_EMIT("vextractps $0x02, %[x0], %[v2]") + __ASM_EMIT("lea (%[v1], %[v2], 4), %[v1]") + __ASM_EMIT("lea (%[v0], %[v1], 4), %[v0]") + + : [v0] "+r" (v0), [v1] "+r" (v1), [v2] "+r" (v2), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [p] "r" (p), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc", "memory" + ); + + return size_t(v0); + } + + size_t colocation_x3_vvp1(const vector3d_t *vv, const point3d_t *p) + { + float x0, x1, x2, x3; + size_t pt; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p]), %[x3]") /* x3 = p */ + __ASM_EMIT("vmulps 0x00(%[vv]), %[x3], %[x0]") /* x0 = v0 * p */ + __ASM_EMIT("vmulps 0x10(%[vv]), %[x3], %[x1]") /* x1 = v1 * p */ + __ASM_EMIT("vmulps 0x20(%[vv]), %[x3], %[x2]") /* x2 = v2 * p */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") + __ASM_EMIT("vhaddps %[x3], %[x2], %[x2]") + __ASM_EMIT("vhaddps %[x2], %[x0], %[x0]") /* x0 = k0 k1 k2 ? */ + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("vpand %[IONE], %[x1], %[x1]") /* x1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("vpand %[IONE], %[x2], %[x2]") /* x2 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("vpaddd %[x1], %[x2], %[x0]") + __ASM_EMIT("vextractps $0x00, %[x0], %[pt]") + __ASM_EMIT("vextractps $0x01, %[x0], %[vv]") + __ASM_EMIT("vextractps $0x02, %[x0], %[p]") + __ASM_EMIT("lea (%[vv], %[p], 4), %[vv]") + __ASM_EMIT("lea (%[pt], %[vv], 4), %[pt]") + + : [p] "+r" (p), [vv] "+r" (vv), [pt] "=&r" (pt), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc", "memory" + ); + + return pt; + } + + void split_triangle_raw( + raw_triangle_t *out, + size_t *n_out, + raw_triangle_t *in, + size_t *n_in, + const vector3d_t *pl, + const raw_triangle_t *pv) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + float k[4] __lsp_aligned16; + size_t t0; + + in += *n_in; + out += *n_out; + + // Estimate co-location of triangle and plane + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[pl]), %[x3]") /* x3 = pl */ + __ASM_EMIT("vmulps 0x00(%[pv]), %[x3], %[x0]") /* x0 = p0 * pl = sx0 sy0 sz0 sw0 */ + __ASM_EMIT("vmulps 0x10(%[pv]), %[x3], %[x1]") /* x1 = p1 * pl = sx1 sy1 sz1 sw1 */ + __ASM_EMIT("vmulps 0x20(%[pv]), %[x3], %[x2]") /* x2 = p2 * pl = sx2 sy2 sz2 sw2 */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") /* x0 = sx0+sy0 sz0+sw0 sx1+sy1 sz1+sw1 */ + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") /* x2 = sx2+sy2 sz2+sw2 sx2+sy2 sz2+sw2 */ + __ASM_EMIT("vhaddps %[x2], %[x0], %[x0]") /* x0 = sx0+sy0+sz0+sw0 sx1+sy1+sz1+sw1 sx2+sy2+sz2+sw2 sx2+sy2+sz2+sw2 = k0 k1 k2 k2 */ + __ASM_EMIT("vmovaps %[x0], (%[k])") /* *k = x0 */ + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL k2 < -TOL k2 < -TOL */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL k2 <= +TOL k2 <= +TOL */ + __ASM_EMIT("vpand %[ICULL3], %[x1], %[x1]") /* x1 = 0x01*[k0 < -TOL] 0x04*[k1 < -TOL] 0x10*[k2 < -TOL] 0 */ + __ASM_EMIT("vpand %[ICULL3], %[x2], %[x2]") /* x2 = 0x01*[k0 <= +TOL] 0x04*[k1 <= +TOL] 0x10*[k2 <= +TOL] 0 */ + __ASM_EMIT("vpaddd %[x2], %[x1], %[x0]") /* x0 = x0 x1 x2 0 */ + __ASM_EMIT("vphaddd %[x0], %[x0], %[x0]") /* x0 = x0+x1 x2+0 x0+x1 x2+0 */ + __ASM_EMIT("vphaddd %[x0], %[x0], %[x0]") /* x0 = x0+x1+x2+0 x0+x1+x2+0 x0+x1+x2+0 */ + __ASM_EMIT32("vmovd %[x0], %[t0]") + __ASM_EMIT64("vmovd %[x0], %k[t0]") + + : [t0] "=&r" (t0), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), [pv] "r" (pv), + [k] "r" (k), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [ICULL3] "m" (ICULL3) + : "cc", "memory" + ); + + #define STR_COPY_TO(tgt) \ + ARCH_X86_ASM( \ + __ASM_EMIT("vmovups 0x00(%[src]), %%ymm0") \ + __ASM_EMIT("vmovups 0x20(%[src]), %%xmm1") \ + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") \ + __ASM_EMIT("vmovups %%xmm1, 0x20(%[dst])") \ + : \ + : [dst] "r" (tgt), \ + [src] "r" (pv) \ + : "cc", "memory", \ + "%xmm0", "%xmm1" \ + ); + + #define STR_SPLIT_1P(off0, off1, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("vmovups 0x" off0 "(%[st]), %[x0]") /* x0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("vmovups 0x" off1 "(%[st]), %[x1]") /* x1 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("vmovups (%[pl]), %[x2]") /* x2 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("vsubps %[x0], %[x1], %[x1]") /* x1 = d = p1 - p0 = dx dy dz 0 */ \ + __ASM_EMIT("vbroadcastss 0x" koff "(%[k]), %[x3]") /* x3 = k k k k */ \ + __ASM_EMIT("vmulps %[x1], %[x2], %[x2]") /* x2 = dx*nx dy*ny dz*nz 0 */ \ + __ASM_EMIT("vmulps %[x3], %[x1], %[x1]") /* x1 = k*dx k*dy k*dz 0 */ \ + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") /* x2 = dx*nx+dy*ny dz*nz dx*nx+dy*ny dz*nz */ \ + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") /* x2 = dx*nx+dy*ny+dz*nz = b b b b */ \ + __ASM_EMIT("vdivps %[x2], %[x1], %[x1]") /* x1 = k*dx/b k*dy/b k*dz/b 0 */ \ + __ASM_EMIT("vsubps %[x1], %[x0], %[x0]") /* x0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ + : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("vmovups 0x" off0 "(%[st]), %[x0]") /* x0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("vmovups 0x" off1 "(%[st]), %[x2]") /* x2 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("vmovups 0x" off2 "(%[st]), %[x3]") /* x3 = p2 = lx2 ly2 lz2 1 */ \ + __ASM_EMIT("vmovups (%[pl]), %[x4]") /* x4 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("vsubps %[x0], %[x3], %[x3]") /* x3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("vsubps %[x0], %[x2], %[x2]") /* x2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("vmulps %[x3], %[x4], %[x5]") /* x5 = dx2*nx dy2*ny dz2*nz 0 */ \ + __ASM_EMIT("vmulps %[x2], %[x4], %[x4]") /* x4 = dx1*nx dy1*ny dz1*nz 0 */ \ + __ASM_EMIT("vbroadcastss 0x" koff "(%[k]), %[x6]") /* x6 = k k k k */ \ + __ASM_EMIT("vhaddps %[x5], %[x5], %[x5]") /* x5 = dx2*nx+dy2*ny dz2*nz dx2*nx+dy2*ny dz2*nz */ \ + __ASM_EMIT("vhaddps %[x4], %[x4], %[x4]") /* x4 = dx1*nx+dy1*ny dz1*nz dx1*nx+dy1*ny dz1*nz */ \ + __ASM_EMIT("vhaddps %[x5], %[x5], %[x5]") /* x5 = dx2*nx+dy2*ny+dz2*nz = b2 b2 b2 b2 */ \ + __ASM_EMIT("vhaddps %[x4], %[x4], %[x4]") /* x4 = dx1*nx+dy1*ny+dz1*nz = b1 b1 b1 b1 */ \ + __ASM_EMIT("vdivps %[x5], %[x3], %[x3]") /* x3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ + __ASM_EMIT("vdivps %[x4], %[x2], %[x2]") /* x2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ + __ASM_EMIT("vmulps %[x6], %[x3], %[x3]") /* x3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ + __ASM_EMIT("vmulps %[x6], %[x2], %[x2]") /* x2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ + __ASM_EMIT("vsubps %[x3], %[x0], %[x1]") /* x1 = lx0-k*dx2/b2 ly0-k*dy2/b2 lz0-k*dz2/b2 1 */ \ + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") /* x0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ + : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + switch (t0) + { + // 0 intersections, triangle is above + case 0x00: // 0 0 0 + case 0x01: // 0 0 1 + case 0x04: // 0 1 0 + case 0x05: // 0 1 1 + case 0x10: // 1 0 0 + case 0x11: // 1 0 1 + case 0x14: // 1 1 0 + case 0x15: // 1 1 1 + STR_COPY_TO(out); + ++(*n_out); + break; + + // 0 intersections, triangle is below + case 0x16: // 1 1 2 + case 0x19: // 1 2 1 + case 0x1a: // 1 2 2 + case 0x25: // 2 1 1 + case 0x26: // 2 1 2 + case 0x29: // 2 2 1 + case 0x2a: // 2 2 2 + STR_COPY_TO(in); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise + case 0x06: // 0 1 2 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x1], 0x00(%[in])") + __ASM_EMIT("vmovups %[x2], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x2], 0x00(%[out])") + __ASM_EMIT("vmovups %[x3], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x21: // 2 0 1 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x2], 0x00(%[out])") + __ASM_EMIT("vmovups %[x0], 0x10(%[out])") + __ASM_EMIT("vmovups %[x1], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x18: // 1 2 0 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x3], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x1], 0x00(%[out])") + __ASM_EMIT("vmovups %[x0], 0x10(%[out])") + __ASM_EMIT("vmovups %[x3], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, clockwise + case 0x24: // 2 1 0 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + __ASM_EMIT("vmovups %[x1], 0x00(%[out])") + __ASM_EMIT("vmovups %[x2], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x12: // 1 0 2 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x1], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x3], 0x20(%[in])") + __ASM_EMIT("vmovups %[x2], 0x00(%[out])") + __ASM_EMIT("vmovups %[x3], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x09: // 0 2 1 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + __ASM_EMIT("vmovups %[x3], 0x00(%[out])") + __ASM_EMIT("vmovups %[x1], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + + // 2 intersections, 1 triangle below, 2 triangles above + case 0x02: // 0 0 2 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + __ASM_EMIT("vmovups %[x3], 0x00(%[out])") + __ASM_EMIT("vmovups %[x1], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + __ASM_EMIT("vmovups %[x4], 0x30(%[out])") + __ASM_EMIT("vmovups %[x1], 0x40(%[out])") + __ASM_EMIT("vmovups %[x3], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + case 0x08: // 0 2 0 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x4], 0x00(%[out])") + __ASM_EMIT("vmovups %[x0], 0x10(%[out])") + __ASM_EMIT("vmovups %[x1], 0x20(%[out])") + __ASM_EMIT("vmovups %[x2], 0x30(%[out])") + __ASM_EMIT("vmovups %[x0], 0x40(%[out])") + __ASM_EMIT("vmovups %[x4], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + case 0x20: // 2 0 0 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x4], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + __ASM_EMIT("vmovups %[x2], 0x00(%[out])") + __ASM_EMIT("vmovups %[x1], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + __ASM_EMIT("vmovups %[x3], 0x30(%[out])") + __ASM_EMIT("vmovups %[x1], 0x40(%[out])") + __ASM_EMIT("vmovups %[x2], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + + // 2 intersections, 1 triangle above, 2 triangles below + case 0x28: // 2 2 0 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x4], 0x30(%[in])") + __ASM_EMIT("vmovups %[x1], 0x40(%[in])") + __ASM_EMIT("vmovups %[x3], 0x50(%[in])") + __ASM_EMIT("vmovups %[x2], 0x00(%[out])") + __ASM_EMIT("vmovups %[x0], 0x10(%[out])") + __ASM_EMIT("vmovups %[x1], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + case 0x22: // 2 0 2 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x4], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + __ASM_EMIT("vmovups %[x2], 0x30(%[in])") + __ASM_EMIT("vmovups %[x0], 0x40(%[in])") + __ASM_EMIT("vmovups %[x4], 0x50(%[in])") + __ASM_EMIT("vmovups %[x3], 0x00(%[out])") + __ASM_EMIT("vmovups %[x1], 0x10(%[out])") + __ASM_EMIT("vmovups %[x0], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + case 0x0a: // 0 2 2 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x3], 0x30(%[in])") + __ASM_EMIT("vmovups %[x1], 0x40(%[in])") + __ASM_EMIT("vmovups %[x2], 0x50(%[in])") + __ASM_EMIT("vmovups %[x4], 0x00(%[out])") + __ASM_EMIT("vmovups %[x0], 0x10(%[out])") + __ASM_EMIT("vmovups %[x1], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + default: + break; + } + + #undef STR_COPY_TO + #undef STR_SPLIT_1P + #undef STR_SPLIT_2P + } + + void cull_triangle_raw( + raw_triangle_t *in, + size_t *n_in, + const vector3d_t *pl, + const raw_triangle_t *pv + ) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + float k[4] __lsp_aligned16; + size_t t0; + + in += *n_in; + + // Estimate co-location of triangle and plane + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[pl]), %[x3]") /* x3 = pl */ + __ASM_EMIT("vmulps 0x00(%[pv]), %[x3], %[x0]") /* x0 = p0 * pl = sx0 sy0 sz0 sw0 */ + __ASM_EMIT("vmulps 0x10(%[pv]), %[x3], %[x1]") /* x1 = p1 * pl = sx1 sy1 sz1 sw1 */ + __ASM_EMIT("vmulps 0x20(%[pv]), %[x3], %[x2]") /* x2 = p2 * pl = sx2 sy2 sz2 sw2 */ + __ASM_EMIT("vhaddps %[x1], %[x0], %[x0]") /* x0 = sx0+sy0 sz0+sw0 sx1+sy1 sz1+sw1 */ + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") /* x2 = sx2+sy2 sz2+sw2 sx2+sy2 sz2+sw2 */ + __ASM_EMIT("vhaddps %[x2], %[x0], %[x0]") /* x0 = sx0+sy0+sz0+sw0 sx1+sy1+sz1+sw1 sx2+sy2+sz2+sw2 sx2+sy2+sz2+sw2 = k0 k1 k2 k2 */ + __ASM_EMIT("vmovaps %[x0], (%[k])") /* *k = x0 */ + __ASM_EMIT("vcmpps $1, %[MTOL], %[x0], %[x1]") /* x1 = k0 < -TOL k1 < -TOL k2 < -TOL k2 < -TOL */ + __ASM_EMIT("vcmpps $2, %[PTOL], %[x0], %[x2]") /* x2 = k0 <= +TOL k1 <= +TOL k2 <= +TOL k2 <= +TOL */ + __ASM_EMIT("vpand %[ICULL3], %[x1], %[x1]") /* x1 = 0x01*[k0 < -TOL] 0x04*[k1 < -TOL] 0x10*[k2 < -TOL] 0 */ + __ASM_EMIT("vpand %[ICULL3], %[x2], %[x2]") /* x2 = 0x01*[k0 <= +TOL] 0x04*[k1 <= +TOL] 0x10*[k2 <= +TOL] 0 */ + __ASM_EMIT("vpaddd %[x2], %[x1], %[x0]") /* x0 = x0 x1 x2 0 */ + __ASM_EMIT("vphaddd %[x0], %[x0], %[x0]") /* x0 = x0+x1 x2+0 x0+x1 x2+0 */ + __ASM_EMIT("vphaddd %[x0], %[x0], %[x0]") /* x0 = x0+x1+x2+0 x0+x1+x2+0 x0+x1+x2+0 */ + __ASM_EMIT32("vmovd %[x0], %[t0]") + __ASM_EMIT64("vmovd %[x0], %k[t0]") + + : [t0] "=&r" (t0), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), [pv] "r" (pv), + [k] "r" (k), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [ICULL3] "m" (ICULL3) + : "cc", "memory" + ); + + #define STR_COPY_TO(tgt) \ + ARCH_X86_ASM( \ + __ASM_EMIT("vmovups 0x00(%[src]), %%ymm0") \ + __ASM_EMIT("vmovups 0x20(%[src]), %%xmm1") \ + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") \ + __ASM_EMIT("vmovups %%xmm1, 0x20(%[dst])") \ + : \ + : [dst] "r" (tgt), \ + [src] "r" (pv) \ + : "cc", "memory", \ + "%xmm0", "%xmm1" \ + ); + + #define STR_SPLIT_1P(off0, off1, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("vmovups 0x" off0 "(%[st]), %[x0]") /* x0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("vmovups 0x" off1 "(%[st]), %[x1]") /* x1 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("vmovups (%[pl]), %[x2]") /* x2 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("vsubps %[x0], %[x1], %[x1]") /* x1 = d = p1 - p0 = dx dy dz 0 */ \ + __ASM_EMIT("vbroadcastss 0x" koff "(%[k]), %[x3]") /* x3 = k k k k */ \ + __ASM_EMIT("vmulps %[x1], %[x2], %[x2]") /* x2 = dx*nx dy*ny dz*nz 0 */ \ + __ASM_EMIT("vmulps %[x3], %[x1], %[x1]") /* x1 = k*dx k*dy k*dz 0 */ \ + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") /* x2 = dx*nx+dy*ny dz*nz dx*nx+dy*ny dz*nz */ \ + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") /* x2 = dx*nx+dy*ny+dz*nz = b b b b */ \ + __ASM_EMIT("vdivps %[x2], %[x1], %[x1]") /* x1 = k*dx/b k*dy/b k*dz/b 0 */ \ + __ASM_EMIT("vsubps %[x1], %[x0], %[x0]") /* x0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ + : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("vmovups 0x" off0 "(%[st]), %[x0]") /* x0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("vmovups 0x" off1 "(%[st]), %[x2]") /* x2 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("vmovups 0x" off2 "(%[st]), %[x3]") /* x3 = p2 = lx2 ly2 lz2 1 */ \ + __ASM_EMIT("vmovups (%[pl]), %[x4]") /* x4 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("vsubps %[x0], %[x3], %[x3]") /* x3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("vsubps %[x0], %[x2], %[x2]") /* x2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("vmulps %[x3], %[x4], %[x5]") /* x5 = dx2*nx dy2*ny dz2*nz 0 */ \ + __ASM_EMIT("vmulps %[x2], %[x4], %[x4]") /* x4 = dx1*nx dy1*ny dz1*nz 0 */ \ + __ASM_EMIT("vbroadcastss 0x" koff "(%[k]), %[x6]") /* x6 = k k k k */ \ + __ASM_EMIT("vhaddps %[x5], %[x5], %[x5]") /* x5 = dx2*nx+dy2*ny dz2*nz dx2*nx+dy2*ny dz2*nz */ \ + __ASM_EMIT("vhaddps %[x4], %[x4], %[x4]") /* x4 = dx1*nx+dy1*ny dz1*nz dx1*nx+dy1*ny dz1*nz */ \ + __ASM_EMIT("vhaddps %[x5], %[x5], %[x5]") /* x5 = dx2*nx+dy2*ny+dz2*nz = b2 b2 b2 b2 */ \ + __ASM_EMIT("vhaddps %[x4], %[x4], %[x4]") /* x4 = dx1*nx+dy1*ny+dz1*nz = b1 b1 b1 b1 */ \ + __ASM_EMIT("vdivps %[x5], %[x3], %[x3]") /* x3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ + __ASM_EMIT("vdivps %[x4], %[x2], %[x2]") /* x2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ + __ASM_EMIT("vmulps %[x6], %[x3], %[x3]") /* x3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ + __ASM_EMIT("vmulps %[x6], %[x2], %[x2]") /* x2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ + __ASM_EMIT("vsubps %[x3], %[x0], %[x1]") /* x1 = lx0-k*dx2/b2 ly0-k*dy2/b2 lz0-k*dz2/b2 1 */ \ + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") /* x0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ + : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + switch (t0) + { + // 0 intersections, triangle is above + case 0x00: // 0 0 0 + case 0x01: // 0 0 1 + case 0x04: // 0 1 0 + case 0x05: // 0 1 1 + case 0x10: // 1 0 0 + case 0x11: // 1 0 1 + case 0x14: // 1 1 0 + case 0x15: // 1 1 1 + break; + + // 0 intersections, triangle is below + case 0x16: // 1 1 2 + case 0x19: // 1 2 1 + case 0x1a: // 1 2 2 + case 0x25: // 2 1 1 + case 0x26: // 2 1 2 + case 0x29: // 2 2 1 + case 0x2a: // 2 2 2 + STR_COPY_TO(in); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise + case 0x06: // 0 1 2 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups %[x1], 0x00(%[in])") + __ASM_EMIT("vmovups %[x2], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x21: // 2 0 1 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x18: // 1 2 0 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x3], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, clockwise + case 0x24: // 2 1 0 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x12: // 1 0 2 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x1], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x3], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x09: // 0 2 1 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("vmovups 0x00(%[st]), %[x1]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x2]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 2 intersections, 1 triangle below, 2 triangles above + case 0x02: // 0 0 2 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x08: // 0 2 0 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x20: // 2 0 0 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x4], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 2 intersections, 1 triangle above, 2 triangles below + case 0x28: // 2 2 0 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x3], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x4], 0x30(%[in])") + __ASM_EMIT("vmovups %[x1], 0x40(%[in])") + __ASM_EMIT("vmovups %[x3], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + case 0x22: // 2 0 2 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x20(%[st]), %[x4]") + __ASM_EMIT("vmovups %[x4], 0x00(%[in])") + __ASM_EMIT("vmovups %[x0], 0x10(%[in])") + __ASM_EMIT("vmovups %[x1], 0x20(%[in])") + __ASM_EMIT("vmovups %[x2], 0x30(%[in])") + __ASM_EMIT("vmovups %[x0], 0x40(%[in])") + __ASM_EMIT("vmovups %[x4], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + case 0x0a: // 0 2 2 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("vmovups 0x00(%[st]), %[x2]") + __ASM_EMIT("vmovups 0x10(%[st]), %[x3]") + __ASM_EMIT("vmovups %[x2], 0x00(%[in])") + __ASM_EMIT("vmovups %[x1], 0x10(%[in])") + __ASM_EMIT("vmovups %[x0], 0x20(%[in])") + __ASM_EMIT("vmovups %[x3], 0x30(%[in])") + __ASM_EMIT("vmovups %[x1], 0x40(%[in])") + __ASM_EMIT("vmovups %[x2], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + default: + break; + } + + #undef STR_COPY_TO + #undef STR_SPLIT_1P + #undef STR_SPLIT_2P + } + + size_t longest_edge3d_p3(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3) + { + size_t res; + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + // Calc vectors + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x0 y0 z0 w0 + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[p3]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vsubps %[x0], %[x1], %[x3]") // x3 = x1-x0 y1-y0 z1-z0 w1-w0 = dx0 dy0 dz0 0 + __ASM_EMIT("vsubps %[x1], %[x2], %[x1]") // x1 = x2-x1 y2-y1 z2-z1 w2-w1 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") // x0 = x0-x2 y0-y2 z0-z2 w0-w2 = dx2 dy2 dz2 0 + + __ASM_EMIT("vmulps %[x3], %[x3], %[x2]") // x2 = ax2 ay2 az2 0 + __ASM_EMIT("vmulps %[x1], %[x1], %[x1]") // x1 = bx2 by2 bz2 0 + __ASM_EMIT("vmulps %[x0], %[x0], %[x0]") // x0 = cx2 cy2 cz2 0 + MAT3_TRANSPOSE("x2", "x1", "x0", "x3") + __ASM_EMIT("vaddps %[x2], %[x0], %[x3]") // x3 = ax2+az2 + bx2+bz2 cx2+cz2 ? + __ASM_EMIT("vaddps %[x1], %[x0], %[x3]") // x3 = A2 B2 C2 + __ASM_EMIT("xor %[res], %[res]") // res = 0 + __ASM_EMIT("vunpcklps %[x3], %[x3], %[x2]") // x2 = A2 A2 B2 B2 + __ASM_EMIT("vmovhlps %[x3], %[x0], %[x0]") // x0 = C2 ? ? ? + __ASM_EMIT("vmovhlps %[x2], %[x1], %[x1]") // x1 = B2 B2 ? ? + + // Solve result + __ASM_EMIT("vucomiss %[x1], %[x2]") // A2 B2 + __ASM_EMIT("jae 1f") + // A2 < B2 + __ASM_EMIT("vucomiss %[x1], %[x0]") // C2 B2 + __ASM_EMIT("seta %%al") // res = (B2 >= C2) ? 0 : 1 + __ASM_EMIT("add $1, %[res]") // res = (B2 >= C2) ? 1 : 2 + __ASM_EMIT("jmp 2f") + __ASM_EMIT("1:") + // A2 >= B2 + __ASM_EMIT("vucomiss %[x0], %[x2]") // A2 C2 + __ASM_EMIT("jae 2f") // + __ASM_EMIT("mov $2, %[res]") // res = (A2 >= C2) ? 0 : 2 + __ASM_EMIT("2:") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [res] "=a" (res) + : [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3) + ); + + return res; + } + + size_t longest_edge3d_pv(const point3d_t *p) + { + size_t res; + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + // Calc vectors + __ASM_EMIT("vmovups 0x00(%[pv]), %[x0]") // x0 = x0 y0 z0 w0 + __ASM_EMIT("vmovups 0x10(%[pv]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vsubps %[x0], %[x1], %[x3]") // x3 = x1-x0 y1-y0 z1-z0 w1-w0 = dx0 dy0 dz0 0 + __ASM_EMIT("vsubps %[x1], %[x2], %[x1]") // x1 = x2-x1 y2-y1 z2-z1 w2-w1 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") // x0 = x0-x2 y0-y2 z0-z2 w0-w2 = dx2 dy2 dz2 0 + + __ASM_EMIT("vmulps %[x3], %[x3], %[x2]") // x2 = ax2 ay2 az2 0 + __ASM_EMIT("vmulps %[x1], %[x1], %[x1]") // x1 = bx2 by2 bz2 0 + __ASM_EMIT("vmulps %[x0], %[x0], %[x0]") // x0 = cx2 cy2 cz2 0 + MAT3_TRANSPOSE("x2", "x1", "x0", "x3") + __ASM_EMIT("vaddps %[x2], %[x0], %[x3]") // x3 = ax2+az2 + bx2+bz2 cx2+cz2 ? + __ASM_EMIT("vaddps %[x1], %[x0], %[x3]") // x3 = A2 B2 C2 + __ASM_EMIT("xor %[res], %[res]") // res = 0 + __ASM_EMIT("vunpcklps %[x3], %[x3], %[x2]") // x2 = A2 A2 B2 B2 + __ASM_EMIT("vmovhlps %[x3], %[x0], %[x0]") // x0 = C2 ? ? ? + __ASM_EMIT("vmovhlps %[x2], %[x1], %[x1]") // x1 = B2 B2 ? ? + + // Solve result + __ASM_EMIT("vucomiss %[x1], %[x2]") // A2 B2 + __ASM_EMIT("jae 1f") + // A2 < B2 + __ASM_EMIT("vucomiss %[x1], %[x0]") // C2 B2 + __ASM_EMIT("seta %%al") // res = (B2 >= C2) ? 0 : 1 + __ASM_EMIT("add $1, %[res]") // res = (B2 >= C2) ? 1 : 2 + __ASM_EMIT("jmp 2f") + __ASM_EMIT("1:") + // A2 >= B2 + __ASM_EMIT("vucomiss %[x0], %[x2]") // A2 C2 + __ASM_EMIT("jae 2f") // + __ASM_EMIT("mov $2, %[res]") // res = (A2 >= C2) ? 0 : 2 + __ASM_EMIT("2:") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [res] "=a" (res) + : [pv] "r" (p) + ); + + return res; + } + + void calc_normal3d_v2(vector3d_t *n, const vector3d_t *v1, const vector3d_t *v2) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[v1]), %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups (%[v2]), %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [v1] "r" (v1), [v2] "r" (v2), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + void calc_normal3d_vv(vector3d_t *n, const vector3d_t *vv) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[vv]), %[x0]") // x0 = dx1 dy1 dz1 0 + __ASM_EMIT("vmovups 0x10(%[vv]), %[x1]") // x1 = dx2 dy2 dz2 0 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [vv] "r" (vv) + : "memory" + ); + } + + void calc_normal3d_p3(vector3d_t *n, const point3d_t *p1, const point3d_t *p2, const point3d_t *p3) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups (%[p3]), %[x2]") // x1 = dx2 dy2 dz2 dw2 + __ASM_EMIT("vsubps (%[p1]), %[x1], %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vsubps %[x1], %[x2], %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + void calc_normal3d_pv(vector3d_t *n, const point3d_t *pv) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x10(%[pv]), %[x1]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x2]") // x1 = dx2 dy2 dz2 dw2 + __ASM_EMIT("vsubps 0x00(%[pv]), %[x1], %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vsubps %[x1], %[x2], %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [pv] "r" (pv), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + void calc_normal3d_v2_fma3(vector3d_t *n, const vector3d_t *v1, const vector3d_t *v2) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[v1]), %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups (%[v2]), %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [v1] "r" (v1), [v2] "r" (v2), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + void calc_normal3d_vv_fma3(vector3d_t *n, const vector3d_t *vv) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[vv]), %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups 0x10(%[vv]), %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [vv] "r" (vv), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + void calc_normal3d_p3_fma3(vector3d_t *n, const point3d_t *p1, const point3d_t *p2, const point3d_t *p3) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups (%[p3]), %[x2]") // x1 = dx2 dy2 dz2 dw2 + __ASM_EMIT("vsubps (%[p1]), %[x1], %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vsubps %[x1], %[x2], %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + void calc_normal3d_pv_fma3(vector3d_t *n, const point3d_t *pv) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x10(%[pv]), %[x1]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x2]") // x1 = dx2 dy2 dz2 dw2 + __ASM_EMIT("vsubps 0x00(%[pv]), %[x1], %[x0]") // x0 = dx1 dy1 dz1 dw1 + __ASM_EMIT("vsubps %[x1], %[x2], %[x1]") // x1 = dx2 dy2 dz2 dw2 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = W = sqrtf(W2) + __ASM_EMIT("vcmpps $4, %[x3], %[x0], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W NZ/W + __ASM_EMIT("vandps %[x3], %[x1], %[x0]") // x0 = (W != 0) ? NX/W NY/W NZ/W NZ/W : 0 + __ASM_EMIT("vmovups %[x0], (%[n])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [n] "r" (n), [pv] "r" (pv), + [X_3DMASK] "m" (X_MASK0111) + : "memory" + ); + } + + float calc_plane_p3(vector3d_t *v, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p0]), %[x2]") // x2 = x0 y0 z0 w0 + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x1 = x2 y2 z2 w2 + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") // x0 = p1 - p0 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") // x1 = p2 - p0 = dx2 dy2 dz2 0 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = sqrtf(W2) sqrtf(W2) sqrtf(W2) sqrtf(W2) = W W W W + __ASM_EMIT("vcmpps $4, %[x0], %[x3], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W 0/W + __ASM_EMIT("vandps %[x3], %[x1], %[x1]") // x1 = nx ny nz 0 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz + __ASM_EMIT("vmovups (%[p0]), %[x3]") // x3 = x0 y0 z0 w0 + __ASM_EMIT("vxorps %[X_ISIGN], %[x1], %[x2]") // x2 = -nx -ny -nz 0 + VECTOR_DOT3("[x2]", "[x3]", "[x3]", "[x4]") // x2 = -(nx*x0 + ny*y0 + nz*z0) = dw + __ASM_EMIT("vinsertps $0x30, %[x2], %[x1], %[x1]")// x1 = nx ny nz dw + __ASM_EMIT("vmovups %[x1], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2), + [X_ISIGN] "m" (X_SMASK0111) + : "memory" + ); + + return x0; + } + + float calc_plane_pv(vector3d_t *v, const point3d_t *pv) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[pv]), %[x2]") // x2 = x0 y0 z0 w0 + __ASM_EMIT("vmovups 0x10(%[pv]), %[x0]") // x0 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x1]") // x1 = x2 y2 z2 w2 + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") // x0 = p1 - p0 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") // x1 = p2 - p0 = dx2 dy2 dz2 0 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = sqrtf(W2) sqrtf(W2) sqrtf(W2) sqrtf(W2) = W W W W + __ASM_EMIT("vcmpps $4, %[x0], %[x3], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W 0/W + __ASM_EMIT("vandps %[x3], %[x1], %[x1]") // x1 = nx ny nz 0 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz + __ASM_EMIT("vmovups 0x00(%[pv]), %[x3]") // x3 = x0 y0 z0 w0 + __ASM_EMIT("vxorps %[X_ISIGN], %[x1], %[x2]") // x2 = -nx -ny -nz 0 + VECTOR_DOT3("[x2]", "[x3]", "[x3]", "[x4]") // x2 = -(nx*x0 + ny*y0 + nz*z0) = dw + __ASM_EMIT("vinsertps $0x30, %[x2], %[x1], %[x1]")// x1 = nx ny nz dw + __ASM_EMIT("vmovups %[x1], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [pv] "r" (pv), + [X_ISIGN] "m" (X_SMASK0111) + : "memory" + ); + + return x0; + } + + float calc_plane_v1p2(vector3d_t *v, const vector3d_t *v0, const point3d_t *p0, const point3d_t *p1) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[v0]), %[x1]") // x1 = v = dx2 dy2 dz2 0 + __ASM_EMIT("vsubps (%[p0]), %[x0], %[x0]") // x0 = p1 - p0 = dx1 dy1 dz1 0 + VECTOR_CROSS3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = sqrtf(W2) sqrtf(W2) sqrtf(W2) sqrtf(W2) = W W W W + __ASM_EMIT("vcmpps $4, %[x0], %[x3], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W 0/W + __ASM_EMIT("vandps %[x3], %[x1], %[x1]") // x1 = nx ny nz 0 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz + __ASM_EMIT("vmovups (%[p0]), %[x3]") // x3 = x0 y0 z0 w0 + __ASM_EMIT("vxorps %[X_ISIGN], %[x1], %[x2]") // x2 = -nx -ny -nz 0 + VECTOR_DOT3("[x2]", "[x3]", "[x3]", "[x4]") // x2 = -(nx*x0 + ny*y0 + nz*z0) = dw + __ASM_EMIT("vinsertps $0x30, %[x2], %[x1], %[x1]")// x1 = nx ny nz dw + __ASM_EMIT("vmovups %[x1], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [v0] "r" (v0), [p0] "r" (p0), [p1] "r" (p1), + [X_ISIGN] "m" (X_SMASK0111) + : "memory" + ); + + return x0; + } + + float calc_plane_p3_fma3(vector3d_t *v, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p0]), %[x2]") // x2 = x0 y0 z0 w0 + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x1 = x2 y2 z2 w2 + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") // x0 = p1 - p0 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") // x1 = p2 - p0 = dx2 dy2 dz2 0 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = sqrtf(W2) sqrtf(W2) sqrtf(W2) sqrtf(W2) = W W W W + __ASM_EMIT("vcmpps $4, %[x0], %[x3], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W 0/W + __ASM_EMIT("vandps %[x3], %[x1], %[x1]") // x1 = nx ny nz 0 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz + __ASM_EMIT("vmovups (%[p0]), %[x3]") // x3 = x0 y0 z0 w0 + __ASM_EMIT("vxorps %[X_ISIGN], %[x1], %[x2]") // x2 = -nx -ny -nz 0 + VECTOR_DOT3("[x2]", "[x3]", "[x3]", "[x4]") // x2 = -(nx*x0 + ny*y0 + nz*z0) = dw + __ASM_EMIT("vinsertps $0x30, %[x2], %[x1], %[x1]")// x1 = nx ny nz dw + __ASM_EMIT("vmovups %[x1], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2), + [X_ISIGN] "m" (X_SMASK0111) + : "memory" + ); + + return x0; + } + + float calc_plane_pv_fma3(vector3d_t *v, const point3d_t *pv) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[pv]), %[x2]") // x2 = x0 y0 z0 w0 + __ASM_EMIT("vmovups 0x10(%[pv]), %[x0]") // x0 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x1]") // x1 = x2 y2 z2 w2 + __ASM_EMIT("vsubps %[x2], %[x0], %[x0]") // x0 = p1 - p0 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x2], %[x1], %[x1]") // x1 = p2 - p0 = dx2 dy2 dz2 0 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = sqrtf(W2) sqrtf(W2) sqrtf(W2) sqrtf(W2) = W W W W + __ASM_EMIT("vcmpps $4, %[x0], %[x3], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W 0/W + __ASM_EMIT("vandps %[x3], %[x1], %[x1]") // x1 = nx ny nz 0 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz + __ASM_EMIT("vmovups 0x00(%[pv]), %[x3]") // x3 = x0 y0 z0 w0 + __ASM_EMIT("vxorps %[X_ISIGN], %[x1], %[x2]") // x2 = -nx -ny -nz 0 + VECTOR_DOT3("[x2]", "[x3]", "[x3]", "[x4]") // x2 = -(nx*x0 + ny*y0 + nz*z0) = dw + __ASM_EMIT("vinsertps $0x30, %[x2], %[x1], %[x1]")// x1 = nx ny nz dw + __ASM_EMIT("vmovups %[x1], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [pv] "r" (pv), + [X_ISIGN] "m" (X_SMASK0111) + : "memory" + ); + + return x0; + } + + float calc_plane_v1p2_fma3(vector3d_t *v, const vector3d_t *v0, const point3d_t *p0, const point3d_t *p1) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[v0]), %[x1]") // x1 = v = dx2 dy2 dz2 0 + __ASM_EMIT("vsubps (%[p0]), %[x0], %[x0]") // x0 = p1 - p0 = dx1 dy1 dz1 0 + VECTOR_CROSS3_FMA3("[x0]", "[x1]", "[x2]", "[x3]") // x0 = NZ NX NY 0 + __ASM_EMIT("vshufps $0xc9, %[x0], %[x0], %[x1]")// x1 = NX NY NZ 0 + VECTOR_DOT3("[x0]", "[x0]", "[x2]", "[x3]") // x0 = NX*NX + NY*NY + NZ*NZ = W2 + __ASM_EMIT("vshufps $0x00, %[x0], %[x0], %[x0]")// x0 = W2 W2 W2 W2 + __ASM_EMIT("vxorps %[x3], %[x3], %[x3]") // x3 = 0 + __ASM_EMIT("vsqrtps %[x0], %[x0]") // x0 = sqrtf(W2) sqrtf(W2) sqrtf(W2) sqrtf(W2) = W W W W + __ASM_EMIT("vcmpps $4, %[x0], %[x3], %[x3]") // x3 = W != 0 + __ASM_EMIT("vdivps %[x0], %[x1], %[x1]") // x1 = NX/W NY/W NZ/W 0/W + __ASM_EMIT("vandps %[x3], %[x1], %[x1]") // x1 = nx ny nz 0 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz + __ASM_EMIT("vmovups (%[p0]), %[x3]") // x3 = x0 y0 z0 w0 + __ASM_EMIT("vxorps %[X_ISIGN], %[x1], %[x2]") // x2 = -nx -ny -nz 0 + VECTOR_DOT3("[x2]", "[x3]", "[x3]", "[x4]") // x2 = -(nx*x0 + ny*y0 + nz*z0) = dw + __ASM_EMIT("vinsertps $0x30, %[x2], %[x1], %[x1]")// x1 = nx ny nz dw + __ASM_EMIT("vmovups %[x1], (%[v])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [v0] "r" (v0), [p0] "r" (p0), [p1] "r" (p1), + [X_ISIGN] "m" (X_SMASK0111) + : "memory" + ); + + return x0; + } + + void calc_split_point_p2v1(point3d_t *sp, const point3d_t *l0, const point3d_t *l1, const vector3d_t *pl) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[l0]), %[x1]") // x1 = l0 = lx0 ly0 lz0 1 + __ASM_EMIT("vmovups (%[l1]), %[x0]") // x0 = l1 = lx1 ly1 lz1 1 + __ASM_EMIT("vmovups (%[pl]), %[x2]") // x2 = pl = nx ny nz nw + __ASM_EMIT("vsubps %[x1], %[x0], %[x0]") // x0 = d = l1 - l0 = dx dy dz 0 + __ASM_EMIT("vmulps %[x2], %[x1], %[x3]") // x3 = nx*lx0 ny*ly0 nz*lz0 nw */ + __ASM_EMIT("vmulps %[x0], %[x2], %[x2]") // x2 = nx*dx ny*dy nz*dz 0 */ + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0 nz*lz0+nw nx*lx0+ny*ly0 nz*lz0+nw + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz nx*dx+ny*dy nz*dz + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0+nz*lz0+nw = T T T T + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz B B B B + __ASM_EMIT("vdivps %[x2], %[x3], %[x3]") // x3 = T/B T/B T/B T/B = W + __ASM_EMIT("vmulps %[x3], %[x0], %[x0]") // x0 = dx*W dy*W dz*W 0 + __ASM_EMIT("vsubps %[x0], %[x1], %[x1]") // x1 = lx0-dx*W ly0-dy*W lz0-dz*W 1 + __ASM_EMIT("vmovups %[x1], (%[sp])") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [sp] "r" (sp), [l0] "r" (l0), [l1] "r" (l1), [pl] "r" (pl) + : "memory" + ); + } + + void calc_split_point_pvv1(point3d_t *sp, const point3d_t *lv, const vector3d_t *pl) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[lv]), %[x1]") // x1 = l0 = lx0 ly0 lz0 1 + __ASM_EMIT("vmovups 0x10(%[lv]), %[x0]") // x0 = l1 = lx1 ly1 lz1 1 + __ASM_EMIT("vmovups (%[pl]), %[x2]") // x2 = pl = nx ny nz nw + __ASM_EMIT("vsubps %[x1], %[x0], %[x0]") // x0 = d = l1 - l0 = dx dy dz 0 + __ASM_EMIT("vmulps %[x2], %[x1], %[x3]") // x3 = nx*lx0 ny*ly0 nz*lz0 nw */ + __ASM_EMIT("vmulps %[x0], %[x2], %[x2]") // x2 = nx*dx ny*dy nz*dz 0 */ + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0 nz*lz0+nw nx*lx0+ny*ly0 nz*lz0+nw + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz nx*dx+ny*dy nz*dz + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0+nz*lz0+nw = T T T T + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz B B B B + __ASM_EMIT("vdivps %[x2], %[x3], %[x3]") // x3 = T/B T/B T/B T/B = W + __ASM_EMIT("vmulps %[x3], %[x0], %[x0]") // x0 = dx*W dy*W dz*W 0 + __ASM_EMIT("vsubps %[x0], %[x1], %[x1]") // x1 = lx0-dx*W ly0-dy*W lz0-dz*W 1 + __ASM_EMIT("vmovups %[x1], (%[sp])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [sp] "r" (sp), [lv] "r" (lv), [pl] "r" (pl) + : "cc", "memory" + ); + } + + void calc_split_point_p2v1_fma3(point3d_t *sp, const point3d_t *l0, const point3d_t *l1, const vector3d_t *pl) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[l0]), %[x1]") // x1 = l0 = lx0 ly0 lz0 1 + __ASM_EMIT("vmovups (%[l1]), %[x0]") // x0 = l1 = lx1 ly1 lz1 1 + __ASM_EMIT("vmovups (%[pl]), %[x2]") // x2 = pl = nx ny nz nw + __ASM_EMIT("vsubps %[x1], %[x0], %[x0]") // x0 = d = l1 - l0 = dx dy dz 0 + __ASM_EMIT("vmulps %[x2], %[x1], %[x3]") // x3 = nx*lx0 ny*ly0 nz*lz0 nw */ + __ASM_EMIT("vmulps %[x0], %[x2], %[x2]") // x2 = nx*dx ny*dy nz*dz 0 */ + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0 nz*lz0+nw nx*lx0+ny*ly0 nz*lz0+nw + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz nx*dx+ny*dy nz*dz + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0+nz*lz0+nw = T T T T + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz B B B B + __ASM_EMIT("vdivps %[x2], %[x3], %[x3]") // x3 = T/B T/B T/B T/B = W + __ASM_EMIT("vfnmadd231ps %[x3], %[x0], %[x1]") // x1 = lx0-dx*W ly0-dy*W lz0-dz*W 1 + __ASM_EMIT("vmovups %[x1], (%[sp])") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [sp] "r" (sp), [l0] "r" (l0), [l1] "r" (l1), [pl] "r" (pl) + : "memory" + ); + } + + void calc_split_point_pvv1_fma3(point3d_t *sp, const point3d_t *lv, const vector3d_t *pl) + { + float x0, x1, x2, x3; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[lv]), %[x1]") // x1 = l0 = lx0 ly0 lz0 1 + __ASM_EMIT("vmovups 0x10(%[lv]), %[x0]") // x0 = l1 = lx1 ly1 lz1 1 + __ASM_EMIT("vmovups (%[pl]), %[x2]") // x2 = pl = nx ny nz nw + __ASM_EMIT("vsubps %[x1], %[x0], %[x0]") // x0 = d = l1 - l0 = dx dy dz 0 + __ASM_EMIT("vmulps %[x2], %[x1], %[x3]") // x3 = nx*lx0 ny*ly0 nz*lz0 nw */ + __ASM_EMIT("vmulps %[x0], %[x2], %[x2]") // x2 = nx*dx ny*dy nz*dz 0 */ + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0 nz*lz0+nw nx*lx0+ny*ly0 nz*lz0+nw + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz nx*dx+ny*dy nz*dz + __ASM_EMIT("vhaddps %[x3], %[x3], %[x3]") // x3 = nx*lx0+ny*ly0+nz*lz0+nw = T T T T + __ASM_EMIT("vhaddps %[x2], %[x2], %[x2]") // x2 = nx*dx+ny*dy nz*dz B B B B + __ASM_EMIT("vdivps %[x2], %[x3], %[x3]") // x3 = T/B T/B T/B T/B = W + __ASM_EMIT("vfnmadd231ps %[x3], %[x0], %[x1]") // x1 = lx0-dx*W ly0-dy*W lz0-dz*W 1 + __ASM_EMIT("vmovups %[x1], (%[sp])") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [sp] "r" (sp), [lv] "r" (lv), [pl] "r" (pl) + : "cc", "memory" + ); + } + + float check_triplet3d_p3n(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p2]), %[x2]") // x2 = p2 = px2 py2 pz2 1 + __ASM_EMIT("vmovups (%[p3]), %[x3]") // x3 = p3 = px3 py3 pz3 1 + __ASM_EMIT("vsubps (%[p1]), %[x2], %[x1]") // x1 = p2 - p1 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz 0 + __ASM_EMIT("vsubps %[x2], %[x3], %[x2]") // x2 = p3 - p2 + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_pvn(const point3d_t *pv, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x10(%[pv]), %[x2]") // x2 = p2 = px2 py2 pz2 1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x3]") // x3 = p3 = px3 py3 pz3 1 + __ASM_EMIT("vsubps 0x00(%[pv]), %[x2], %[x1]") // x1 = p2 - p1 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz nw + __ASM_EMIT("vsubps %[x2], %[x3], %[x2]") // x2 = p3 - p2 + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [pv] "r" (pv), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_v2n(const vector3d_t *v1, const vector3d_t *v2, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[v1]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[v2]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz nw + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v1] "r" (v1), [v2] "r" (v2), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_vvn(const vector3d_t *v, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[v]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x10(%[v]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz nw + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_vv(const vector3d_t *v) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[v]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x10(%[v]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vmovups 0x20(%[v]), %[x0]") // x0 = nx ny nz nw + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v) + ); + + return x0; + } + + float check_triplet3d_p3n_fma3(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[p2]), %[x2]") // x2 = p2 = px2 py2 pz2 1 + __ASM_EMIT("vmovups (%[p3]), %[x3]") // x3 = p3 = px3 py3 pz3 1 + __ASM_EMIT("vsubps (%[p1]), %[x2], %[x1]") // x1 = p2 - p1 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz 0 + __ASM_EMIT("vsubps %[x2], %[x3], %[x2]") // x2 = p3 - p2 + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_pvn_fma3(const point3d_t *pv, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x10(%[pv]), %[x2]") // x2 = p2 = px2 py2 pz2 1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x3]") // x3 = p3 = px3 py3 pz3 1 + __ASM_EMIT("vsubps 0x00(%[pv]), %[x2], %[x1]") // x1 = p2 - p1 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz nw + __ASM_EMIT("vsubps %[x2], %[x3], %[x2]") // x2 = p3 - p2 + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [pv] "r" (pv), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_v2n_fma3(const vector3d_t *v1, const vector3d_t *v2, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups (%[v1]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups (%[v2]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz nw + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v1] "r" (v1), [v2] "r" (v2), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_vvn_fma3(const vector3d_t *v, const vector3d_t *n) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[v]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x10(%[v]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vmovups (%[n]), %[x0]") // x0 = nx ny nz nw + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v), [n] "r" (n) + ); + + return x0; + } + + float check_triplet3d_vv_fma3(const vector3d_t *v) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("vmovups 0x00(%[v]), %[x1]") // x1 = x1 y1 z1 w1 + __ASM_EMIT("vmovups 0x10(%[v]), %[x2]") // x2 = x2 y2 z2 w2 + __ASM_EMIT("vmovups 0x20(%[v]), %[x0]") // x0 = nx ny nz nw + + MIXED_PRODUCT3("x0", "x1", "x2", "x3", "x4") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) + : [v] "r" (v) + ); + + return x0; + } + + float check_point3d_on_triangle_pvp(const point3d_t *pv, const point3d_t *p) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + + ARCH_X86_ASM + ( + /* Load vectors */ + __ASM_EMIT("vmovups (%[p]), %[x3]") // x3 = px py pz 1 + __ASM_EMIT("vmovups 0x00(%[pv]), %[x0]") // x0 = x0 y0 z0 1 + __ASM_EMIT("vmovups 0x10(%[pv]), %[x1]") // x1 = x1 y1 z1 1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x2]") // x2 = x2 y2 z2 1 + __ASM_EMIT("vsubps %[x3], %[x0], %[x0]") // x0 = v0 = dx0 dy0 dz0 0 + __ASM_EMIT("vsubps %[x3], %[x1], %[x1]") // x1 = v1 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x3], %[x2], %[x2]") // x2 = v2 = dx2 dy2 dz2 0 + /* 3x vector multiplications */ + VECTOR_CROSS3_X3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") + /* 3x scalar multiplications */ + /* x0 = m0 = v0 cross v1 */ + /* x1 = m1 = v1 cross v2 */ + /* x2 = m2 = v2 cross v0 */ + VECTOR_DOT3_X3("[x0]", "[x1]", "[x2]", "[x3]") + /* Compare with zeros */ + /* x0 = r0 = m0 dot m1 */ + /* x1 = r1 = m1 dot m2 */ + /* x2 = r2 = m2 dot m0 */ + __ASM_EMIT("vxorps %[x4], %[x4], %[x4]") // x4 = 0 + __ASM_EMIT("vucomiss %[x4], %[x0]") // r0 <=> 0 + __ASM_EMIT("jb 110f") // r0 < 0 + __ASM_EMIT("vmulss %[x1], %[x0], %[x0]") // x0 = r0 * r1 + __ASM_EMIT("vucomiss %[x4], %[x1]") // r1 <=> 0 + __ASM_EMIT("jb 109f") // r1 < 0 + __ASM_EMIT("vmulss %[x2], %[x0], %[x0]") // x0 = r0 * r1 * r2 + __ASM_EMIT("vucomiss %[x4], %[x2]") // r2 <=> 0 + __ASM_EMIT("jae 110f") // r2 >= 0 + /* Fail cases */ + __ASM_EMIT("vmovaps %[x2], %[x0]") // x0 = r2 + __ASM_EMIT("jmp 110f") + __ASM_EMIT("109:") + __ASM_EMIT("vmovaps %[x1], %[x0]") // x0 = r1 + /* End */ + __ASM_EMIT("110:") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) + : [pv] "r" (pv), [p] "r" (p) + ); + + return x0; + } + + float check_point3d_on_triangle_p3p(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3, const point3d_t *p) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + + ARCH_X86_ASM + ( + /* Load vectors */ + __ASM_EMIT("vmovups (%[p]), %[x3]") // x3 = px py pz 1 + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x0 y0 z0 1 + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x1 = x1 y1 z1 1 + __ASM_EMIT("vmovups (%[p3]), %[x2]") // x2 = x2 y2 z2 1 + __ASM_EMIT("vsubps %[x3], %[x0], %[x0]") // x0 = v0 = dx0 dy0 dz0 0 + __ASM_EMIT("vsubps %[x3], %[x1], %[x1]") // x1 = v1 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x3], %[x2], %[x2]") // x2 = v2 = dx2 dy2 dz2 0 + /* 3x vector multiplications */ + VECTOR_CROSS3_X3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") + /* 3x scalar multiplications */ + /* x0 = m0 = v0 cross v1 */ + /* x1 = m1 = v1 cross v2 */ + /* x2 = m2 = v2 cross v0 */ + VECTOR_DOT3_X3("[x0]", "[x1]", "[x2]", "[x3]") + /* Compare with zeros */ + /* x0 = r0 = m0 dot m1 */ + /* x1 = r1 = m1 dot m2 */ + /* x2 = r2 = m2 dot m0 */ + __ASM_EMIT("vxorps %[x4], %[x4], %[x4]") // x4 = 0 + __ASM_EMIT("vucomiss %[x4], %[x0]") // r0 <=> 0 + __ASM_EMIT("jb 110f") // r0 < 0 + __ASM_EMIT("vmulss %[x1], %[x0], %[x0]") // x0 = r0 * r1 + __ASM_EMIT("vucomiss %[x4], %[x1]") // r1 <=> 0 + __ASM_EMIT("jb 109f") // r1 < 0 + __ASM_EMIT("vmulss %[x2], %[x0], %[x0]") // x0 = r0 * r1 * r2 + __ASM_EMIT("vucomiss %[x4], %[x2]") // r2 <=> 0 + __ASM_EMIT("jae 110f") // r2 >= 0 + /* Fail cases */ + __ASM_EMIT("vmovaps %[x2], %[x0]") // x0 = r2 + __ASM_EMIT("jmp 110f") + __ASM_EMIT("109:") + __ASM_EMIT("vmovaps %[x1], %[x0]") // x0 = r1 + /* End */ + __ASM_EMIT("110:") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) + : [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), [p] "r" (p) + ); + + return x0; + } + + float check_point3d_on_triangle_pvp_fma3(const point3d_t *pv, const point3d_t *p) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + + ARCH_X86_ASM + ( + /* Load vectors */ + __ASM_EMIT("vmovups (%[p]), %[x3]") // x3 = px py pz 1 + __ASM_EMIT("vmovups 0x00(%[pv]), %[x0]") // x0 = x0 y0 z0 1 + __ASM_EMIT("vmovups 0x10(%[pv]), %[x1]") // x1 = x1 y1 z1 1 + __ASM_EMIT("vmovups 0x20(%[pv]), %[x2]") // x2 = x2 y2 z2 1 + __ASM_EMIT("vsubps %[x3], %[x0], %[x0]") // x0 = v0 = dx0 dy0 dz0 0 + __ASM_EMIT("vsubps %[x3], %[x1], %[x1]") // x1 = v1 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x3], %[x2], %[x2]") // x2 = v2 = dx2 dy2 dz2 0 + /* 3x vector multiplications */ + VECTOR_CROSS3_X3_FMA3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") + /* 3x scalar multiplications */ + /* x0 = m0 = v0 cross v1 */ + /* x1 = m1 = v1 cross v2 */ + /* x2 = m2 = v2 cross v0 */ + VECTOR_DOT3_X3("[x0]", "[x1]", "[x2]", "[x3]") + /* Compare with zeros */ + /* x0 = r0 = m0 dot m1 */ + /* x1 = r1 = m1 dot m2 */ + /* x2 = r2 = m2 dot m0 */ + __ASM_EMIT("vxorps %[x4], %[x4], %[x4]") // x4 = 0 + __ASM_EMIT("vucomiss %[x4], %[x0]") // r0 <=> 0 + __ASM_EMIT("jb 110f") // r0 < 0 + __ASM_EMIT("vmulss %[x1], %[x0], %[x0]") // x0 = r0 * r1 + __ASM_EMIT("vucomiss %[x4], %[x1]") // r1 <=> 0 + __ASM_EMIT("jb 109f") // r1 < 0 + __ASM_EMIT("vmulss %[x2], %[x0], %[x0]") // x0 = r0 * r1 * r2 + __ASM_EMIT("vucomiss %[x4], %[x2]") // r2 <=> 0 + __ASM_EMIT("jae 110f") // r2 >= 0 + /* Fail cases */ + __ASM_EMIT("vmovaps %[x2], %[x0]") // x0 = r2 + __ASM_EMIT("jmp 110f") + __ASM_EMIT("109:") + __ASM_EMIT("vmovaps %[x1], %[x0]") // x0 = r1 + /* End */ + __ASM_EMIT("110:") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) + : [pv] "r" (pv), [p] "r" (p) + ); + + return x0; + } + + float check_point3d_on_triangle_p3p_fma3(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3, const point3d_t *p) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + + ARCH_X86_ASM + ( + /* Load vectors */ + __ASM_EMIT("vmovups (%[p]), %[x3]") // x3 = px py pz 1 + __ASM_EMIT("vmovups (%[p1]), %[x0]") // x0 = x0 y0 z0 1 + __ASM_EMIT("vmovups (%[p2]), %[x1]") // x1 = x1 y1 z1 1 + __ASM_EMIT("vmovups (%[p3]), %[x2]") // x2 = x2 y2 z2 1 + __ASM_EMIT("vsubps %[x3], %[x0], %[x0]") // x0 = v0 = dx0 dy0 dz0 0 + __ASM_EMIT("vsubps %[x3], %[x1], %[x1]") // x1 = v1 = dx1 dy1 dz1 0 + __ASM_EMIT("vsubps %[x3], %[x2], %[x2]") // x2 = v2 = dx2 dy2 dz2 0 + /* 3x vector multiplications */ + VECTOR_CROSS3_X3_FMA3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") + /* 3x scalar multiplications */ + /* x0 = m0 = v0 cross v1 */ + /* x1 = m1 = v1 cross v2 */ + /* x2 = m2 = v2 cross v0 */ + VECTOR_DOT3_X3("[x0]", "[x1]", "[x2]", "[x3]") + /* Compare with zeros */ + /* x0 = r0 = m0 dot m1 */ + /* x1 = r1 = m1 dot m2 */ + /* x2 = r2 = m2 dot m0 */ + __ASM_EMIT("vxorps %[x4], %[x4], %[x4]") // x4 = 0 + __ASM_EMIT("vucomiss %[x4], %[x0]") // r0 <=> 0 + __ASM_EMIT("jb 110f") // r0 < 0 + __ASM_EMIT("vmulss %[x1], %[x0], %[x0]") // x0 = r0 * r1 + __ASM_EMIT("vucomiss %[x4], %[x1]") // r1 <=> 0 + __ASM_EMIT("jb 109f") // r1 < 0 + __ASM_EMIT("vmulss %[x2], %[x0], %[x0]") // x0 = r0 * r1 * r2 + __ASM_EMIT("vucomiss %[x4], %[x2]") // r2 <=> 0 + __ASM_EMIT("jae 110f") // r2 >= 0 + /* Fail cases */ + __ASM_EMIT("vmovaps %[x2], %[x0]") // x0 = r2 + __ASM_EMIT("jmp 110f") + __ASM_EMIT("109:") + __ASM_EMIT("vmovaps %[x1], %[x0]") // x0 = r1 + /* End */ + __ASM_EMIT("110:") + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) + : [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), [p] "r" (p) + ); + + return x0; + } + + } /* namespace avx */ +} /* namespace lsp */ + + + + +#endif /* PRIVATE_DSP_ARCH_X86_AVX_3DMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/cos.h 2025-08-26 18:15:43.726003291 +0000 @@ -0,0 +1,622 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_PMATH_COS_H_ +#define PRIVATE_DSP_ARCH_X86_AVX2_PMATH_COS_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_IMPL */ + +#include + +namespace lsp +{ + namespace avx2 + { + void cosf1(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsubps 0x20(%[dst]), %%ymm1, %%ymm4") // ymm4 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%xmm1, %%xmm0") // xmm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm0") // xmm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void cosf2(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsubps 0x20(%[src]), %%ymm1, %%ymm4") // ymm4 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[src]") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%xmm1, %%xmm0") // xmm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm0") // xmm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm6") // ymm6 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm7") // ymm7 = p + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm0") // ymm0 = PI + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm4") // ymm4 = i = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x60 + %[S2KP], %%ymm5") // ymm5 = step = 8 8 8 8 8 8 8 8 + __ASM_EMIT("vsubps %%ymm7, %%ymm0, %%ymm7") // ymm7 = PI/2 - p + PI/2 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm4, %%ymm6, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps %%ymm5, %%ymm4, %%ymm4") // ymm4 = i + step + __ASM_EMIT("vsubps %%ymm0, %%ymm7, %%ymm0") // ymm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm4, %%xmm4")// xmm4 = i + step + __ASM_EMIT("vsubps %%xmm0, %%xmm7, %%xmm0") // xmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vsubps %%xmm0, %%xmm7, %%xmm0") // xmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void x64_cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm11") // ymm11 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm12") // ymm12 = p + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm0") // ymm0 = PI + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm8") // ymm8 = i0 = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x20 + %[S2KP], %%ymm9") // ymm9 = i1 = 8 9 10 11 12 13 14 + __ASM_EMIT("vmovaps 0x40 + %[S2KP], %%ymm10") // ymm10 = step = 16 ... + __ASM_EMIT("vsubps %%ymm12, %%ymm0, %%ymm12") // ymm12 = PI/2 - p + PI/2 + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vmulps %%ymm9, %%ymm11, %%ymm4") // ymm4 = k*i1 + __ASM_EMIT("vaddps %%ymm10, %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm10, %%ymm9, %%ymm9") // ymm9 = i1 + step + __ASM_EMIT("vsubps %%ymm0, %%ymm12, %%ymm0") // ymm0 = PI/2 - (k*i0 + p) + PI/2 + __ASM_EMIT("vsubps %%ymm4, %%ymm12, %%ymm4") // ymm4 = PI/2 - (k*i1 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vaddps 0x60 + %[S2KP], %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vsubps %%ymm0, %%ymm12, %%ymm0") // ymm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm8, %%xmm8") // xmm8 = i0 + step + __ASM_EMIT("vsubps %%xmm0, %%xmm12, %%xmm0") // xmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vsubps %%xmm0, %%xmm12, %%xmm0") // xmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12" + ); + } + + + void cosf1_fma3(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsubps 0x20(%[dst]), %%ymm1, %%ymm4") // ymm4 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void cosf2_fma3(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsubps 0x20(%[src]), %%ymm1, %%ymm4") // ymm4 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[src]") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%xmm1, %%xmm0") // xmm0 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm0") // xmm0 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void cosf_kp1_fma3(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm6") // ymm6 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm7") // ymm7 = p + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm0") // ymm0 = PI + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm4") // ymm4 = i = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x60 + %[S2KP], %%ymm5") // ymm5 = step = 8 8 8 8 8 8 8 8 + __ASM_EMIT("vsubps %%ymm7, %%ymm0, %%ymm7") // ymm7 = PI/2 - p + PI/2 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm4, %%ymm6, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps %%ymm5, %%ymm4, %%ymm4") // ymm4 = i + step + __ASM_EMIT("vsubps %%ymm0, %%ymm7, %%ymm0") // ymm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm4, %%xmm4")// xmm4 = i + step + __ASM_EMIT("vsubps %%xmm0, %%xmm7, %%xmm0") // xmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vsubps %%xmm0, %%xmm7, %%xmm0") // xmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void x64_cosf_kp1_fma3(float *dst, float k, float p, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm11") // ymm11 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm12") // ymm12 = p + __ASM_EMIT("vmovaps 0x020 + %[S2C], %%ymm0") // ymm0 = PI + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm8") // ymm8 = i0 = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x20 + %[S2KP], %%ymm9") // ymm9 = i1 = 8 9 10 11 12 13 14 + __ASM_EMIT("vmovaps 0x40 + %[S2KP], %%ymm10") // ymm10 = step = 16 ... + __ASM_EMIT("vsubps %%ymm12, %%ymm0, %%ymm12") // ymm12 = PI/2 + p + PI/2 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vmulps %%ymm9, %%ymm11, %%ymm4") // ymm4 = k*i1 + __ASM_EMIT("vaddps %%ymm10, %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm10, %%ymm9, %%ymm9") // ymm9 = i1 + step + __ASM_EMIT("vsubps %%ymm0, %%ymm12, %%ymm0") // ymm0 = PI/2 - (k*i0 + p) + PI/2 + __ASM_EMIT("vsubps %%ymm4, %%ymm12, %%ymm4") // ymm4 = PI/2 - (k*i1 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X16_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vaddps 0x60 + %[S2KP], %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vsubps %%ymm0, %%ymm12, %%ymm0") // ymm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm8, %%xmm8") // xmm8 = i0 + step + __ASM_EMIT("vsubps %%xmm0, %%xmm12, %%xmm0") // xmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vsubps %%xmm0, %%xmm12, %%xmm0") // xmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12" + ); + } + + } /* namespace avx2 */ +} /* namespace lsp */ + + + + +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_PMATH_COS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/lanczos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/lanczos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/lanczos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/lanczos.h 2025-08-26 18:15:43.730003252 +0000 @@ -0,0 +1,507 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 17 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_PMATH_LANCZOS_H_ +#define PRIVATE_DSP_ARCH_X86_AVX2_PMATH_LANCZOS_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_IMPL */ + +#include + +namespace lsp +{ + namespace avx2 + { + IF_ARCH_X86( + static const uint32_t lanczos_const[] __lsp_aligned32 = + { + LSP_DSP_VEC8(0x7fffffff), // +0x00: Mask for fabsf + LSP_DSP_VEC8(0x38d1b717), // +0x20: Sinc threshold = 1e-4 + LSP_DSP_VEC8(0x3f800000), // +0x40: 1.0 + }; + ) + + typedef struct lanczos_gen_t + { + float k[8]; // +0x00: Multiplier + float p[8]; // +0x20: Initial phase + float a[8]; // +0x40: Number of lobes + float i[8]; // +0x60: Indices + float x1[8]; // +0x80: Computed X1 + float d[8]; // +0xa0: Denominator + float t[8]; // +0xc0: Time range + } lanczos_gen_t; + + #define LANCZOS_GEN_FUNC_X8 \ + /* ymm0 = x1 */ \ + __ASM_EMIT("vmulps 0x40 + %[state], %%ymm0, %%ymm4") /* ymm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%ymm0, 0x80 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm4, %%ymm2") /* ymm2 = d = x1 * x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = x1 + PI/2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm4, %%ymm4") /* ymm4 = x2 + PI/2 */ \ + __ASM_EMIT("vmovaps %%ymm2, 0xa0 + %[state]") /* *d = d */ \ + SINF_X_PLUS_PI_2_CORE_X16 /* ymm0 = sinf(x1), ymm4 = sinf(x2) */ \ + __ASM_EMIT("vmovaps 0x80 + %[state], %%ymm1") /* ymm1 = x1 */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm1, %%ymm1") /* ymm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0xa0 + %[state], %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%ymm1, %%ymm2") /* ymm2 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, 0xc0 + %[state], %%ymm1, %%ymm1") /* ymm1 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x40 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_FUNC_X4 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("vmulps 0x40 + %[state], %%xmm0, %%xmm4") /* xmm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%xmm0, 0x80 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%xmm0, %%xmm4, %%xmm2") /* xmm2 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf128 $1, %%xmm4, %%ymm0, %%ymm0") /* ymm0 = x1 x1 x1 x1 x2 x2 x2 x2 */ \ + __ASM_EMIT("vmovaps %%xmm2, 0xa0 + %[state]") /* *d = d */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* xmm0 = x1 + PI/2 ... x2 + PI/2 ... */ \ + SINF_X_PLUS_PI_2_CORE_X8 /* ymm0 = sinf(x1) ... sinf(x2) ... */ \ + __ASM_EMIT("vextractf128 $1, %%ymm0, %%xmm4") /* xmm4 = sif(x2) */ \ + __ASM_EMIT("vmovaps 0x80 + %[state], %%xmm1") /* xmm1 = x1 */ \ + __ASM_EMIT("vmulps %%xmm4, %%xmm0, %%xmm0") /* xmm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%xmm1, %%xmm1") /* xmm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0xa0 + %[state], %%xmm0, %%xmm0") /* xmm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%xmm1, %%xmm2") /* xmm2 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, 0xc0 + %[state], %%xmm1, %%xmm1") /* xmm1 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("vblendvps %%xmm2, 0x40 + %[LC], %%xmm0, %%xmm0") /* xmm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + + void lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + IF_ARCH_X86( + lanczos_gen_t state __lsp_aligned32; + float stub[8] __lsp_aligned16; + ); + + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm4") // ymm4 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm5") // ymm5 = p + __ASM_EMIT("vbroadcastss %[a], %%ymm6") // ymm6 = a + __ASM_EMIT("vbroadcastss %[t], %%ymm7") // ymm7 = t + __ASM_EMIT("vmovaps %%ymm4, 0x00 + %[state]") + __ASM_EMIT("vmovaps %%ymm5, 0x20 + %[state]") + __ASM_EMIT("vmovaps %%ymm6, 0x40 + %[state]") + __ASM_EMIT("vmovaps %%ymm7, 0xc0 + %[state]") + __ASM_EMIT("vmovaps 0x00 + %[LGEN], %%ymm1") // ymm1 = i = 0 1 2 3 4 5 6 7 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps 0x00 + %[state], %%ymm1, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps 0x60 + %[LGEN], %%ymm1, %%ymm1") // ymm1 = i' = i + step + __ASM_EMIT("vsubps 0x20 + %[state], %%ymm0, %%ymm0") // ymm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%ymm1, 0x60 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X8 + __ASM_EMIT("vmovaps 0x60 + %[state], %%ymm1") // ymm1 = i' + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps 0x00 + %[state], %%xmm1, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x80 + %[LGEN], %%xmm1, %%xmm1") // xmm1 = i' = i + step + __ASM_EMIT("vsubps 0x20 + %[state], %%xmm0, %%xmm0") // xmm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%xmm1, 0x60 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("vmovaps 0x60 + %[state], %%xmm1") // xmm1 = i' + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps 0x00 + %[state], %%xmm1, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vsubps 0x20 + %[state], %%xmm0, %%xmm0") // xmm0 = x1 = k*i - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [state] "o" (state), + [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [stub] "o" (stub), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + #define LANCZOS_GEN_X64_FUNC_X8 \ + /* ymm8 = k */ \ + /* ymm9 = p */ \ + /* ymm10 = t */ \ + /* ymm11 = a */ \ + /* ymm12 = x1 */ \ + /* ymm13 = d */ \ + /* ymm14 = i */ \ + /* ymm15 = step */ \ + __ASM_EMIT("vmulps %%ymm11, %%ymm12, %%ymm4") /* ymm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%ymm12, %%ymm4, %%ymm13") /* ymm13 = d = x1 * x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm12, %%ymm0") /* ymm0 = x1 + PI/2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm4, %%ymm4") /* ymm4 = x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X16 /* ymm0 = sinf(x1), ymm4 = sinf(x2) */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm12, %%ymm12") /* ymm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%ymm13, %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%ymm12, %%ymm2") /* ymm2 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, %%ymm10, %%ymm12, %%ymm1") /* ymm1 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x40 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_X64_FUNC_X4 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("vmulps %%xmm11, %%xmm12, %%xmm4") /* xmm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%xmm12, %%xmm4, %%xmm13") /* xmm13 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf128 $1, %%xmm4, %%ymm12, %%ymm0") /* ymm0 = x1 x1 x1 x1 x2 x2 x2 x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = x1 + PI/2 ... x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X8 /* ymm0 = sinf(x1) ... sinf(x2) */ \ + __ASM_EMIT("vextractf128 $1, %%ymm0, %%xmm4") /* xmm4 = sif(x2) */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm12, %%ymm12") /* ymm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%ymm13, %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%ymm12, %%ymm2") /* ymm2 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, %%ymm10, %%ymm12, %%ymm1") /* ymm1 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x40 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void x64_lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm8") // ymm8 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm9") // ymm9 = p + __ASM_EMIT("vbroadcastss %[t], %%ymm10") // ymm10 = t + __ASM_EMIT("vbroadcastss %[a], %%ymm11") // ymm11 = a + __ASM_EMIT("vmovaps 0x00 + %[LGEN], %%ymm14") // ymm14 = i = 0 1 2 3 4 5 6 7 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("vmovaps 0x60 + %[LGEN], %%ymm15") // ymm15 = step + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm8, %%ymm14, %%ymm12") // ymm12 = k*i + __ASM_EMIT("vaddps %%ymm15, %%ymm14, %%ymm14") // ymm14 = i' = i + step + __ASM_EMIT("vsubps %%ymm9, %%ymm12, %%ymm12") // ymm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%xmm8, %%xmm14, %%xmm12") // xmm12 = k*i + __ASM_EMIT("vaddps 0x80 + %[LGEN], %%xmm14, %%xmm14") // xmm14 = i' = i + step + __ASM_EMIT("vsubps %%xmm9, %%xmm12, %%xmm12") // xmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps %%xmm8, %%xmm14, %%xmm12") // xmm12 = k*i + __ASM_EMIT("vsubps %%xmm9, %%xmm12, %%xmm12") // xmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15" + ); + } + + + #define LANCZOS_GEN_FUNC_X8_FMA3 \ + /* ymm0 = x1 */ \ + __ASM_EMIT("vmulps 0x40 + %[state], %%ymm0, %%ymm4") /* ymm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%ymm0, 0x80 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm4, %%ymm2") /* ymm2 = d = x1 * x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = x1 + PI/2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm4, %%ymm4") /* ymm4 = x2 + PI/2 */ \ + __ASM_EMIT("vmovaps %%ymm2, 0xa0 + %[state]") /* *d = d */ \ + SINF_X_PLUS_PI_2_CORE_X16_FMA3 /* ymm0 = sinf(x1), ymm4 = sinf(x2) */ \ + __ASM_EMIT("vmovaps 0x80 + %[state], %%ymm1") /* ymm1 = x1 */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm1, %%ymm1") /* ymm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0xa0 + %[state], %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%ymm1, %%ymm2") /* ymm2 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, 0xc0 + %[state], %%ymm1, %%ymm1") /* ymm1 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x40 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_FUNC_X4_FMA3 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("vmulps 0x40 + %[state], %%xmm0, %%xmm4") /* xmm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%xmm0, 0x80 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%xmm0, %%xmm4, %%xmm2") /* xmm2 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf128 $1, %%xmm4, %%ymm0, %%ymm0") /* ymm0 = x1 x1 x1 x1 x2 x2 x2 x2 */ \ + __ASM_EMIT("vmovaps %%xmm2, 0xa0 + %[state]") /* *d = d */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* xmm0 = x1 + PI/2 ... x2 + PI/2 ... */ \ + SINF_X_PLUS_PI_2_CORE_X8_FMA3 /* ymm0 = sinf(x1) ... sinf(x2) */ \ + __ASM_EMIT("vextractf128 $1, %%ymm0, %%xmm4") /* xmm4 = sif(x2) */ \ + __ASM_EMIT("vmovaps 0x80 + %[state], %%xmm1") /* xmm1 = x1 */ \ + __ASM_EMIT("vmulps %%xmm4, %%xmm0, %%xmm0") /* xmm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%xmm1, %%xmm1") /* xmm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0xa0 + %[state], %%xmm0, %%xmm0") /* xmm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%xmm1, %%xmm2") /* xmm2 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, 0xc0 + %[state], %%xmm1, %%xmm1") /* xmm1 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("vblendvps %%xmm2, 0x40 + %[LC], %%xmm0, %%xmm0") /* xmm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void lanczos1_fma3(float *dst, float k, float p, float t, float a, size_t count) + { + IF_ARCH_X86( + lanczos_gen_t state __lsp_aligned32; + float stub[8] __lsp_aligned16; + ); + + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm4") // ymm4 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm5") // ymm5 = p + __ASM_EMIT("vbroadcastss %[a], %%ymm6") // ymm6 = a + __ASM_EMIT("vbroadcastss %[t], %%ymm7") // ymm7 = t + __ASM_EMIT("vmovaps %%ymm4, 0x00 + %[state]") + __ASM_EMIT("vmovaps %%ymm5, 0x20 + %[state]") + __ASM_EMIT("vmovaps %%ymm6, 0x40 + %[state]") + __ASM_EMIT("vmovaps %%ymm7, 0xc0 + %[state]") + __ASM_EMIT("vmovaps 0x00 + %[LGEN], %%ymm1") // ymm1 = i = 0 1 2 3 4 5 6 7 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps 0x00 + %[state], %%ymm1, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps 0x60 + %[LGEN], %%ymm1, %%ymm1") // ymm1 = i' = i + step + __ASM_EMIT("vsubps 0x20 + %[state], %%ymm0, %%ymm0") // ymm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%ymm1, 0x60 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X8_FMA3 + __ASM_EMIT("vmovaps 0x60 + %[state], %%ymm1") // ymm1 = i' + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps 0x00 + %[state], %%xmm1, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x80 + %[LGEN], %%xmm1, %%xmm1") // xmm1 = i' = i + step + __ASM_EMIT("vsubps 0x20 + %[state], %%xmm0, %%xmm0") // xmm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%xmm1, 0x60 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X4_FMA3 + __ASM_EMIT("vmovaps 0x60 + %[state], %%xmm1") // xmm1 = i' + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps 0x00 + %[state], %%xmm1, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vsubps 0x20 + %[state], %%xmm0, %%xmm0") // xmm0 = x1 = k*i - p + LANCZOS_GEN_FUNC_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [state] "o" (state), + [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [stub] "o" (stub), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + #define LANCZOS_GEN_X64_FUNC_X8_FMA3 \ + /* ymm8 = k */ \ + /* ymm9 = p */ \ + /* ymm10 = t */ \ + /* ymm11 = a */ \ + /* ymm12 = x1 */ \ + /* ymm13 = d */ \ + /* ymm14 = i */ \ + /* ymm15 = step */ \ + __ASM_EMIT("vmulps %%ymm11, %%ymm12, %%ymm4") /* ymm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%ymm12, %%ymm4, %%ymm13") /* ymm13 = d = x1 * x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm12, %%ymm0") /* ymm0 = x1 + PI/2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm4, %%ymm4") /* ymm4 = x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X16_FMA3 /* ymm0 = sinf(x1), ymm4 = sinf(x2) */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm12, %%ymm12") /* ymm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%ymm13, %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%ymm12, %%ymm2") /* ymm2 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, %%ymm10, %%ymm12, %%ymm1") /* ymm1 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x40 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_X64_FUNC_X4_FMA3 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("vmulps %%xmm11, %%xmm12, %%xmm4") /* xmm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%xmm12, %%xmm4, %%xmm13") /* xmm13 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf128 $1, %%xmm4, %%ymm12, %%ymm0") /* ymm0 = x1 x1 x1 x1 x2 x2 x2 x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = x1 + PI/2 ... x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X8_FMA3 /* ymm0 = sinf(x1) ... sinf(x2) */ \ + __ASM_EMIT("vextractf128 $1, %%ymm0, %%xmm4") /* xmm4 = sif(x2) */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm12, %%ymm12") /* ymm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%ymm13, %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x20 + %[LC], %%ymm12, %%ymm2") /* ymm2 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, %%ymm10, %%ymm12, %%ymm1") /* ymm1 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x40 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void x64_lanczos1_fma3(float *dst, float k, float p, float t, float a, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm8") // ymm8 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm9") // ymm9 = p + __ASM_EMIT("vbroadcastss %[t], %%ymm10") // ymm10 = t + __ASM_EMIT("vbroadcastss %[a], %%ymm11") // ymm11 = a + __ASM_EMIT("vmovaps 0x00 + %[LGEN], %%ymm14") // ymm14 = i = 0 1 2 3 4 5 6 7 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("vmovaps 0x60 + %[LGEN], %%ymm15") // ymm15 = step + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm8, %%ymm14, %%ymm12") // ymm12 = k*i + __ASM_EMIT("vaddps %%ymm15, %%ymm14, %%ymm14") // ymm14 = i' = i + step + __ASM_EMIT("vsubps %%ymm9, %%ymm12, %%ymm12") // ymm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%xmm8, %%xmm14, %%xmm12") // xmm12 = k*i + __ASM_EMIT("vaddps 0x80 + %[LGEN], %%xmm14, %%xmm14") // xmm14 = i' = i + step + __ASM_EMIT("vsubps %%xmm9, %%xmm12, %%xmm12") // xmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps %%xmm8, %%xmm14, %%xmm12") // xmm12 = k*i + __ASM_EMIT("vsubps %%xmm9, %%xmm12, %%xmm12") // xmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15" + ); + } + + } /* namespace avx2 */ +} /* namespace lsp */ + + +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_PMATH_LANCZOS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath/sin.h 2025-08-26 18:15:43.730003252 +0000 @@ -0,0 +1,836 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 12 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_PMATH_SIN_H_ +#define PRIVATE_DSP_ARCH_X86_AVX2_PMATH_SIN_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_IMPL */ + +namespace lsp +{ + namespace avx2 + { + IF_ARCH_X86( + static const float kp_gen_const[] __lsp_aligned32 = + { + 0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, // +0x00: Initial values + 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, // +0x20: Initial values + LSP_DSP_VEC8(16.0), // +0x40: Step x16 + LSP_DSP_VEC8(8.0), // +0x60: Step x8 + LSP_DSP_VEC4(4.0), // +0x80: Step x4 + }; + ) + + IF_ARCH_X86( + static const uint32_t sinf_const[] __lsp_aligned32 = + { + LSP_DSP_VEC8(0x3fc90fdb), // +0x000: PI/2 + LSP_DSP_VEC8(0x40490fdb), // +0x020: PI + LSP_DSP_VEC8(0x3e22f983), // +0x040: 1/(2*PI) + LSP_DSP_VEC8(0x40c90fdb), // +0x060: 2*PI + LSP_DSP_VEC8(0x4096cbe4), // +0x080: 3*PI/2 + LSP_DSP_VEC8(0xb2d7322b), // +0x0a0: C0 = -1/11! = -2.50521083854e-08 + LSP_DSP_VEC8(0x3638ef1d), // +0x0c0: C1 = 1/9! = 2.7557319224e-06 + LSP_DSP_VEC8(0xb9500d01), // +0x0e0: C2 = -1/7! = -0.000198412698413 + LSP_DSP_VEC8(0x3c088889), // +0x100: C3 = 1/5! = 0.00833333333333 + LSP_DSP_VEC8(0xbe2aaaab), // +0x120: C4 = -1/3! = -0.166666666667 + LSP_DSP_VEC8(0x3f800000), // +0x140: 1.0 + }; + ) + + #define SINF_X_PLUS_PI_2_CORE_X16 \ + /* ymm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%ymm0, %%ymm1") /* ymm1 = X / (2*PI) */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%ymm4, %%ymm5") \ + __ASM_EMIT("vpsrad $31, %%ymm0, %%ymm3") /* ymm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vpsrad $31, %%ymm4, %%ymm7") \ + __ASM_EMIT("vcvttps2dq %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vcvttps2dq %%ymm5, %%ymm5") \ + __ASM_EMIT("vpaddd %%ymm3, %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vpaddd %%ymm7, %%ymm5, %%ymm5") \ + __ASM_EMIT("vcvtdq2ps %%ymm1, %%ymm1") /* ymm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%ymm5, %%ymm5") \ + __ASM_EMIT("vmulps 0x060 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = period * 2 * PI */ \ + __ASM_EMIT("vmulps 0x060 + %[S2C], %%ymm5, %%ymm5") \ + __ASM_EMIT("vsubps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vsubps %%ymm5, %%ymm4, %%ymm4") \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%ymm1") /* ymm1 = 3*PI/2 */ \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%ymm5") \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%ymm0, %%ymm2") /* ymm2 = [ Y < PI ] */ \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%ymm4, %%ymm6") \ + __ASM_EMIT("vsubps %%ymm0, %%ymm1, %%ymm1") /* ymm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps %%ymm4, %%ymm5, %%ymm5") \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = Y - PI/2 */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm4, %%ymm4") \ + __ASM_EMIT("vblendvps %%ymm2, %%ymm0, %%ymm1, %%ymm0") /* ymm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("vblendvps %%ymm6, %%ymm4, %%ymm5, %%ymm4") \ + /* ymm0 = XX */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm0, %%ymm2") /* ymm2 = X2 = XX*XX */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm4, %%ymm6") \ + __ASM_EMIT("vmulps 0x0a0 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = X2*C0 */ \ + __ASM_EMIT("vmulps 0x0a0 + %[S2C], %%ymm6, %%ymm5") \ + __ASM_EMIT("vaddps 0x0c0 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vaddps 0x0c0 + %[S2C], %%ymm5, %%ymm5") \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vmulps %%ymm6, %%ymm5, %%ymm5") \ + __ASM_EMIT("vaddps 0x0e0 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vaddps 0x0e0 + %[S2C], %%ymm5, %%ymm5") \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vmulps %%ymm6, %%ymm5, %%ymm5") \ + __ASM_EMIT("vaddps 0x100 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vaddps 0x100 + %[S2C], %%ymm5, %%ymm5") \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vmulps %%ymm6, %%ymm5, %%ymm5") \ + __ASM_EMIT("vaddps 0x120 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vaddps 0x120 + %[S2C], %%ymm5, %%ymm5") \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%ymm6, %%ymm5, %%ymm5") \ + __ASM_EMIT("vaddps 0x140 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vaddps 0x140 + %[S2C], %%ymm5, %%ymm5") \ + __ASM_EMIT("vmulps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("vmulps %%ymm5, %%ymm4, %%ymm4") + + #define SINF_X_PLUS_PI_2_CORE_X8 \ + /* ymm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%ymm0, %%ymm1") /* ymm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%ymm0, %%ymm3") /* ymm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%ymm3, %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%ymm1, %%ymm1") /* ymm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vmulps 0x060 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = period * 2 * PI */ \ + __ASM_EMIT("vsubps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%ymm1") /* ymm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%ymm0, %%ymm2") /* ymm2 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps %%ymm0, %%ymm1, %%ymm1") /* ymm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = Y - PI/2 */ \ + __ASM_EMIT("vblendvps %%ymm2, %%ymm0, %%ymm1, %%ymm0") /* ymm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* ymm0 = XX */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm0, %%ymm2") /* ymm2 = X2 = XX*XX */ \ + __ASM_EMIT("vmulps 0x0a0 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = X2*C0 */ \ + __ASM_EMIT("vaddps 0x0c0 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vaddps 0x0e0 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vaddps 0x100 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vaddps 0x120 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vmulps %%ymm2, %%ymm1, %%ymm1") /* ymm1 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vaddps 0x140 + %[S2C], %%ymm1, %%ymm1") /* ymm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + #define SINF_X_PLUS_PI_2_CORE_X4 \ + /* xmm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%xmm0, %%xmm1") /* xmm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%xmm0, %%xmm3") /* xmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%xmm3, %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%xmm1, %%xmm1") /* xmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vmulps 0x060 + %[S2C], %%xmm1, %%xmm1") /* xmm1 = period * 2 * PI */ \ + __ASM_EMIT("vsubps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%xmm1") /* xmm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%xmm0, %%xmm2") /* xmm2 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm1") /* xmm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%xmm0, %%xmm0") /* xmm0 = Y - PI/2 */ \ + __ASM_EMIT("vblendvps %%xmm2, %%xmm0, %%xmm1, %%xmm0") /* xmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* xmm0 = XX */ \ + __ASM_EMIT("vmulps %%xmm0, %%xmm0, %%xmm2") /* xmm2 = X2 = XX*XX */ \ + __ASM_EMIT("vmulps 0x0a0 + %[S2C], %%xmm2, %%xmm1") /* xmm2 = X2*C0 */ \ + __ASM_EMIT("vaddps 0x0c0 + %[S2C], %%xmm1, %%xmm1") /* xmm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vmulps %%xmm2, %%xmm1, %%xmm1") /* xmm1 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vaddps 0x0e0 + %[S2C], %%xmm1, %%xmm1") /* xmm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vmulps %%xmm2, %%xmm1, %%xmm1") /* xmm1 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vaddps 0x100 + %[S2C], %%xmm1, %%xmm1") /* xmm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vmulps %%xmm2, %%xmm1, %%xmm1") /* xmm1 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vaddps 0x120 + %[S2C], %%xmm1, %%xmm1") /* xmm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vmulps %%xmm2, %%xmm1, %%xmm1") /* xmm1 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vaddps 0x140 + %[S2C], %%xmm1, %%xmm1") /* xmm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + void sinf1(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = x1 + PI/2 + __ASM_EMIT("vaddps 0x20(%[dst]), %%ymm1, %%ymm4") // ymm4 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void sinf2(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = x1 + PI/2 + __ASM_EMIT("vaddps 0x20(%[src]), %%ymm1, %%ymm4") // ymm4 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[src]") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm6") // ymm6 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm7") // ymm7 = p + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm4") // ymm4 = i = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x60 + %[S2KP], %%ymm5") // ymm5 = step = 8 8 8 8 8 8 8 8 + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm7, %%ymm7") // ymm7 = p+PI/2 p+PI/2 p+PI/2 p+PI/2 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm4, %%ymm6, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps %%ymm5, %%ymm4, %%ymm4") // ymm4 = i + step + __ASM_EMIT("vaddps %%ymm7, %%ymm0, %%ymm0") // ymm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm4, %%xmm4")// xmm4 = i + step + __ASM_EMIT("vaddps %%xmm7, %%xmm0, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps %%xmm7, %%xmm0, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void x64_sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm11") // ymm11 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm12") // ymm12 = p + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm8") // ymm8 = i0 = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x20 + %[S2KP], %%ymm9") // ymm9 = i1 = 8 9 10 11 12 13 14 + __ASM_EMIT("vmovaps 0x40 + %[S2KP], %%ymm10") // ymm10 = step = 16 ... + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm12, %%ymm12") // ymm12 = p+PI/2 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vmulps %%ymm9, %%ymm11, %%ymm4") // ymm4 = k*i1 + __ASM_EMIT("vaddps %%ymm10, %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm10, %%ymm9, %%ymm9") // ymm9 = i1 + step + __ASM_EMIT("vaddps %%ymm12, %%ymm0, %%ymm0") // ymm0 = k*i0 + p + PI/2 + __ASM_EMIT("vaddps %%ymm12, %%ymm4, %%ymm4") // ymm4 = k*i1 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vaddps 0x60 + %[S2KP], %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm12, %%ymm0, %%ymm0") // ymm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm8, %%xmm8") // xmm8 = i0 + step + __ASM_EMIT("vaddps %%xmm12, %%xmm0, %%xmm0") // xmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps %%xmm12, %%xmm0, %%xmm0") // xmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12" + ); + } + + #define SINF_X_PLUS_PI_2_CORE_X16_FMA3 \ + /* ymm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%ymm0, %%ymm1") /* ymm1 = X / (2*PI) */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%ymm4, %%ymm5") \ + __ASM_EMIT("vpsrad $31, %%ymm0, %%ymm3") /* ymm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vpsrad $31, %%ymm4, %%ymm7") \ + __ASM_EMIT("vcvttps2dq %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vcvttps2dq %%ymm5, %%ymm5") \ + __ASM_EMIT("vpaddd %%ymm3, %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vpaddd %%ymm7, %%ymm5, %%ymm5") \ + __ASM_EMIT("vcvtdq2ps %%ymm1, %%ymm1") /* ymm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%ymm5, %%ymm5") \ + __ASM_EMIT("vfnmadd231ps 0x060 + %[S2C], %%ymm1, %%ymm0") /* ymm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vfnmadd231ps 0x060 + %[S2C], %%ymm5, %%ymm4") \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%ymm1") /* ymm1 = 3*PI/2 */ \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%ymm5") \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%ymm0, %%ymm2") /* ymm2 = [ Y < PI ] */ \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%ymm4, %%ymm6") \ + __ASM_EMIT("vsubps %%ymm0, %%ymm1, %%ymm1") /* ymm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps %%ymm4, %%ymm5, %%ymm5") \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = Y - PI/2 */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm4, %%ymm4") \ + __ASM_EMIT("vblendvps %%ymm2, %%ymm0, %%ymm1, %%ymm0") /* ymm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("vblendvps %%ymm6, %%ymm4, %%ymm5, %%ymm4") \ + /* ymm0 = XX */ \ + __ASM_EMIT("vmovaps 0x0a0 + %[S2C], %%ymm1") /* ymm3 = C0 */ \ + __ASM_EMIT("vmovaps 0x0a0 + %[S2C], %%ymm5") \ + __ASM_EMIT("vmulps %%ymm0, %%ymm0, %%ymm2") /* ymm2 = X2 = XX*XX */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm4, %%ymm6") \ + __ASM_EMIT("vfmadd213ps 0x0c0 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x0c0 + %[S2C], %%ymm6, %%ymm5") \ + __ASM_EMIT("vfmadd213ps 0x0e0 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x0e0 + %[S2C], %%ymm6, %%ymm5") \ + __ASM_EMIT("vfmadd213ps 0x100 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x100 + %[S2C], %%ymm6, %%ymm5") \ + __ASM_EMIT("vfmadd213ps 0x120 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x120 + %[S2C], %%ymm6, %%ymm5") \ + __ASM_EMIT("vfmadd213ps 0x140 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vfmadd213ps 0x140 + %[S2C], %%ymm6, %%ymm5") \ + __ASM_EMIT("vmulps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("vmulps %%ymm5, %%ymm4, %%ymm4") + + #define SINF_X_PLUS_PI_2_CORE_X8_FMA3 \ + /* ymm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%ymm0, %%ymm1") /* ymm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%ymm0, %%ymm3") /* ymm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%ymm3, %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%ymm1, %%ymm1") /* ymm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vfnmadd231ps 0x060 + %[S2C], %%ymm1, %%ymm0") /* ymm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%ymm1") /* ymm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%ymm0, %%ymm2") /* ymm2 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps %%ymm0, %%ymm1, %%ymm1") /* ymm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = Y - PI/2 */ \ + __ASM_EMIT("vblendvps %%ymm2, %%ymm0, %%ymm1, %%ymm0") /* ymm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* ymm0 = XX */ \ + __ASM_EMIT("vmovaps 0x0a0 + %[S2C], %%ymm1") /* ymm3 = C0 */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm0, %%ymm2") /* ymm2 = X2 = XX*XX */ \ + __ASM_EMIT("vfmadd213ps 0x0c0 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x0e0 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x100 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x120 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x140 + %[S2C], %%ymm2, %%ymm1") /* ymm2 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + #define SINF_X_PLUS_PI_2_CORE_X4_FMA3 \ + /* xmm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x040 + %[S2C], %%xmm0, %%xmm1") /* xmm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%xmm0, %%xmm3") /* xmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%xmm3, %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%xmm1, %%xmm1") /* xmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vfnmadd231ps 0x060 + %[S2C], %%xmm1, %%xmm0") /* xmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x080 + %[S2C], %%xmm1") /* xmm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x020 + %[S2C], %%xmm0, %%xmm2") /* xmm2 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm1") /* xmm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%xmm0, %%xmm0") /* xmm0 = Y - PI/2 */ \ + __ASM_EMIT("vblendvps %%xmm2, %%xmm0, %%xmm1, %%xmm0") /* xmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* xmm0 = XX */ \ + __ASM_EMIT("vmovaps 0x0a0 + %[S2C], %%xmm1") /* xmm3 = C0 */ \ + __ASM_EMIT("vmulps %%xmm0, %%xmm0, %%xmm2") /* xmm2 = X2 = XX*XX */ \ + __ASM_EMIT("vfmadd213ps 0x0c0 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x0e0 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x100 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x120 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x140 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + void sinf1_fma3(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = x1 + PI/2 + __ASM_EMIT("vaddps 0x20(%[dst]), %%ymm1, %%ymm4") // ymm4 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void sinf2_fma3(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = x1 + PI/2 + __ASM_EMIT("vaddps 0x20(%[src]), %%ymm1, %%ymm4") // ymm4 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[src]") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 14f") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("10:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("12:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + __ASM_EMIT("14:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void sinf_kp1_fma3(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm6") // ymm6 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm7") // ymm7 = p + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm4") // ymm4 = i = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x60 + %[S2KP], %%ymm5") // ymm5 = step = 8 8 8 8 8 8 8 8 + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm7, %%ymm7") // ymm7 = p+PI/2 p+PI/2 p+PI/2 p+PI/2 + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm4, %%ymm6, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps %%ymm5, %%ymm4, %%ymm4") // ymm4 = i + step + __ASM_EMIT("vaddps %%ymm7, %%ymm0, %%ymm0") // ymm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm4, %%xmm4")// xmm4 = i + step + __ASM_EMIT("vaddps %%xmm7, %%xmm0, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 8f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps %%xmm7, %%xmm0, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("8:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void x64_sinf_kp1_fma3(float *dst, float k, float p, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%ymm11") // ymm11 = k + __ASM_EMIT("vbroadcastss %[p], %%ymm12") // ymm12 = p + __ASM_EMIT("vmovaps 0x00 + %[S2KP], %%ymm8") // ymm8 = i0 = 0 1 2 3 4 5 6 7 + __ASM_EMIT("vmovaps 0x20 + %[S2KP], %%ymm9") // ymm9 = i1 = 8 9 10 11 12 13 14 + __ASM_EMIT("vmovaps 0x40 + %[S2KP], %%ymm10") // ymm10 = step = 16 ... + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm12, %%ymm12") // ymm12 = p+PI/2 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vmulps %%ymm9, %%ymm11, %%ymm4") // ymm4 = k*i1 + __ASM_EMIT("vaddps %%ymm10, %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm10, %%ymm9, %%ymm9") // ymm9 = i1 + step + __ASM_EMIT("vaddps %%ymm12, %%ymm0, %%ymm0") // ymm0 = k*i0 + p + PI/2 + __ASM_EMIT("vaddps %%ymm12, %%ymm4, %%ymm4") // ymm4 = k*i1 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X16_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%ymm4, 0x20(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vaddps 0x60 + %[S2KP], %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm12, %%ymm0, %%ymm0") // ymm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8_FMA3 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps 0x80 + %[S2KP], %%xmm8, %%xmm8") // xmm8 = i0 + step + __ASM_EMIT("vaddps %%xmm12, %%xmm0, %%xmm0") // xmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps %%xmm12, %%xmm0, %%xmm0") // xmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4_FMA3 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12" + ); + } + + } /* namespace avx2 */ +} /* namespace lsp */ + +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_PMATH_SIN_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx2/pmath.h 2025-08-26 18:15:43.726003291 +0000 @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 12 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_PMATH_H_ +#define PRIVATE_DSP_ARCH_X86_AVX2_PMATH_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_IMPL */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* PRIVATE_DSP_ARCH_X86_AVX2_PMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/cos.h 2025-08-26 18:15:43.734003213 +0000 @@ -0,0 +1,381 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef INCLUDE_PRIVATE_DSP_ARCH_X86_AVX512_PMATH_COS_H_ +#define INCLUDE_PRIVATE_DSP_ARCH_X86_AVX512_PMATH_COS_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX512_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX512_IMPL */ + +#include + +namespace lsp +{ + namespace avx512 + { + void cosf1(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x32 blocks + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%zmm1") // zmm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%zmm1, %%zmm0") // zmm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsubps 0x40(%[dst]), %%zmm1, %%zmm4") // zmm4 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X32 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%zmm4, 0x40(%[dst])") + __ASM_EMIT("add $0x80, %[dst]") + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x16 blocks + __ASM_EMIT("add $16, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%zmm1") // zmm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%zmm1, %%zmm0") // zmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("4:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("6:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 8f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("vsubps 0x00(%[dst]), %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("8:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 16f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("12:") + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("14:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 16f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("16:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + void cosf2(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x32 blocks + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%zmm1") // zmm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%zmm1, %%zmm0") // zmm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("vsubps 0x40(%[src]), %%zmm1, %%zmm4") // zmm4 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X32 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%zmm4, 0x40(%[dst])") + __ASM_EMIT("add $0x80, %[src]") + __ASM_EMIT("add $0x80, %[dst]") + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x16 block + __ASM_EMIT("add $16, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%zmm1") // zmm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%zmm1, %%zmm0") // zmm0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[src]") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("4:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%ymm1") // ymm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("6:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 8f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%xmm1") // xmm1 = PI + __ASM_EMIT("vsubps 0x00(%[src]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("8:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 16f") + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("12:") + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("14:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 16f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("16:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + void cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%zmm6") // zmm6 = k + __ASM_EMIT("vbroadcastss %[p], %%zmm7") // zmm7 = p + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%zmm0") // zmm0 = PI + __ASM_EMIT("vmovaps 0x000 + %[S2KP], %%zmm4") // zmm4 = i = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + __ASM_EMIT("vmovaps 0x0c0 + %[S2KP], %%zmm5") // zmm5 = step = 16 ... + __ASM_EMIT("vsubps %%zmm7, %%zmm0, %%zmm7") // zmm7 = PI/2 - p + PI/2 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%zmm4, %%zmm6, %%zmm0") // zmm0 = k*i + __ASM_EMIT("vaddps %%zmm5, %%zmm4, %%zmm4") // zmm4 = i + step + __ASM_EMIT("vsubps %%zmm0, %%zmm7, %%zmm0") // zmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 blocks + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm4, %%ymm6, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps 0x100 + %[S2KP], %%ymm4, %%ymm4") // ymm4 = i + step + __ASM_EMIT("vsubps %%ymm0, %%ymm7, %%ymm0") // ymm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x120 + %[S2KP], %%xmm4, %%xmm4") // xmm4 = i + step + __ASM_EMIT("vsubps %%xmm0, %%xmm7, %%xmm0") // xmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vsubps %%xmm0, %%xmm7, %%xmm0") // xmm0 = PI/2 - (k*i + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + void x64_cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%zmm11") // zmm11 = k + __ASM_EMIT("vbroadcastss %[p], %%zmm12") // zmm12 = p + __ASM_EMIT("vmovaps 0x040 + %[S2C], %%zmm0") // zmm0 = PI + __ASM_EMIT("vmovaps 0x000 + %[S2KP], %%zmm8") // zmm8 = i0 = 0 1 2 3 ... + __ASM_EMIT("vmovaps 0x040 + %[S2KP], %%zmm9") // zmm9 = i1 = 16 17 18 19 ... + __ASM_EMIT("vmovaps 0x080 + %[S2KP], %%zmm10") // zmm10 = step = 32 ... + __ASM_EMIT("vsubps %%zmm12, %%zmm0, %%zmm12") // zmm12 = PI/2 - p + PI/2 ... + // x32 blocks + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%zmm8, %%zmm11, %%zmm0") // zmm0 = k*i0 + __ASM_EMIT("vmulps %%zmm9, %%zmm11, %%zmm4") // zmm4 = k*i1 + __ASM_EMIT("vaddps %%zmm10, %%zmm8, %%zmm8") // zmm8 = i0 + step + __ASM_EMIT("vaddps %%zmm10, %%zmm9, %%zmm9") // zmm9 = i1 + step + __ASM_EMIT("vsubps %%zmm0, %%zmm12, %%zmm0") // zmm0 = PI/2 - (k*i0 + p) + PI/2 + __ASM_EMIT("vsubps %%zmm4, %%zmm12, %%zmm4") // zmm4 = PI/2 - (k*i1 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X32 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%zmm4, 0x40(%[dst])") + __ASM_EMIT("add $0x80, %[dst]") + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x16 blocks + __ASM_EMIT("add $16, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%zmm8, %%zmm11, %%zmm0") // zmm0 = k*i0 + __ASM_EMIT("vaddps 0x0c0 + %[S2KP], %%zmm8, %%zmm8") // zmm8 = i0 + step + __ASM_EMIT("vsubps %%zmm0, %%zmm12, %%zmm0") // zmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("4:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vaddps 0x100 + %[S2KP], %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vsubps %%ymm0, %%ymm12, %%ymm0") // ymm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("6:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 8f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps 0x120 + %[S2KP], %%xmm8, %%xmm8") // xmm8 = i0 + step + __ASM_EMIT("vsubps %%xmm0, %%xmm12, %%xmm0") // xmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("8:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 12f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vsubps %%xmm0, %%xmm12, %%xmm0") // xmm0 = PI/2 - (k*i0 + p) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", + "%k1", "%k2" + ); + } + + } /* namespace avx512 */ +} /* namespace lsp */ + + + + +#endif /* INCLUDE_PRIVATE_DSP_ARCH_X86_AVX512_PMATH_COS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/lanczos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/lanczos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/lanczos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/lanczos.h 2025-08-26 18:15:43.734003213 +0000 @@ -0,0 +1,351 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 18 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX512_PMATH_LANCZOS_H_ +#define PRIVATE_DSP_ARCH_X86_AVX512_PMATH_LANCZOS_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX512_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX512_IMPL */ + +#include + +namespace lsp +{ + namespace avx512 + { + IF_ARCH_X86( + static const uint32_t lanczos_const[] __lsp_aligned64 = + { + LSP_DSP_VEC16(0x7fffffff), // +0x00: Mask for fabsf + LSP_DSP_VEC16(0x38d1b717), // +0x40: Sinc threshold = 1e-4 + LSP_DSP_VEC16(0x3f800000), // +0x80: 1.0 + }; + ) + + typedef struct lanczos_gen_t + { + float k[16]; // +0x000: Multiplier + float p[16]; // +0x040: Initial phase + float a[16]; // +0x080: Number of lobes + float i[16]; // +0x0c0: Indices + float x1[16]; // +0x100: Computed X1 + float d[16]; // +0x140: Denominator + float t[16]; // +0x180: Time range + } lanczos_gen_t; + + #define LANCZOS_GEN_FUNC_X16 \ + /* zmm0 = x1 */ \ + __ASM_EMIT("vmulps 0x080 + %[state], %%zmm0, %%zmm4") /* zmm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%zmm0, 0x100 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%zmm0, %%zmm4, %%zmm2") /* zmm2 = d = x1 * x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%zmm0, %%zmm0") /* zmm0 = x1 + PI/2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%zmm4, %%zmm4") /* zmm4 = x2 + PI/2 */ \ + __ASM_EMIT("vmovaps %%zmm2, 0x140 + %[state]") /* *d = d */ \ + SINF_X_PLUS_PI_2_CORE_X32 /* zmm0 = sinf(x1), zmm4 = sinf(x2) */ \ + __ASM_EMIT("vmovaps 0x100 + %[state], %%zmm1") /* zmm1 = x1 */ \ + __ASM_EMIT("vmulps %%zmm4, %%zmm0, %%zmm0") /* zmm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%zmm1, %%zmm1") /* zmm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0x140 + %[state], %%zmm0, %%zmm0") /* zmm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x40 + %[LC], %%zmm1, %%k1") /* k1 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $5, 0x180 + %[state], %%zmm1, %%k2") /* k2 = [ fabsf(x) >= t ] */ \ + __ASM_EMIT("vmovaps 0x80 + %[LC], %%zmm0 %{%%k1%}") /* zmm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vxorps %%zmm0, %%zmm0, %%zmm0 %{%%k2%}") /* zmm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_FUNC_X8 \ + /* ymm0 = x1 */ \ + __ASM_EMIT("vmulps 0x080 + %[state], %%ymm0, %%ymm4") /* ymm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%ymm0, 0x100 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm4, %%ymm2") /* ymm2 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf64x4 $1, %%ymm4, %%zmm0, %%zmm0") /* zmm0 = x1 ... x2 ... */ \ + __ASM_EMIT("vmovaps %%ymm2, 0x140 + %[state]") /* *d = d */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%zmm0, %%zmm0") /* zmm0 = x1 + PI/2 ... x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X16 /* ymm0 = sinf(x1), ymm4 = sinf(x2) */ \ + __ASM_EMIT("vextractf64x4 $1, %%zmm0, %%ymm4") /* ymm4 = sinf(x2) */ \ + __ASM_EMIT("vmovaps 0x100 + %[state], %%ymm1") /* ymm1 = x1 */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm1, %%ymm1") /* ymm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0x140 + %[state], %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x40 + %[LC], %%ymm1, %%ymm2") /* ymm2 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, 0x180 + %[state], %%ymm1, %%ymm1") /* ymm1 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x80 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_FUNC_X4 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("vmulps 0x080 + %[state], %%xmm0, %%xmm4") /* xmm4 = x2 = x1*a */ \ + __ASM_EMIT("vmovaps %%xmm0, 0x100 + %[state]") /* *x1 = x1 */ \ + __ASM_EMIT("vmulps %%xmm0, %%xmm4, %%xmm2") /* xmm2 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf128 $1, %%xmm4, %%ymm0, %%ymm0") /* ymm0 = x1 x1 x1 x1 x2 x2 x2 x2 */ \ + __ASM_EMIT("vmovaps %%xmm2, 0x140 + %[state]") /* *d = d */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* xmm0 = x1 + PI/2 ... x2 + PI/2 ... */ \ + SINF_X_PLUS_PI_2_CORE_X8 /* ymm0 = sinf(x1) ... sinf(x2) ... */ \ + __ASM_EMIT("vextractf128 $1, %%ymm0, %%xmm4") /* xmm4 = sinf(x2) */ \ + __ASM_EMIT("vmovaps 0x100 + %[state], %%xmm1") /* xmm1 = x1 */ \ + __ASM_EMIT("vmulps %%xmm4, %%xmm0, %%xmm0") /* xmm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%xmm1, %%xmm1") /* xmm1 = fabsf(x) */ \ + __ASM_EMIT("vdivps 0x140 + %[state], %%xmm0, %%xmm0") /* xmm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x40 + %[LC], %%xmm1, %%xmm2") /* xmm2 = [ fabsf(x) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, 0x180 + %[state], %%xmm1, %%xmm1") /* xmm1 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("vblendvps %%xmm2, 0x80 + %[LC], %%xmm0, %%xmm0") /* xmm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + IF_ARCH_X86( + lanczos_gen_t state __lsp_aligned64; + float stub[16] __lsp_aligned64; + ); + + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%zmm4") // zmm4 = k + __ASM_EMIT("vbroadcastss %[p], %%zmm5") // zmm5 = p + __ASM_EMIT("vbroadcastss %[a], %%zmm6") // zmm6 = a + __ASM_EMIT("vbroadcastss %[t], %%zmm7") // zmm7 = t + __ASM_EMIT("vmovaps %%zmm4, 0x000 + %[state]") + __ASM_EMIT("vmovaps %%zmm5, 0x040 + %[state]") + __ASM_EMIT("vmovaps %%zmm6, 0x080 + %[state]") + __ASM_EMIT("vmovaps %%zmm7, 0x180 + %[state]") + __ASM_EMIT("vmovaps 0x00 + %[LGEN], %%zmm1") // zmm1 = i = 0 1 2 3 4 5 6 7 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps 0x000 + %[state], %%zmm1, %%zmm0") // zmm0 = k*i + __ASM_EMIT("vaddps 0x0c0 + %[LGEN], %%zmm1, %%zmm1") // zmm1 = i' = i + step + __ASM_EMIT("vsubps 0x040 + %[state], %%zmm0, %%zmm0") // zmm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%zmm1, 0x0c0 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X16 + __ASM_EMIT("vmovaps 0x0c0 + %[state], %%zmm1") // zmm1 = i' + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 blocks + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps 0x000 + %[state], %%ymm1, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps 0x100 + %[LGEN], %%ymm1, %%ymm1") // ymm1 = i' = i + step + __ASM_EMIT("vsubps 0x040 + %[state], %%ymm0, %%ymm0") // ymm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%ymm1, 0x0c0 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X8 + __ASM_EMIT("vmovaps 0x0c0 + %[state], %%ymm1") // ymm1 = i' + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps 0x000 + %[state], %%xmm1, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x120 + %[LGEN], %%xmm1, %%xmm1") // xmm1 = i' = i + step + __ASM_EMIT("vsubps 0x040 + %[state], %%xmm0, %%xmm0") // xmm0 = x1 = k*i - p + __ASM_EMIT("vmovaps %%xmm1, 0x0c0 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("vmovaps 0x0c0 + %[state], %%xmm1") // xmm1 = i' + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps 0x000 + %[state], %%xmm1, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vsubps 0x040 + %[state], %%xmm0, %%xmm0") // xmm0 = x1 = k*i - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [state] "o" (state), + [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [stub] "o" (stub), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + #define LANCZOS_GEN_X64_FUNC_X16 \ + /* zmm8 = k */ \ + /* zmm9 = p */ \ + /* zmm10 = t */ \ + /* zmm11 = a */ \ + /* zmm12 = x1 */ \ + /* zmm13 = d */ \ + /* zmm14 = i */ \ + /* zmm15 = step */ \ + __ASM_EMIT("vmulps %%zmm11, %%zmm12, %%zmm4") /* zmm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%zmm12, %%zmm4, %%zmm13") /* zmm13 = d = x1 * x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%zmm12, %%zmm0") /* zmm0 = x1 + PI/2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%zmm4, %%zmm4") /* zmm4 = x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X32 /* zmm0 = sinf(x1), zmm4 = sinf(x2) */ \ + __ASM_EMIT("vmulps %%zmm4, %%zmm0, %%zmm0") /* zmm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%zmm12, %%zmm12") /* zmm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%zmm13, %%zmm0, %%zmm0") /* zmm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x40 + %[LC], %%zmm12, %%k1") /* k1 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $5, %%zmm10, %%zmm1, %%k2") /* k2 = [ fabsf(x1) >= t ] */ \ + __ASM_EMIT("vmovaps 0x80 + %[LC], %%zmm0 %{%%k1%}") /* zmm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vxorps %%zmm0, %%zmm0, %%zmm0 %{%%k2%}") /* zmm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_X64_FUNC_X8 \ + /* ymm8 = k */ \ + /* ymm9 = p */ \ + /* ymm10 = t */ \ + /* ymm11 = a */ \ + /* ymm12 = x1 */ \ + /* ymm13 = d */ \ + /* ymm14 = i */ \ + /* ymm15 = step */ \ + __ASM_EMIT("vmulps %%ymm11, %%ymm12, %%ymm4") /* ymm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%ymm12, %%ymm4, %%ymm13") /* ymm13 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf64x4 $1, %%ymm4, %%zmm12, %%zmm0") /* zmm0 = x1 ... x2 ... */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%zmm0, %%zmm0") /* zmm0 = x1 + PI/2 ... x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X16 /* ymm0 = sinf(x1), ymm4 = sinf(x2) */ \ + __ASM_EMIT("vextractf64x4 $1, %%zmm0, %%ymm4") /* ymm4 = sinf(x2) */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm12, %%ymm12") /* ymm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%ymm13, %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x40 + %[LC], %%ymm12, %%ymm2") /* ymm2 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, %%ymm10, %%ymm12, %%ymm1") /* ymm1 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x80 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + #define LANCZOS_GEN_X64_FUNC_X4 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("vmulps %%xmm11, %%xmm12, %%xmm4") /* xmm12 = x2 = x1*a */ \ + __ASM_EMIT("vmulps %%xmm12, %%xmm4, %%xmm13") /* xmm13 = d = x1 * x2 */ \ + __ASM_EMIT("vinsertf128 $1, %%xmm4, %%ymm12, %%ymm0") /* ymm0 = x1 x1 x1 x1 x2 x2 x2 x2 */ \ + __ASM_EMIT("vaddps 0x00 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = x1 + PI/2 ... x2 + PI/2 */ \ + SINF_X_PLUS_PI_2_CORE_X8 /* ymm0 = sinf(x1) ... sinf(x2) */ \ + __ASM_EMIT("vextractf128 $1, %%ymm0, %%xmm4") /* xmm4 = sif(x2) */ \ + __ASM_EMIT("vmulps %%ymm4, %%ymm0, %%ymm0") /* ymm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("vandps 0x00 + %[LC], %%ymm12, %%ymm12") /* ymm12 = fabsf(x1) */ \ + __ASM_EMIT("vdivps %%ymm13, %%ymm0, %%ymm0") /* ymm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("vcmpps $1, 0x40 + %[LC], %%ymm12, %%ymm2") /* ymm2 = [ fabsf(x1) < 1e-4 ] */ \ + __ASM_EMIT("vcmpps $1, %%ymm10, %%ymm12, %%ymm1") /* ymm1 = [ fabsf(x1) < t ] */ \ + __ASM_EMIT("vblendvps %%ymm2, 0x80 + %[LC], %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("vandps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = [ fabsf(x1) < t ] ? ([ fabsf(x1) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void x64_lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%zmm8") // zmm8 = k + __ASM_EMIT("vbroadcastss %[p], %%zmm9") // zmm9 = p + __ASM_EMIT("vbroadcastss %[t], %%zmm10") // zmm10 = t + __ASM_EMIT("vbroadcastss %[a], %%zmm11") // zmm11 = a + __ASM_EMIT("vmovaps 0x00 + %[LGEN], %%zmm14") // zmm14 = i = 0 1 2 3 4 5 6 7 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("vmovaps 0xc0 + %[LGEN], %%zmm15") // zmm15 = step + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%zmm8, %%zmm14, %%zmm12") // zmm12 = k*i + __ASM_EMIT("vaddps %%zmm15, %%zmm14, %%zmm14") // zmm14 = i' = i + step + __ASM_EMIT("vsubps %%zmm9, %%zmm12, %%zmm12") // zmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 blocks + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm8, %%ymm14, %%ymm12") // ymm12 = k*i + __ASM_EMIT("vaddps 0x100 + %[LGEN], %%ymm14, %%ymm14") // ymm14 = i' = i + step + __ASM_EMIT("vsubps %%ymm9, %%ymm12, %%ymm12") // ymm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm8, %%xmm14, %%xmm12") // xmm12 = k*i + __ASM_EMIT("vaddps 0x120 + %[LGEN], %%xmm14, %%xmm14") // xmm14 = i' = i + step + __ASM_EMIT("vsubps %%xmm9, %%xmm12, %%xmm12") // xmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm8, %%xmm14, %%xmm12") // xmm12 = k*i + __ASM_EMIT("vsubps %%xmm9, %%xmm12, %%xmm12") // xmm12 = x1 = k*i - p + LANCZOS_GEN_X64_FUNC_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", "%xmm13", "%xmm14", "%xmm15" + ); + } + + } /* namespace avx512 */ +} /* namespace lsp */ + + + + +#endif /* PRIVATE_DSP_ARCH_X86_AVX512_PMATH_LANCZOS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath/sin.h 2025-08-26 18:15:43.738003175 +0000 @@ -0,0 +1,516 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 12 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX512_PMATH_SIN_H_ +#define PRIVATE_DSP_ARCH_X86_AVX512_PMATH_SIN_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_AVX512_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_AVX512_IMPL */ + +namespace lsp +{ + namespace avx512 + { + IF_ARCH_X86( + static const float kp_gen_const[] __lsp_aligned64 = + { + 0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, // +0x000: Initial values register 1 + 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, + 16.0f, 17.0f, 18.0f, 19.0f, 20.0f, 21.0f, 22.0f, 23.0f, // +0x040: Initial values register 2 + 24.0f, 25.0f, 26.0f, 27.0f, 28.0f, 29.0f, 30.0f, 31.0f, + LSP_DSP_VEC16(32.0), // +0x080: Step x32 + LSP_DSP_VEC16(16.0), // +0x0c0: Step x16 + LSP_DSP_VEC8(8.0), // +0x100: Step x8 + LSP_DSP_VEC4(4.0), // +0x120: Step x4 + }; + ) + + IF_ARCH_X86( + static const uint32_t sinf_const[] __lsp_aligned64 = + { + LSP_DSP_VEC16(0x3fc90fdb), // +0x000: PI/2 + LSP_DSP_VEC16(0x40490fdb), // +0x040: PI + LSP_DSP_VEC16(0x3e22f983), // +0x080: 1/(2*PI) + LSP_DSP_VEC16(0x40c90fdb), // +0x0c0: 2*PI + LSP_DSP_VEC16(0x4096cbe4), // +0x100: 3*PI/2 + LSP_DSP_VEC16(0xb2d7322b), // +0x140: C0 = -1/11! = -2.50521083854e-08 + LSP_DSP_VEC16(0x3638ef1d), // +0x180: C1 = 1/9! = 2.7557319224e-06 + LSP_DSP_VEC16(0xb9500d01), // +0x1c0: C2 = -1/7! = -0.000198412698413 + LSP_DSP_VEC16(0x3c088889), // +0x200: C3 = 1/5! = 0.00833333333333 + LSP_DSP_VEC16(0xbe2aaaab), // +0x240: C4 = -1/3! = -0.166666666667 + LSP_DSP_VEC16(0x3f800000), // +0x280: 1.0 + }; + ) + + #define SINF_X_PLUS_PI_2_CORE_X32 \ + /* zmm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x080 + %[S2C], %%zmm0, %%zmm1") /* zmm1 = X / (2*PI) */ \ + __ASM_EMIT("vmulps 0x080 + %[S2C], %%zmm4, %%zmm5") \ + __ASM_EMIT("vpsrad $31, %%zmm0, %%zmm3") /* zmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vpsrad $31, %%zmm4, %%zmm7") \ + __ASM_EMIT("vcvttps2dq %%zmm1, %%zmm1") /* zmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vcvttps2dq %%zmm5, %%zmm5") \ + __ASM_EMIT("vpaddd %%zmm3, %%zmm1, %%zmm1") /* zmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vpaddd %%zmm7, %%zmm5, %%zmm5") \ + __ASM_EMIT("vcvtdq2ps %%zmm1, %%zmm1") /* zmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%zmm5, %%zmm5") \ + __ASM_EMIT("vfnmadd231ps 0x0c0 + %[S2C], %%zmm1, %%zmm0") /* zmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vfnmadd231ps 0x0c0 + %[S2C], %%zmm5, %%zmm4") \ + __ASM_EMIT("vmovaps 0x100 + %[S2C], %%zmm1") /* zmm1 = 3*PI/2 */ \ + __ASM_EMIT("vmovaps 0x100 + %[S2C], %%zmm5") \ + __ASM_EMIT("vcmpps $1, 0x040 + %[S2C], %%zmm0, %%k1") /* k1 = [ Y < PI ] */ \ + __ASM_EMIT("vcmpps $1, 0x040 + %[S2C], %%zmm4, %%k2") \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%zmm0, %%zmm2") /* zmm2 = Y - PI/2 */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%zmm4, %%zmm6") \ + __ASM_EMIT("vsubps %%zmm0, %%zmm1, %%zmm0") /* zmm0 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps %%zmm4, %%zmm5, %%zmm4") \ + __ASM_EMIT("vmovaps %%zmm2, %%zmm0 %{%%k1%}") /* zmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("vmovaps %%zmm6, %%zmm4 %{%%k2%}") \ + /* zmm0 = XX */ \ + __ASM_EMIT("vmovaps 0x140 + %[S2C], %%zmm1") /* zmm3 = C0 */ \ + __ASM_EMIT("vmovaps 0x140 + %[S2C], %%zmm5") \ + __ASM_EMIT("vmulps %%zmm0, %%zmm0, %%zmm2") /* zmm2 = X2 = XX*XX */ \ + __ASM_EMIT("vmulps %%zmm4, %%zmm4, %%zmm6") \ + __ASM_EMIT("vfmadd213ps 0x180 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x180 + %[S2C], %%zmm6, %%zmm5") \ + __ASM_EMIT("vfmadd213ps 0x1c0 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x1c0 + %[S2C], %%zmm6, %%zmm5") \ + __ASM_EMIT("vfmadd213ps 0x200 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x200 + %[S2C], %%zmm6, %%zmm5") \ + __ASM_EMIT("vfmadd213ps 0x240 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x240 + %[S2C], %%zmm6, %%zmm5") \ + __ASM_EMIT("vfmadd213ps 0x280 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vfmadd213ps 0x280 + %[S2C], %%zmm6, %%zmm5") \ + __ASM_EMIT("vmulps %%zmm1, %%zmm0, %%zmm0") /* zmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("vmulps %%zmm5, %%zmm4, %%zmm4") + + #define SINF_X_PLUS_PI_2_CORE_X16 \ + /* zmm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x080 + %[S2C], %%zmm0, %%zmm1") /* zmm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%zmm0, %%zmm3") /* zmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%zmm1, %%zmm1") /* zmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%zmm3, %%zmm1, %%zmm1") /* zmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%zmm1, %%zmm1") /* zmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vfnmadd231ps 0x0c0 + %[S2C], %%zmm1, %%zmm0") /* zmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x100 + %[S2C], %%zmm1") /* zmm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x040 + %[S2C], %%zmm0, %%k1") /* k1 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%zmm0, %%zmm2") /* zmm2 = Y - PI/2 */ \ + __ASM_EMIT("vsubps %%zmm0, %%zmm1, %%zmm0") /* zmm0 = 3*PI/2 - Y */ \ + __ASM_EMIT("vmovaps %%zmm2, %%zmm0 %{%%k1%}") /* zmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* zmm0 = XX */ \ + __ASM_EMIT("vmovaps 0x140 + %[S2C], %%zmm1") /* zmm3 = C0 */ \ + __ASM_EMIT("vmulps %%zmm0, %%zmm0, %%zmm2") /* zmm2 = X2 = XX*XX */ \ + __ASM_EMIT("vfmadd213ps 0x180 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x1c0 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x200 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x240 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x280 + %[S2C], %%zmm2, %%zmm1") /* zmm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%zmm1, %%zmm0, %%zmm0") /* zmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + #define SINF_X_PLUS_PI_2_CORE_X8 \ + /* ymm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x080 + %[S2C], %%ymm0, %%ymm1") /* ymm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%ymm0, %%ymm3") /* ymm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%ymm3, %%ymm1, %%ymm1") /* ymm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%ymm1, %%ymm1") /* ymm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vfnmadd231ps 0x0c0 + %[S2C], %%ymm1, %%ymm0") /* ymm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x100 + %[S2C], %%ymm1") /* ymm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x040 + %[S2C], %%ymm0, %%ymm2") /* ymm2 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps %%ymm0, %%ymm1, %%ymm1") /* ymm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%ymm0, %%ymm0") /* ymm0 = Y - PI/2 */ \ + __ASM_EMIT("vblendvps %%ymm2, %%ymm0, %%ymm1, %%ymm0") /* ymm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* ymm0 = XX */ \ + __ASM_EMIT("vmovaps 0x140 + %[S2C], %%ymm1") /* ymm3 = C0 */ \ + __ASM_EMIT("vmulps %%ymm0, %%ymm0, %%ymm2") /* ymm2 = X2 = XX*XX */ \ + __ASM_EMIT("vfmadd213ps 0x180 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x1c0 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x200 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x240 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x280 + %[S2C], %%ymm2, %%ymm1") /* ymm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%ymm1, %%ymm0, %%ymm0") /* ymm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + #define SINF_X_PLUS_PI_2_CORE_X4 \ + /* xmm0 = X = x + PI/2 */ \ + __ASM_EMIT("vmulps 0x080 + %[S2C], %%xmm0, %%xmm1") /* xmm1 = X / (2*PI) */ \ + __ASM_EMIT("vpsrad $31, %%xmm0, %%xmm3") /* xmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvttps2dq %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("vpaddd %%xmm3, %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vcvtdq2ps %%xmm1, %%xmm1") /* xmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("vfnmadd231ps 0x0c0 + %[S2C], %%xmm1, %%xmm0") /* xmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("vmovaps 0x100 + %[S2C], %%xmm1") /* xmm1 = 3*PI/2 */ \ + __ASM_EMIT("vcmpps $1, 0x040 + %[S2C], %%xmm0, %%xmm2") /* xmm2 = [ Y < PI ] */ \ + __ASM_EMIT("vsubps %%xmm0, %%xmm1, %%xmm1") /* xmm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("vsubps 0x000 + %[S2C], %%xmm0, %%xmm0") /* xmm0 = Y - PI/2 */ \ + __ASM_EMIT("vblendvps %%xmm2, %%xmm0, %%xmm1, %%xmm0") /* xmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* xmm0 = XX */ \ + __ASM_EMIT("vmovaps 0x140 + %[S2C], %%xmm1") /* xmm3 = C0 */ \ + __ASM_EMIT("vmulps %%xmm0, %%xmm0, %%xmm2") /* xmm2 = X2 = XX*XX */ \ + __ASM_EMIT("vfmadd213ps 0x180 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C1 + X2*C0 */ \ + __ASM_EMIT("vfmadd213ps 0x1c0 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("vfmadd213ps 0x200 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("vfmadd213ps 0x240 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("vfmadd213ps 0x280 + %[S2C], %%xmm2, %%xmm1") /* xmm1 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("vmulps %%xmm1, %%xmm0, %%xmm0") /* xmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + void sinf1(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x32 blocks + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%zmm1") // zmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%zmm1, %%zmm0") // zmm0 = x1 + PI/2 + __ASM_EMIT("vaddps 0x40(%[dst]), %%zmm1, %%zmm4") // zmm4 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X32 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%zmm4, 0x40(%[dst])") + __ASM_EMIT("add $0x80, %[dst]") + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x16 blocks + __ASM_EMIT("add $16, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%zmm1") // zmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%zmm1, %%zmm0") // zmm0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("4:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("6:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 8f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[dst]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("8:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 16f") + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("12:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("14:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 16f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("16:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + void sinf2(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x32 blocks + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%zmm1") // zmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%zmm1, %%zmm0") // zmm0 = x1 + PI/2 + __ASM_EMIT("vaddps 0x40(%[src]), %%zmm1, %%zmm4") // zmm4 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X32 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%zmm4, 0x40(%[dst])") + __ASM_EMIT("add $0x80, %[src]") + __ASM_EMIT("add $0x80, %[dst]") + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x16 block + __ASM_EMIT("add $16, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%zmm1") // zmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%zmm1, %%zmm0") // zmm0 = x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[src]") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("4:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%ymm1") // ymm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%ymm1, %%ymm0") // ymm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("6:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 8f") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps 0x00(%[src]), %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("8:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 16f") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovhps 0x00(%[src]), %%xmm0, %%xmm0") + __ASM_EMIT("12:") + __ASM_EMIT("vmovaps 0x000 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("vaddps %%xmm0, %%xmm1, %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 14f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("14:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 16f") + __ASM_EMIT("vmovhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("16:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + void sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%zmm6") // zmm6 = k + __ASM_EMIT("vbroadcastss %[p], %%zmm7") // zmm7 = p + __ASM_EMIT("vmovaps 0x000 + %[S2KP], %%zmm4") // zmm4 = i = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + __ASM_EMIT("vmovaps 0x0c0 + %[S2KP], %%zmm5") // zmm5 = step = 16 ... + __ASM_EMIT("vaddps 0x000 + %[S2C], %%zmm7, %%zmm7") // zmm7 = p+PI/2 ... + // x16 blocks + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%zmm4, %%zmm6, %%zmm0") // zmm0 = k*i + __ASM_EMIT("vaddps %%zmm5, %%zmm4, %%zmm4") // zmm4 = i + step + __ASM_EMIT("vaddps %%zmm7, %%zmm0, %%zmm0") // zmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x8 blocks + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%ymm4, %%ymm6, %%ymm0") // ymm0 = k*i + __ASM_EMIT("vaddps 0x100 + %[S2KP], %%ymm4, %%ymm4") // ymm4 = i + step + __ASM_EMIT("vaddps %%ymm7, %%ymm0, %%ymm0") // ymm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("4:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps 0x120 + %[S2KP], %%xmm4, %%xmm4") // xmm4 = i + step + __ASM_EMIT("vaddps %%xmm7, %%xmm0, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("6:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 10f") + __ASM_EMIT("vmulps %%xmm4, %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("vaddps %%xmm7, %%xmm0, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("8:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("10:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%k1", "%k2" + ); + } + + void x64_sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_64_ASM( + // Prepare + __ASM_EMIT("vbroadcastss %[k], %%zmm11") // zmm11 = k + __ASM_EMIT("vbroadcastss %[p], %%zmm12") // zmm12 = p + __ASM_EMIT("vmovaps 0x000 + %[S2KP], %%zmm8") // zmm8 = i0 = 0 1 2 3 ... + __ASM_EMIT("vmovaps 0x040 + %[S2KP], %%zmm9") // zmm9 = i1 = 16 17 18 19 ... + __ASM_EMIT("vmovaps 0x080 + %[S2KP], %%zmm10") // zmm10 = step = 32 ... + __ASM_EMIT("vaddps 0x000 + %[S2C], %%zmm12, %%zmm12") // zmm12 = p+PI/2 ... + // x32 blocks + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("vmulps %%zmm8, %%zmm11, %%zmm0") // zmm0 = k*i0 + __ASM_EMIT("vmulps %%zmm9, %%zmm11, %%zmm4") // zmm4 = k*i1 + __ASM_EMIT("vaddps %%zmm10, %%zmm8, %%zmm8") // zmm8 = i0 + step + __ASM_EMIT("vaddps %%zmm10, %%zmm9, %%zmm9") // zmm9 = i1 + step + __ASM_EMIT("vaddps %%zmm12, %%zmm0, %%zmm0") // zmm0 = k*i0 + p + PI/2 + __ASM_EMIT("vaddps %%zmm12, %%zmm4, %%zmm4") // zmm4 = k*i1 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X32 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("vmovups %%zmm4, 0x40(%[dst])") + __ASM_EMIT("add $0x80, %[dst]") + __ASM_EMIT("sub $32, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x16 blocks + __ASM_EMIT("add $16, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("vmulps %%zmm8, %%zmm11, %%zmm0") // zmm0 = k*i0 + __ASM_EMIT("vaddps 0x0c0 + %[S2KP], %%zmm8, %%zmm8") // zmm8 = i0 + step + __ASM_EMIT("vaddps %%zmm12, %%zmm0, %%zmm0") // zmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X16 + __ASM_EMIT("vmovups %%zmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x40, %[dst]") + __ASM_EMIT("sub $16, %[count]") + __ASM_EMIT("4:") + // x8 block + __ASM_EMIT("add $8, %[count]") + __ASM_EMIT("jl 6f") + __ASM_EMIT("vmulps %%ymm8, %%ymm11, %%ymm0") // ymm0 = k*i0 + __ASM_EMIT("vaddps 0x100 + %[S2KP], %%ymm8, %%ymm8") // ymm8 = i0 + step + __ASM_EMIT("vaddps %%ymm12, %%ymm0, %%ymm0") // ymm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("vmovups %%ymm0, 0x00(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("6:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 8f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps 0x120 + %[S2KP], %%xmm8, %%xmm8") // xmm8 = i0 + step + __ASM_EMIT("vaddps %%xmm12, %%xmm0, %%xmm0") // xmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("vmovups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("8:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 12f") + __ASM_EMIT("vmulps %%xmm8, %%xmm11, %%xmm0") // xmm0 = k*i0 + __ASM_EMIT("vaddps %%xmm12, %%xmm0, %%xmm0") // xmm0 = k*i0 + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("vmovss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("vshufps $0x39, %%xmm0, %%xmm0, %%xmm0") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("vmovlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7", + "%xmm8", "%xmm9", "%xmm10", "%xmm11", + "%xmm12", + "%k1", "%k2" + ); + } + + } /* namespace avx512 */ +} /* namespace lsp */ + +#endif /* PRIVATE_DSP_ARCH_X86_AVX512_PMATH_SIN_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath.h 2025-03-01 12:42:56.800648338 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/avx512/pmath.h 2025-08-26 18:15:43.734003213 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 20 сент. 2023 г. @@ -27,15 +27,18 @@ #endif /* PRIVATE_DSP_ARCH_X86_AVX512_IMPL */ #include +#include #include #include #include +#include #include #include #include #include #include #include +#include #include #include diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse/3dmath.h 2025-03-01 12:42:56.800648338 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse/3dmath.h 2025-08-26 18:15:43.738003175 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -114,119 +114,84 @@ __ASM_EMIT("movhlps %" x0 ", %" x2) /* xmm2 = B+D B+D */ \ __ASM_EMIT("addps %" x2 ", %" x0) /* xmm0 = A+C+B+D */ -/* Get cosine of angle between two vectors - * Input: - * x0 = vector1 [dx dy dz ? ] - * x1 = vector2 [dx dy dz ? ] - * m0 = -1 - * m1 = +1 - * - * Output: - * x0 = vector1 * vector2 [ S0 ? ? ? ] - */ -#define CALC_COSINE2V(x0, x1, x2, x3, x4, m0, m1) \ - __ASM_EMIT("movaps %" x0 ", %" x2) /* xmm2 = dx0 dy0 dz0 ? */ \ - __ASM_EMIT("mulps %" x1 ", %" x0) /* xmm0 = dx0*dx1 dy0*dy1 dz0*dz1 ? */ \ - __ASM_EMIT("mulps %" x2 ", %" x2) /* xmm2 = dx0*dx0 dy0*dy0 dz0*dz0 ? */ \ - __ASM_EMIT("mulps %" x1 ", %" x1) /* xmm1 = dx1*dx1 dy1*dy1 dz1*dz1 ? */ \ - __ASM_EMIT("movhlps %" x2 ", %" x4) /* xmm4 = dz0*dz0 */ \ - __ASM_EMIT("movhlps %" x1 ", %" x3) /* xmm3 = dz1*dz1 */ \ - __ASM_EMIT("addss %" x4 ", %" x2) /* xmm2 = dx0*dx0+dz0*dz0 dy0*dy0 dz0*dz0 ? */ \ - __ASM_EMIT("addss %" x3 ", %" x1) /* xmm1 = dx1*dx1+dz1*dz1 dy1*dy1 dz1*dz1 ? */ \ - __ASM_EMIT("unpcklps %" x2 ", %" x2) /* xmm2 = dx0*dx0+dz0*dz0 dx0*dx0+dz0*dz0 dy0*dy0 dy0*dy0 */ \ - __ASM_EMIT("unpcklps %" x1 ", %" x1) /* xmm1 = dx1*dx1+dz1*dz1 dx1*dx1+dz1*dz1 dy1*dy1 dy1*dy1 */ \ - __ASM_EMIT("movhlps %" x2 ", %" x4) /* xmm4 = dy0*dy0 */ \ - __ASM_EMIT("movhlps %" x1 ", %" x3) /* xmm3 = dy1*dy1 */ \ - __ASM_EMIT("addss %" x4 ", %" x2) /* xmm2 = dx0*dx0+dz0*dz0+dy0*dy0 */ \ - __ASM_EMIT("addss %" x3 ", %" x1) /* xmm1 = dx1*dx1+dz1*dz1+dy1*dy1 */ \ - __ASM_EMIT("movhlps %" x0 ", %" x4) /* xmm4 = dz0*dz1 */ \ - __ASM_EMIT("sqrtss %" x2 ", %" x2) /* xmm2 = sqrtf(dx0*dx0+dz0*dz0+dy0*dy0) */ \ - __ASM_EMIT("addss %" x4 ", %" x0) /* xmm0 = dz1*dz1+dx0*dx1 dy0*dy1 dz0*dz1 ? */ \ - __ASM_EMIT("sqrtss %" x1 ", %" x1) /* xmm1 = sqrtf(dx1*dx1+dz1*dz1+dy1*dy1) */ \ - __ASM_EMIT("unpcklps %" x0 ", %" x0) /* xmm0 = dz1*dz1+dx0*dx1 dz1*dz1+dx0*dx1 dy0*dy1 dy0*dy1 */ \ - __ASM_EMIT("mulss %" x1 ", %" x2) /* xmm2 = w */ \ - __ASM_EMIT("movhlps %" x0 ", %" x4) /* xmm4 = dy0*dy1 */ \ - __ASM_EMIT("xorps %" x1 ", %" x1) /* xmm1 = 0 */ \ - __ASM_EMIT("addss %" x4 ", %" x0) /* xmm0 = dz1*dz1+dx0*dx1+dy0*dy1 */ \ - __ASM_EMIT("ucomiss %" x1 ", %" x2) /* xmm2 0 */ \ - __ASM_EMIT("jbe 1000000f") /* xmm2 <= 0 */ \ - __ASM_EMIT("divss %" x2 ", %" x0) /* xmm0 = (dz1*dz1+dx0*dx1+dy0*dy1)/w */ \ - __ASM_EMIT("1000000:") \ - __ASM_EMIT("ucomiss %" m0 ", %" x0) \ - __ASM_EMIT("jae 1000001f") \ - __ASM_EMIT("movss %" m0 ", %" x0) \ - __ASM_EMIT("jmp 1000002f") \ - __ASM_EMIT("1000001:") \ - __ASM_EMIT("ucomiss %" m1 ", %" x0) \ - __ASM_EMIT("jbe 1000002f") \ - __ASM_EMIT("movss %" m1 ", %" x0) \ - __ASM_EMIT("jmp 1000002f") \ - __ASM_EMIT("1000002:") \ - - /* 3x vector multiplication * Input: - * x0 = vector1 [dx dy dz ? ] - * x1 = vector2 [dx dy dz ? ] - * x2 = vector3 [dx dy dz ? ] + * x0 = vector1 [dx dy dz 0 ] + * x1 = vector2 [dx dy dz 0 ] + * x2 = vector3 [dx dy dz 0 ] * * Output: - * x0 = vector1 * vector2 [ vz vx vy ? ] - * x1 = vector2 * vector3 [ vz vx vy ? ] - * x2 = vector3 * vector1 [ vz vx vy ? ] + * x0 = vector1 * vector2 [ vz vx vy 0 ] + * x1 = vector2 * vector3 [ vz vx vy 0 ] + * x2 = vector3 * vector1 [ vz vx vy 0 ] */ #define VECTOR_MUL3(x0, x1, x2, x3, x4, x5, x6, x7) \ - __ASM_EMIT("movaps %" x0 ", %" x3) /* xmm3 = dx0 dy0 dz0 dw0 */ \ - __ASM_EMIT("movaps %" x1 ", %" x4) /* xmm4 = dx1 dy1 dz1 dw1 */ \ - __ASM_EMIT("movaps %" x2 ", %" x5) /* xmm5 = dx2 dy2 dz2 dw2 */ \ - __ASM_EMIT("shufps $0xc9, %" x3 ", %" x3) /* xmm3 = dy0 dz0 dx0 dw0 */ \ - __ASM_EMIT("shufps $0xc9, %" x4 ", %" x4) /* xmm4 = dy1 dz1 dx1 dw1 */ \ - __ASM_EMIT("shufps $0xc9, %" x5 ", %" x5) /* xmm5 = dy2 dz2 dx2 dw2 */ \ - __ASM_EMIT("movaps %" x0 ", %" x6) /* xmm6 = dx0 dy0 dz0 dw0 */ \ - __ASM_EMIT("movaps %" x3 ", %" x7) /* xmm7 = dy0 dz0 dx0 dw0 */ \ + __ASM_EMIT("movaps %" x0 ", %" x3) /* xmm3 = dx0 dy0 dz0 0 */ \ + __ASM_EMIT("movaps %" x1 ", %" x4) /* xmm4 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("movaps %" x2 ", %" x5) /* xmm5 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("shufps $0xc9, %" x3 ", %" x3) /* xmm3 = dy0 dz0 dx0 0 */ \ + __ASM_EMIT("shufps $0xc9, %" x4 ", %" x4) /* xmm4 = dy1 dz1 dx1 0 */ \ + __ASM_EMIT("shufps $0xc9, %" x5 ", %" x5) /* xmm5 = dy2 dz2 dx2 0 */ \ + __ASM_EMIT("movaps %" x0 ", %" x6) /* xmm6 = dx0 dy0 dz0 0 */ \ + __ASM_EMIT("movaps %" x3 ", %" x7) /* xmm7 = dy0 dz0 dx0 0 */ \ \ - __ASM_EMIT("mulps %" x4 ", %" x0) /* xmm0 = dx0*dy1 dy0*dz1 dz0*dx1 dw0*dw1 */ \ - __ASM_EMIT("mulps %" x1 ", %" x3) /* xmm3 = dy0*dx1 dz0*dy1 dx0*dz1 dw0*dw1 */ \ - __ASM_EMIT("mulps %" x5 ", %" x1) /* xmm1 = dx1*dy2 dy1*dz2 dz1*dx2 dw1*dw2 */ \ - __ASM_EMIT("mulps %" x2 ", %" x4) /* xmm4 = dy1*dx2 dz1*dy2 dx1*dz2 dw1*dw2 */ \ - __ASM_EMIT("mulps %" x7 ", %" x2) /* xmm2 = dx2*dy0 dy2*dz0 dz2*dx0 dw2*dw0 */ \ - __ASM_EMIT("mulps %" x6 ", %" x5) /* xmm5 = dy2*dx0 dz2*dy0 dx2*dz0 dw2*dw0 */ \ - __ASM_EMIT("subps %" x3 ", %" x0) /* xmm0 = nz0 nx0 ny0 nw0 */ \ - __ASM_EMIT("subps %" x4 ", %" x1) /* xmm1 = nz1 nx1 ny1 nw1 */ \ - __ASM_EMIT("subps %" x5 ", %" x2) /* xmm2 = nz2 nx2 ny2 nw2 */ + __ASM_EMIT("mulps %" x4 ", %" x0) /* xmm0 = dx0*dy1 dy0*dz1 dz0*dx1 0 */ \ + __ASM_EMIT("mulps %" x1 ", %" x3) /* xmm3 = dy0*dx1 dz0*dy1 dx0*dz1 0 */ \ + __ASM_EMIT("mulps %" x5 ", %" x1) /* xmm1 = dx1*dy2 dy1*dz2 dz1*dx2 0 */ \ + __ASM_EMIT("mulps %" x2 ", %" x4) /* xmm4 = dy1*dx2 dz1*dy2 dx1*dz2 0 */ \ + __ASM_EMIT("mulps %" x7 ", %" x2) /* xmm2 = dx2*dy0 dy2*dz0 dz2*dx0 0 */ \ + __ASM_EMIT("mulps %" x6 ", %" x5) /* xmm5 = dy2*dx0 dz2*dy0 dx2*dz0 0 */ \ + __ASM_EMIT("subps %" x3 ", %" x0) /* xmm0 = nz0 nx0 ny0 0 */ \ + __ASM_EMIT("subps %" x4 ", %" x1) /* xmm1 = nz1 nx1 ny1 0 */ \ + __ASM_EMIT("subps %" x5 ", %" x2) /* xmm2 = nz2 nx2 ny2 0 */ /* 1x vector multiplication * Input: - * x0 = vector1 [dx dy dz ? ] - * x1 = vector2 [dx dy dz ? ] + * x0 = vector1 [dx dy dz 0 ] + * x1 = vector2 [dx dy dz 0 ] * x2 = temporary * x3 = temporary * * Output: - * x0 = vector1 * vector2 [ vz vx vy ? ] + * x0 = vector1 * vector2 [ vz vx vy 0 ] */ #define VECTOR_MUL(x0, x1, x2, x3) \ - __ASM_EMIT("movaps %" x0 ", %" x2) /* xmm2 = dx1 dy1 dz1 dw1 */ \ - __ASM_EMIT("movaps %" x1 ", %" x3) /* xmm3 = dx2 dy2 dz2 dw2 */ \ - __ASM_EMIT("shufps $0xc9, %" x2 ", %" x2) /* xmm2 = dy1 dz1 dx1 dw1 */ \ - __ASM_EMIT("shufps $0xc9, %" x3 ", %" x3) /* xmm3 = dy2 dz2 dx2 dw2 */ \ + __ASM_EMIT("movaps %" x0 ", %" x2) /* xmm2 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("movaps %" x1 ", %" x3) /* xmm3 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("shufps $0xc9, %" x2 ", %" x2) /* xmm2 = dy1 dz1 dx1 0 */ \ + __ASM_EMIT("shufps $0xc9, %" x3 ", %" x3) /* xmm3 = dy2 dz2 dx2 0 */ \ __ASM_EMIT("mulps %" x2 ", %" x1) /* xmm1 = dx2*dy1 dy2*dz1 dz2*dx1 dw2*dw2 */ \ __ASM_EMIT("mulps %" x3 ", %" x0) /* xmm0 = dx1*dy2 dy1*dz2 dz1*dx2 dw1*dw1 */ \ __ASM_EMIT("subps %" x1 ", %" x0) /* xmm0 = dx1*dy2-dx2*dy1 dy1*dz2-dy2*dz1 dz1*dx2-dz2*dx1 dw1*dw1-dw2*dw2 = NY NZ NX NW */ +/* 1x matrix transpose + * Input: + * x0 = row 0 (a1 a2 a3 a4) + * x1 = row 1 (b1 b2 b3 b4) + * x2 = row 2 (c1 c2 c3 c4) + * x3 = row 3 (d1 d2 d3 d4) + * x4 = temporary + * + * Output: + * x0 = row 0 (a1 b1 c1 d1) + * x1 = row 1 (a2 b2 c2 d2) + * x2 = row 2 (a3 b3 c3 d3) + * x3 = row 3 (a4 b4 c4 d4) + */ #define MAT4_TRANSPOSE(x0, x1, x2, x3, x4) \ - __ASM_EMIT("movaps %" x2 ", %" x4) /* xmm4 = c1 c2 c3 c4 */ \ - __ASM_EMIT("punpckldq %" x3 ", %" x2) /* xmm2 = c1 d1 c2 d2 */ \ - __ASM_EMIT("punpckhdq %" x3 ", %" x4) /* xmm4 = c3 d3 c4 d4 */ \ - __ASM_EMIT("movaps %" x0 ", %" x3) /* xmm3 = a1 a2 a3 a4 */ \ - __ASM_EMIT("punpckldq %" x1 ", %" x0) /* xmm0 = a1 b1 a2 b2 */ \ - __ASM_EMIT("punpckhdq %" x1 ", %" x3) /* xmm3 = a3 b3 a4 b4 */ \ - __ASM_EMIT("movaps %" x0 ", %" x1) /* xmm1 = a1 b2 a2 b2 */ \ - __ASM_EMIT("punpcklqdq %" x2 ", %" x0) /* xmm0 = a1 b1 c1 d1 */ \ - __ASM_EMIT("punpckhqdq %" x2 ", %" x1) /* xmm1 = a2 b2 c2 d2 */ \ - __ASM_EMIT("movaps %" x3 ", %" x2) /* xmm2 = a3 b3 a4 b4 */ \ - __ASM_EMIT("punpcklqdq %" x4 ", %" x2) /* xmm2 = a3 b3 c3 d3 */ \ - __ASM_EMIT("punpckhqdq %" x4 ", %" x3) /* xmm3 = a4 b4 c4 d4 */ + __ASM_EMIT("movaps %" x2 ", %" x4) /* xmm4 = c1 c2 c3 c4 */ \ + __ASM_EMIT("unpcklps %" x3 ", %" x2) /* xmm2 = c1 d1 c2 d2 */ \ + __ASM_EMIT("unpckhps %" x3 ", %" x4) /* xmm4 = c3 d3 c4 d4 */ \ + __ASM_EMIT("movaps %" x0 ", %" x3) /* xmm3 = a1 a2 a3 a4 */ \ + __ASM_EMIT("unpcklps %" x1 ", %" x0) /* xmm0 = a1 b1 a2 b2 */ \ + __ASM_EMIT("unpckhps %" x1 ", %" x3) /* xmm3 = a3 b3 a4 b4 */ \ + __ASM_EMIT("movaps %" x2 ", %" x1) /* xmm1 = c1 d1 c2 d2 */ \ + __ASM_EMIT("movhlps %" x0 ", %" x1) /* xmm1 = a2 b2 c2 d2 */ \ + __ASM_EMIT("movlhps %" x2 ", %" x0) /* xmm0 = a1 b1 c1 d1 */ \ + __ASM_EMIT("movaps %" x3 ", %" x2) /* xmm2 = a3 b3 a4 b4 */ \ + __ASM_EMIT("movaps %" x4 ", %" x3) /* xmm3 = c3 d3 c4 d4 */ \ + __ASM_EMIT("movhlps %" x2 ", %" x3) /* xmm3 = a4 b4 c4 d4 */ \ + __ASM_EMIT("movlhps %" x4 ", %" x2) /* xmm2 = a3 b3 c3 d3 */ #define MATRIX_LOAD(ptr, x0, x1, x2, x3) \ __ASM_EMIT("movups 0x00(%[" ptr "]), %" x0 ) \ @@ -249,12 +214,11 @@ __ASM_EMIT("movhlps %" x2 ", %" x1) /* xmm1 = y*y y*y ? ? */ \ __ASM_EMIT("addss %" x1 ", %" x2) /* xmm2 = x*x+y*y+z*z */ \ __ASM_EMIT("xorps %" x1 ", %" x1) /* xmm1 = 0 */ \ - __ASM_EMIT("sqrtss %" x2", %" x2) /* xmm2 = sqrt(x*x + y*y + z*z) */ \ - __ASM_EMIT("ucomiss %" x1 ", %" x2) /* xmm2 =?= xmm1 */ \ - __ASM_EMIT("jle 1000000f") \ __ASM_EMIT("shufps $0x00, %" x2 ", %" x2) /* xmm2 = w w w w */ \ + __ASM_EMIT("sqrtps %" x2 ", %" x2) /* xmm2 = sqrt(x*x + y*y + z*z) */ \ + __ASM_EMIT("cmpps $4, %" x2 ", %" x1) /* xmm1 = w != 0 */ \ __ASM_EMIT("divps %" x2 ", %" x0) /* xmm0 = x/w y/w z/w w/w */ \ - __ASM_EMIT("1000000:") + __ASM_EMIT("andps %" x1 ", %" x0) /* xmm0 = (w != 0) ? x/w y/w z/w w/w : 0 */ \ /* * Input: @@ -340,26 +304,20 @@ namespace lsp static const float ONE[] __lsp_aligned16 = { LSP_DSP_VEC4(1.0f) }; static const float X_MINUS_ONE[] __lsp_aligned16 = { LSP_DSP_VEC4(-1.0f) }; static const uint32_t IONE[] __lsp_aligned16 = { LSP_DSP_VEC4(1) }; - static const uint32_t X_ISIGN[] __lsp_aligned16 = { LSP_DSP_VEC4(0x80000000) }; - - static const uint32_t ICULL3[] __lsp_aligned16 = { 0x01, 0x04, 0x10, 0 }; ) void init_point_xyz(point3d_t *p, float x, float y, float z) { ARCH_X86_ASM ( - __ASM_EMIT64("andps %[mask], %[x0]") // xmm0 = x 0 0 0 - __ASM_EMIT64("andps %[mask], %[x2]") // xmm2 = z 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = x 0 y ? - __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // xmm0 = x y z 0 - __ASM_EMIT("orps %[omask], %[x0]") // xmm0 = x y z 1 + __ASM_EMIT("movlhps %[x1], %[x0]") // x0 = x ? y ? + __ASM_EMIT("movhps %[id], %[x2]") // x2 = z ? 1 0 + __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // x0 = x y z 1 __ASM_EMIT("movups %[x0], (%[p])") : [x0] "+x" (x), [x1] "+x" (y), [x2] "+x"(z) : [p] "r" (p), - [mask] "m" (X_MASK0001), - [omask] "m" (X_3DPOINT) + [id] "m" (IDENTITY0) : "memory" ); } @@ -442,16 +400,14 @@ namespace lsp { ARCH_X86_ASM ( - __ASM_EMIT64("andps %[mask], %[x0]") // xmm0 = dx 0 0 0 - __ASM_EMIT64("andps %[mask], %[x2]") // xmm2 = dz 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = dx 0 dy ? - __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // xmm0 = dx dy dz 0 - __ASM_EMIT("movups %[x0], (%[p])") + __ASM_EMIT("movlhps %[x1], %[x0]") // x0 = dx ? dy ? + __ASM_EMIT("movhps %[id], %[x2]") // x2 = dz ? 1 0 + __ASM_EMIT("shufps $0xc8, %[x2], %[x0]") // x0 = dx dy dz 0 + __ASM_EMIT("movups %[x0], (%[p])") : [x0] "+x" (dx), [x1] "+x" (dy), [x2] "+x"(dz) - : - [p] "r" (p), - [mask] "m" (X_MASK0001) + : [p] "r" (p), + [id] "m" (IDENTITY0) : "memory" ); } @@ -636,378 +592,6 @@ namespace lsp ); } - void init_ray_xyz(ray3d_t *l, - float x0, float y0, float z0, - float x1, float y1, float z1 - ) - { - float x7; - - ARCH_X86_ASM - ( - // xmm0 = x0 ? ? ? - // xmm1 = y0 ? ? ? - // xmm2 = z0 ? ? ? - // xmm3 = x1 ? ? ? - // xmm4 = y1 ? ? ? - // xmm5 = z1 ? ? ? - __ASM_EMIT("movaps %[idm0], %[x7]") // xmm7 = 1 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = x0 ? y0 ? - __ASM_EMIT("movlhps %[x4], %[x3]") // xmm3 = x1 ? y1 ? - __ASM_EMIT("movlhps %[x7], %[x2]") // xmm2 = z0 ? 1 0 - __ASM_EMIT("movlhps %[x7], %[x5]") // xmm5 = z1 ? 1 0 - __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // xmm2 = x0 y0 z0 1 - __ASM_EMIT("shufps $0x88, %[x5], %[x3]") // xmm3 = x1 y1 z1 1 - __ASM_EMIT("movups %[x3], 0x00(%[l])") - __ASM_EMIT("subps %[x2], %[x3]") // xmm3 = x1-x0 y1-y0 z1-z0 0 - __ASM_EMIT("movups %[x3], 0x10(%[l])") - - : [x0] "+x" (x0), [x1] "+x" (y0), [x2] "+x" (z0), - [x3] "+x" (x1), [x4] "+x" (y1), [x5] "+x" (z1), - [x7] "=&x" (x7) - : [l] "r" (l), - [idm0] "m" (IDENTITY0) - : "memory" - ); - } - - void init_ray_dxyz(ray3d_t *l, - float x0, float y0, float z0, - float dx, float dy, float dz - ) - { - float x7; - - ARCH_X86_ASM - ( - // xmm0 = x0 ? ? ? - // xmm1 = y0 ? ? ? - // xmm2 = z0 ? ? ? - // xmm3 = x1 ? ? ? - // xmm4 = y1 ? ? ? - // xmm5 = z1 ? ? ? - __ASM_EMIT("movaps %[idm0], %[x7]") // xmm7 = 1 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = x0 ? y0 ? - __ASM_EMIT("movlhps %[x4], %[x3]") // xmm3 = dx ? dy ? - __ASM_EMIT("movlhps %[x7], %[x2]") // xmm2 = z0 ? 1 0 - __ASM_EMIT("movlhps %[x7], %[x5]") // xmm5 = dz ? 1 0 - __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // xmm2 = x0 y0 z0 1 - __ASM_EMIT("shufps $0xc8, %[x5], %[x3]") // xmm5 = x1 y1 z1 0 - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x3], 0x10(%[l])") - - : [x0] "+x" (x0), [x1] "+x" (y0), [x2] "+x" (z0), - [x3] "+x" (dx), [x4] "+x" (dy), [x5] "+x" (dz), - [x7] "=&x" (x7) - : [l] "r" (l), - [idm0] "m" (IDENTITY0) - : "memory" - ); - } - - void init_ray_pdv(ray3d_t *l, const point3d_t *p, const vector3d_t *v) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[p]), %[x0]") - __ASM_EMIT("movups (%[v]), %[x1]") - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - : [x0] "=&x" (x0), [x1] "=&x" (x1) - : [l] "r" (l), - [p] "r" (p), - [v] "r" (v) - : "memory" - ); - } - - void init_ray_p2(ray3d_t *l, const point3d_t *p1, const point3d_t *p2) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[p1]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x00(%[p2]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 w1-w0 - __ASM_EMIT("andps %[mask], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 0 - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - - : [x0] "=&x" (x0), [x1] "=&x" (x1) - : [l] "r" (l), - [p1] "r" (p1), - [p2] "r" (p2), - [mask] "m" (X_MASK0111) - : "memory" - ); - } - - void init_ray_pv(ray3d_t *l, const point3d_t *p) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[p]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x10(%[p]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 w1-w0 - __ASM_EMIT("andps %[mask], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 0 - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - - : [x0] "=&x" (x0), [x1] "=&x" (x1) - : [l] "r" (l), - [p] "r" (p), - [mask] "m" (X_MASK0111) - : "memory" - ); - } - - void init_ray(ray3d_t *l, const ray3d_t *r) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[r]), %[x0]") - __ASM_EMIT("movups 0x10(%[r]), %[x1]") - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - : [x0] "=&x" (x0), [x1] "=&x" (x1) - : [l] "r" (l), - [r] "r" (r) - : "memory" - ); - } - - void calc_ray_xyz(ray3d_t *l, - float x0, float y0, float z0, - float x1, float y1, float z1 - ) - { - float x7; - - ARCH_X86_ASM - ( - // xmm0 = x0 ? ? ? - // xmm1 = y0 ? ? ? - // xmm2 = z0 ? ? ? - // xmm3 = x1 ? ? ? - // xmm4 = y1 ? ? ? - // xmm5 = z1 ? ? ? - __ASM_EMIT("movaps %[idm0], %[x7]") // xmm7 = 1 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = x0 ? y0 ? - __ASM_EMIT("movlhps %[x4], %[x3]") // xmm3 = x1 ? y1 ? - __ASM_EMIT("movlhps %[x7], %[x2]") // xmm2 = z0 ? 1 0 - __ASM_EMIT("movlhps %[x7], %[x5]") // xmm5 = z1 ? 1 0 - __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // xmm2 = x0 y0 z0 1 - __ASM_EMIT("shufps $0x88, %[x5], %[x3]") // xmm5 = x1 y1 z1 1 - __ASM_EMIT("subps %[x2], %[x5]") // xmm5 = x1-x0 y1-y0 z1-z0 0 - NORMALIZE("[x5]", "[x0]", "[x1]") - __ASM_EMIT("movups %[x2], 0x00(%[l])") - __ASM_EMIT("movups %[x5], 0x10(%[l])") - - : [x0] "+x" (x0), [x1] "+x" (y0), [x2] "+x" (z0), - [x3] "+x" (x1), [x4] "+x" (y1), [x5] "+x" (z1), - [x7] "=&x" (x7) - : [l] "r" (l), - [idm0] "m" (IDENTITY0) - : "cc", "memory" - ); - } - - void calc_ray_dxyz(ray3d_t *l, - float x0, float y0, float z0, - float dx, float dy, float dz - ) - { - float x7; - - ARCH_X86_ASM - ( - // xmm0 = x0 ? ? ? - // xmm1 = y0 ? ? ? - // xmm2 = z0 ? ? ? - // xmm3 = x1 ? ? ? - // xmm4 = y1 ? ? ? - // xmm5 = z1 ? ? ? - __ASM_EMIT("movaps %[idm0], %[x7]") // xmm7 = 1 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = x0 ? y0 ? - __ASM_EMIT("movlhps %[x4], %[x3]") // xmm3 = dx ? dy ? - __ASM_EMIT("movlhps %[x7], %[x2]") // xmm2 = z0 ? 1 0 - __ASM_EMIT("movlhps %[x7], %[x5]") // xmm5 = dz ? 1 0 - __ASM_EMIT("shufps $0x88, %[x2], %[x0]") // xmm2 = x0 y0 z0 1 - __ASM_EMIT("shufps $0xc8, %[x5], %[x3]") // xmm5 = x1 y1 z1 0 - NORMALIZE("[x5]", "[x0]", "[x1]") - __ASM_EMIT("movups %[x2], 0x00(%[l])") - __ASM_EMIT("movups %[x5], 0x10(%[l])") - - : [x0] "+x" (x0), [x1] "+x" (y0), [x2] "+x" (z0), - [x3] "+x" (dx), [x4] "+x" (dy), [x5] "+x" (dz), - [x7] "=&x" (x7) - : [l] "r" (l), - [idm0] "m" (IDENTITY0) - : "cc", "memory" - ); - } - - void calc_ray_pdv(ray3d_t *l, const point3d_t *p, const vector3d_t *v) - { - float x0, x1, x2, x3; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[p]), %[x0]") - __ASM_EMIT("movups (%[v]), %[x1]") - NORMALIZE("[x1]", "[x2]", "[x3]") - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [l] "r" (l), - [p] "r" (p), - [v] "r" (v) - : "cc", "memory" - ); - } - - void calc_ray_p2(ray3d_t *l, const point3d_t *p1, const point3d_t *p2) - { - float x0, x1, x2, x3; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[p1]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x00(%[p2]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 w1-w0 - __ASM_EMIT("andps %[mask], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 0 - NORMALIZE("[x1]", "[x2]", "[x3]") - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [l] "r" (l), - [p1] "r" (p1), - [p2] "r" (p2), - [mask] "m" (X_MASK0111) - : "cc", "memory" - ); - } - - void calc_ray_pv(ray3d_t *l, const point3d_t *p) - { - float x0, x1, x2, x3; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[p]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x10(%[p]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 w1-w0 - __ASM_EMIT("andps %[mask], %[x1]") // xmm1 = x1-x0 y1-y0 z1-z0 0 - NORMALIZE("[x1]", "[x2]", "[x3]") - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [l] "r" (l), - [p] "r" (p), - [mask] "m" (X_MASK0111) - : "cc", "memory" - ); - } - - void calc_ray(ray3d_t *l, const ray3d_t *r) - { - float x0, x1, x2, x3; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[r]), %[x0]") - __ASM_EMIT("movups 0x10(%[r]), %[x1]") - NORMALIZE("[x1]", "[x2]", "[x3]") - __ASM_EMIT("movups %[x0], 0x00(%[l])") - __ASM_EMIT("movups %[x1], 0x10(%[l])") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [l] "r" (l), - [r] "r" (r) - : "cc", "memory" - ); - } - - void init_segment_xyz(segment3d_t *s, - float x0, float y0, float z0, - float x1, float y1, float z1 - ) - { - float x7; - - ARCH_X86_ASM - ( - // xmm0 = x0 ? ? ? - // xmm1 = y0 ? ? ? - // xmm2 = z0 ? ? ? - // xmm3 = x1 ? ? ? - // xmm4 = y1 ? ? ? - // xmm5 = z1 ? ? ? - __ASM_EMIT("movaps %[idm0], %[x7]") // xmm7 = 1 0 0 0 - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = x0 ? y0 ? - __ASM_EMIT("movlhps %[x4], %[x3]") // xmm3 = x1 ? y1 ? - __ASM_EMIT("movlhps %[x7], %[x2]") // xmm2 = z0 ? 1 0 - __ASM_EMIT("movlhps %[x7], %[x5]") // xmm5 = z1 ? 1 0 - __ASM_EMIT("shufps $0xc8, %[x2], %[x0]") // xmm2 = x0 y0 z0 0 - __ASM_EMIT("shufps $0xc8, %[x5], %[x3]") // xmm5 = x1 y1 z1 0 - __ASM_EMIT("movups %[x2], 0x00(%[s])") - __ASM_EMIT("movups %[x5], 0x10(%[s])") - - : [x0] "+x" (x0), [x1] "+x" (y0), [x2] "+x" (z0), - [x3] "+x" (x1), [x4] "+x" (y1), [x5] "+x" (z1), - [x7] "=&x" (x7) - : [s] "r" (s), - [idm0] "m" (IDENTITY0) - : "memory" - ); - } - - void init_segment_p2(segment3d_t *s, const point3d_t *p1, const point3d_t *p2) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[p1]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x00(%[p2]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("movups %[x0], 0x00(%[s])") - __ASM_EMIT("movups %[x1], 0x10(%[s])") - - : [x0] "=&x" (x0), [x1] "=&x" (x1) - : [s] "r" (s), - [p1] "r" (p1), - [p2] "r" (p2) - : "memory" - ); - } - - void init_segment_pv(segment3d_t *s, const point3d_t *p) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[p]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x10(%[p]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("movups %[x0], 0x00(%[s])") - __ASM_EMIT("movups %[x1], 0x10(%[s])") - - : [x0] "=&x" (x0), [x1] "=&x" (x1) - : [s] "r" (s), - [p] "r" (p) - : "memory" - ); - } - - void init_matrix3d(matrix3d_t *dst, const matrix3d_t *src) { ARCH_X86_ASM @@ -1026,12 +610,11 @@ namespace lsp ARCH_X86_ASM ( __ASM_EMIT("xorps %%xmm0, %%xmm0") - __ASM_EMIT("xorps %%xmm1, %%xmm1") - MATRIX_STORE("m", "%xmm0", "%xmm1", "%xmm0", "%xmm1") + MATRIX_STORE("m", "%xmm0", "%xmm0", "%xmm0", "%xmm0") : : [m] "r" (m) : "memory", - "%xmm0", "%xmm1" + "%xmm0" ); } @@ -1040,12 +623,11 @@ namespace lsp ARCH_X86_ASM ( __ASM_EMIT("movaps %[one], %%xmm0") - __ASM_EMIT("movaps %%xmm0, %%xmm1") - MATRIX_STORE("m", "%xmm0", "%xmm1", "%xmm0", "%xmm1") + MATRIX_STORE("m", "%xmm0", "%xmm0", "%xmm0", "%xmm0") : : [m] "r" (m), [one] "m" (ONE) : "memory", - "%xmm0", "%xmm1" + "%xmm0" ); } @@ -1101,10 +683,9 @@ namespace lsp ARCH_X86_ASM ( - __ASM_EMIT("andps %[mask], %[x0]") // xmm0 = sx 0 0 0 - __ASM_EMIT("andps %[mask], %[x1]") // xmm1 = sy 0 0 0 - __ASM_EMIT("andps %[mask], %[x2]") // xmm2 = sz 0 0 0 - + __ASM_EMIT("andps %[mask], %[x0]") // xmm0 = sx 0 0 0 + __ASM_EMIT("andps %[mask], %[x1]") // xmm1 = sy 0 0 0 + __ASM_EMIT("andps %[mask], %[x2]") // xmm2 = sz 0 0 0 __ASM_EMIT("shufps $0xf3, %[x1], %[x1]") // xmm1 = 0 sy 0 0 __ASM_EMIT("shufps $0xcf, %[x2], %[x2]") // xmm2 = 0 0 sz 0 __ASM_EMIT("movaps %[idm3], %[x3]") // xmm3 = 0 0 0 1 @@ -1128,9 +709,8 @@ namespace lsp ARCH_X86_ASM ( - __ASM_EMIT("movss %[s], %[x0]") // xmm0 = s 0 0 0 - __ASM_EMIT("movss %[c], %[x1]") // xmm1 = c 0 0 0 - + __ASM_EMIT("andps %[zmask], %[x0]") // xmm0 = s 0 0 0 + __ASM_EMIT("andps %[zmask], %[x1]") // xmm1 = c 0 0 0 __ASM_EMIT("shufps $0xc3, %[x1], %[x0]") // xmm0 = 0 s c 0 __ASM_EMIT("movaps %[idm0], %[x2]") // xmm2 = 1 0 0 0 __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = 0 s c 0 @@ -1140,11 +720,11 @@ namespace lsp MATRIX_STORE("m", "[x2]", "[x1]", "[x0]", "[x3]") : [x0] "+x" (s), [x1] "+x" (c), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [s] "m" (s), [c] "m" (c), - [m] "r" (m), - [idm0] "m" (IDENTITY0), - [idm3] "m" (IDENTITY3), - [mask] "m" (X_SMASK0010) + : [m] "r" (m), + [idm0] "m" (IDENTITY0), + [idm3] "m" (IDENTITY3), + [zmask] "m" (X_MASK0001), + [mask] "m" (X_SMASK0010) : "memory" ); } @@ -1157,23 +737,22 @@ namespace lsp ARCH_X86_ASM ( - __ASM_EMIT("movss %[s], %[x0]") // xmm0 = s 0 0 0 - __ASM_EMIT("movss %[c], %[x1]") // xmm1 = c 0 0 0 - - __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = s 0 c 0 - __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = s 0 c 0 - __ASM_EMIT("movaps %[idm1], %[x2]") // xmm2 = 0 1 0 0 - __ASM_EMIT("xorps %[mask], %[x1]") // xmm1 = -s 0 c 0 - __ASM_EMIT("movaps %[idm3], %[x3]") // xmm3 = 0 0 0 1 - __ASM_EMIT("shufps $0xc6, %[x1], %[x1]") // xmm1 = c 0 -s 0 + __ASM_EMIT("andps %[zmask], %[x0]") // xmm0 = s 0 0 0 + __ASM_EMIT("andps %[zmask], %[x1]") // xmm1 = c 0 0 0 + __ASM_EMIT("movlhps %[x1], %[x0]") // xmm0 = s 0 c 0 + __ASM_EMIT("movaps %[x0], %[x1]") // xmm1 = s 0 c 0 + __ASM_EMIT("movaps %[idm1], %[x2]") // xmm2 = 0 1 0 0 + __ASM_EMIT("xorps %[mask], %[x1]") // xmm1 = -s 0 c 0 + __ASM_EMIT("movaps %[idm3], %[x3]") // xmm3 = 0 0 0 1 + __ASM_EMIT("shufps $0xc6, %[x1], %[x1]") // xmm1 = c 0 -s 0 MATRIX_STORE("m", "[x1]", "[x2]", "[x0]", "[x3]") : [x0] "+x" (s), [x1] "+x" (c), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [s] "m" (s), [c] "m" (c), - [m] "r" (m), - [idm1] "m" (IDENTITY1), - [idm3] "m" (IDENTITY3), - [mask] "m" (X_SMASK0001) + : [m] "r" (m), + [idm1] "m" (IDENTITY1), + [idm3] "m" (IDENTITY3), + [zmask] "m" (X_MASK0001), + [mask] "m" (X_SMASK0001) : "memory" ); } @@ -1186,23 +765,22 @@ namespace lsp ARCH_X86_ASM ( - __ASM_EMIT("movss %[s], %[x0]") // xmm0 = s 0 0 0 - __ASM_EMIT("movss %[c], %[x1]") // xmm1 = c 0 0 0 - - __ASM_EMIT("movaps %[x0], %[x2]") // xmm2 = s 0 0 0 - __ASM_EMIT("movaps %[idm2], %[x3]") // xmm3 = 0 0 1 0 - __ASM_EMIT("unpcklps %[x1], %[x0]") // xmm0 = s c 0 0 - __ASM_EMIT("movaps %[idm3], %[x4]") // xmm3 = 0 0 0 1 - __ASM_EMIT("unpcklps %[x2], %[x1]") // xmm1 = c s 0 0 - __ASM_EMIT("xorps %[mask], %[x0]") // xmm0 = -s c 0 0 + __ASM_EMIT("andps %[zmask], %[x0]") // xmm0 = s 0 0 0 + __ASM_EMIT("andps %[zmask], %[x1]") // xmm1 = c 0 0 0 + __ASM_EMIT("movaps %[x0], %[x2]") // xmm2 = s 0 0 0 + __ASM_EMIT("movaps %[idm2], %[x3]") // xmm3 = 0 0 1 0 + __ASM_EMIT("unpcklps %[x1], %[x0]") // xmm0 = s c 0 0 + __ASM_EMIT("movaps %[idm3], %[x4]") // xmm3 = 0 0 0 1 + __ASM_EMIT("unpcklps %[x2], %[x1]") // xmm1 = c s 0 0 + __ASM_EMIT("xorps %[mask], %[x0]") // xmm0 = -s c 0 0 MATRIX_STORE("m", "[x1]", "[x0]", "[x3]", "[x4]") : [x0] "+x" (s), [x1] "+x" (c), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) - : [s] "m" (s), [c] "m" (c), - [m] "r" (m), - [idm2] "m" (IDENTITY2), - [idm3] "m" (IDENTITY3), - [mask] "m" (X_SMASK0001) + : [m] "r" (m), + [idm2] "m" (IDENTITY2), + [idm3] "m" (IDENTITY3), + [zmask] "m" (X_MASK0001), + [mask] "m" (X_SMASK0001) : "memory" ); } @@ -1646,50 +1224,6 @@ namespace lsp return x0; } - float check_triplet3d_t(const triangle3d_t *t) - { - float x0, x1, x2, x3, x4; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x10(%[t]), %[x1]") // xmm1 = px2 py2 pz2 pw2 - __ASM_EMIT("movups 0x20(%[t]), %[x2]") // xmm2 = px3 py3 pz3 pw3 - __ASM_EMIT("movups 0x00(%[t]), %[x4]") // xmm3 = px1 py1 pz1 pw1 - __ASM_EMIT("subps %[x1], %[x2]") // xmm2 = x2 y2 z2 w2 - __ASM_EMIT("movups 0x30(%[t]), %[x0]") // xmm0 = nx ny nz nw - __ASM_EMIT("subps %[x4], %[x1]") // xmm1 = x1 y1 z1 w1 - - TRIPLET_CHECK("x0", "x1", "x2", "x3", "x4") - - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) - : [t] "r" (t) - ); - - return x0; - } - - float check_triplet3d_tn(const triangle3d_t *t, const vector3d_t *n) - { - float x0, x1, x2, x3, x4; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x10(%[t]), %[x1]") // xmm1 = px2 py2 pz2 pw2 - __ASM_EMIT("movups 0x20(%[t]), %[x2]") // xmm2 = px3 py3 pz3 pw3 - __ASM_EMIT("movups 0x00(%[t]), %[x4]") // xmm4 = px1 py1 pz1 pw1 - __ASM_EMIT("subps %[x1], %[x2]") // xmm2 = x2 y2 z2 w2 - __ASM_EMIT("movups (%[n]), %[x0]") // xmm0 = nx ny nz nw - __ASM_EMIT("subps %[x4], %[x1]") // xmm1 = x1 y1 z1 w1 - - TRIPLET_CHECK("x0", "x1", "x2", "x3", "x4") - - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) - : [t] "r" (t), [n] "r" (n) - ); - - return x0; - } - size_t longest_edge3d_p3(const point3d_t *p1, const point3d_t *p2, const point3d_t *p3) { size_t res; @@ -1702,33 +1236,35 @@ namespace lsp __ASM_EMIT("movups (%[p2]), %[x0]") // xmm0 = x1 y1 z1 w1 __ASM_EMIT("movups (%[p3]), %[x1]") // xmm1 = x2 y2 z2 w2 __ASM_EMIT("movaps %[x2], %[x3]") // xmm3 = x0 y0 z0 w0 - __ASM_EMIT("subps %[x1], %[x2]") // xmm2 = x0-x2 y0-y2 z0-z2 w0-w2 = dx2 dy2 dz2 dw2 - __ASM_EMIT("subps %[x0], %[x1]") // xmm1 = x2-x1 y2-y1 z2-z1 w2-w1 = dx1 dy1 dz1 dw1 - __ASM_EMIT("subps %[x3], %[x0]") // xmm0 = x1-x0 y1-y0 z1-z0 w1-w0 = dx0 dy0 dz0 dw0 + __ASM_EMIT("subps %[x1], %[x2]") // xmm2 = x0-x2 y0-y2 z0-z2 w0-w2 = dx2 dy2 dz2 0 + __ASM_EMIT("subps %[x0], %[x1]") // xmm1 = x2-x1 y2-y1 z2-z1 w2-w1 = dx1 dy1 dz1 0 + __ASM_EMIT("subps %[x3], %[x0]") // xmm0 = x1-x0 y1-y0 z1-z0 w1-w0 = dx0 dy0 dz0 0 // Calc scalar multiplication - __ASM_EMIT("mulps %[x2], %[x2]") // xmm2 = sx2 sy2 sz2 sw2 - __ASM_EMIT("mulps %[x1], %[x1]") // xmm1 = sx2 sy2 sz2 sw2 - __ASM_EMIT("mulps %[x0], %[x0]") // xmm0 = sx2 sy2 sz2 sw2 + __ASM_EMIT("mulps %[x2], %[x2]") // xmm2 = cx2 cy2 cz2 0 + __ASM_EMIT("mulps %[x1], %[x1]") // xmm1 = bx2 by2 bz2 0 + __ASM_EMIT("mulps %[x0], %[x0]") // xmm0 = ax2 ay2 az2 0 MAT3_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]") __ASM_EMIT("addps %[x1], %[x0]") - __ASM_EMIT("addps %[x3], %[x0]") // xmm0 = S0 S1 S2 ? + __ASM_EMIT("addps %[x3], %[x0]") // xmm0 = A2 B2 C2 ? - __ASM_EMIT("xor %[res], %[res]") - __ASM_EMIT("movhlps %[x0], %[x2]") // xmm2 = S2 ? ? ? ? - __ASM_EMIT("unpcklps %[x0], %[x0]") // xmm0 = S0 S0 S1 S1 - __ASM_EMIT("movhlps %[x0], %[x1]") // xmm1 = S1 ? ? ? ? - - __ASM_EMIT("ucomiss %[x1], %[x0]") // S0 S1 - __ASM_EMIT("ja 1f") // S0 > S1 - __ASM_EMIT("ucomiss %[x2], %[x1]") // S1 S2 - __ASM_EMIT("setbe %%al") - __ASM_EMIT("inc %%al") + __ASM_EMIT("xor %[res], %[res]") // res = 0 + __ASM_EMIT("movhlps %[x0], %[x2]") // xmm2 = C2 ? ? ? + __ASM_EMIT("unpcklps %[x0], %[x0]") // xmm0 = A2 A2 B2 B2 + __ASM_EMIT("movhlps %[x0], %[x1]") // xmm1 = B2 B2 ? ? + + __ASM_EMIT("ucomiss %[x1], %[x0]") // A2 B2 + __ASM_EMIT("jae 1f") + // A2 < B2 + __ASM_EMIT("ucomiss %[x1], %[x2]") // C2 B2 + __ASM_EMIT("seta %%al") // res = (B2 >= C2) ? 0 : 1 + __ASM_EMIT("add $1, %[res]") // res = (B2 >= C2) ? 1 : 2 __ASM_EMIT("jmp 2f") - __ASM_EMIT("1:") // S0 <= S1 - __ASM_EMIT("ucomiss %[x2], %[x0]") // S0 S2 - __ASM_EMIT("ja 2f") // S0 > S2 - __ASM_EMIT("add $2, %%al") // res = 2 + __ASM_EMIT("1:") + // A2 >= B2 + __ASM_EMIT("ucomiss %[x2], %[x0]") // A2 C2 + __ASM_EMIT("jae 2f") + __ASM_EMIT("mov $2, %[res]") // res = (A2 >= C2) ? 0 : 2 __ASM_EMIT("2:") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [res] "=a" (res) @@ -1767,16 +1303,18 @@ namespace lsp __ASM_EMIT("unpcklps %[x0], %[x0]") // xmm0 = S0 S0 S1 S1 __ASM_EMIT("movhlps %[x0], %[x1]") // xmm1 = S1 ? ? ? ? - __ASM_EMIT("ucomiss %[x1], %[x0]") // S0 S1 - __ASM_EMIT("ja 1f") // S0 > S1 - __ASM_EMIT("ucomiss %[x2], %[x1]") // S1 S2 - __ASM_EMIT("setbe %%al") - __ASM_EMIT("inc %%al") + __ASM_EMIT("ucomiss %[x1], %[x0]") // A2 B2 + __ASM_EMIT("jae 1f") + // A2 < B2 + __ASM_EMIT("ucomiss %[x1], %[x2]") // C2 B2 + __ASM_EMIT("seta %%al") // res = (B2 >= C2) ? 0 : 1 + __ASM_EMIT("add $1, %[res]") // res = (B2 >= C2) ? 1 : 2 __ASM_EMIT("jmp 2f") - __ASM_EMIT("1:") // S0 <= S1 - __ASM_EMIT("ucomiss %[x2], %[x0]") // S0 S2 - __ASM_EMIT("ja 2f") // S0 > S2 - __ASM_EMIT("add $2, %%al") // res = 2 + __ASM_EMIT("1:") + // A2 >= B2 + __ASM_EMIT("ucomiss %[x2], %[x0]") // A2 C2 + __ASM_EMIT("jae 2f") + __ASM_EMIT("mov $2, %[res]") // res = (A2 >= C2) ? 0 : 2 __ASM_EMIT("2:") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [res] "=a" (res) @@ -1786,65 +1324,6 @@ namespace lsp return res; } - float check_point3d_on_triangle_tp(const triangle3d_t *t, const point3d_t *p) - { - float x0, x1, x2, x3, x4, x5, x6, x7; - - ARCH_X86_ASM - ( - /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups 0x00(%[t]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups 0x10(%[t]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups 0x20(%[t]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ - /* 3x vector multiplications */ - VECTOR_MUL3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") - /* 3x scalar multiplications */ - SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") - /* Compare with zeros */ - __ASM_EMIT("xorps %[x4], %[x4]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jb 110f") - __ASM_EMIT("ucomiss %[x4], %[x1]") - __ASM_EMIT("jb 109f") - __ASM_EMIT("ucomiss %[x4], %[x2]") - __ASM_EMIT("jb 108f") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jne 110f") - /* There is somewhere zero, need additional check */ - /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups 0x00(%[t]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups 0x10(%[t]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups 0x20(%[t]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ - /* Do 3x scalar multiplications */ - SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("jmp 110f") - - __ASM_EMIT("108:") - __ASM_EMIT("movss %[x2], %[x0]") - __ASM_EMIT("jmp 110f") - __ASM_EMIT("109:") - __ASM_EMIT("movss %[x1], %[x0]") - __ASM_EMIT("110:") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) - : [p] "r" (p), [t] "r" (t) - ); - - return x0; - } - float check_point3d_on_triangle_pvp(const point3d_t *pv, const point3d_t *p) { float x0, x1, x2, x3, x4, x5, x6, x7; @@ -1852,49 +1331,39 @@ namespace lsp ARCH_X86_ASM ( /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ + __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz 1 */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = x0 y0 z0 1 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = x1 y1 z1 1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = x2 y2 z2 1 */ + __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = v0 = dx0 dy0 dz0 0 */ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = v1 = dx1 dy1 dz1 0 */ + __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = v2 = dx2 dy2 dz2 0 */ /* 3x vector multiplications */ VECTOR_MUL3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") /* 3x scalar multiplications */ + /* xmm0 = m0 = v0 cross v1 */ + /* xmm1 = m1 = v1 cross v2 */ + /* xmm2 = m2 = v2 cross v0 */ SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") /* Compare with zeros */ - __ASM_EMIT("xorps %[x4], %[x4]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jb 110f") - __ASM_EMIT("ucomiss %[x4], %[x1]") - __ASM_EMIT("jb 109f") - __ASM_EMIT("ucomiss %[x4], %[x2]") - __ASM_EMIT("jb 108f") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jne 110f") - /* There is somewhere zero, need additional check */ - /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ - /* Do 3x scalar multiplications */ - SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("jmp 110f") - - __ASM_EMIT("108:") - __ASM_EMIT("movss %[x2], %[x0]") + /* xmm0 = r0 = m0 dot m1 */ + /* xmm1 = r1 = m1 dot m2 */ + /* xmm2 = r2 = m2 dot m0 */ + __ASM_EMIT("xorps %[x4], %[x4]") /* xmm4 = 0 */ + __ASM_EMIT("ucomiss %[x4], %[x0]") /* r0 <=> 0 */ + __ASM_EMIT("jb 110f") /* r0 < 0 */ + __ASM_EMIT("mulss %[x1], %[x0]") /* xmm0 = r0 * r1 */ + __ASM_EMIT("ucomiss %[x4], %[x1]") /* r1 <=> 0 */ + __ASM_EMIT("jb 109f") /* r1 < 0 */ + __ASM_EMIT("mulss %[x2], %[x0]") /* xmm0 = r0 * r1 * r2 */ + __ASM_EMIT("ucomiss %[x4], %[x2]") /* r2 <=> 0 */ + __ASM_EMIT("jae 110f") /* r2 >= 0 */ + /* Fail cases */ + __ASM_EMIT("movaps %[x2], %[x0]") __ASM_EMIT("jmp 110f") __ASM_EMIT("109:") - __ASM_EMIT("movss %[x1], %[x0]") + __ASM_EMIT("movaps %[x1], %[x0]") + /* End */ __ASM_EMIT("110:") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) @@ -1911,49 +1380,39 @@ namespace lsp ARCH_X86_ASM ( /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups (%[p1]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups (%[p2]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups (%[p3]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ + __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz 1 */ + __ASM_EMIT("movups (%[p1]), %[x0]") /* xmm0 = x0 y0 z0 1 */ + __ASM_EMIT("movups (%[p2]), %[x1]") /* xmm1 = x1 y1 z1 1 */ + __ASM_EMIT("movups (%[p3]), %[x2]") /* xmm2 = x2 y2 z2 1 */ + __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = v0 = dx0 dy0 dz0 0 */ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = v1 = dx1 dy1 dz1 0 */ + __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = v2 = dx2 dy2 dz2 0 */ /* 3x vector multiplications */ VECTOR_MUL3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") /* 3x scalar multiplications */ + /* xmm0 = m0 = v0 cross v1 */ + /* xmm1 = m1 = v1 cross v2 */ + /* xmm2 = m2 = v2 cross v0 */ SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") /* Compare with zeros */ - __ASM_EMIT("xorps %[x4], %[x4]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jb 110f") - __ASM_EMIT("ucomiss %[x4], %[x1]") - __ASM_EMIT("jb 109f") - __ASM_EMIT("ucomiss %[x4], %[x2]") - __ASM_EMIT("jb 108f") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jne 110f") - /* There is somewhere zero, need additional check */ - /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups (%[p1]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups (%[p2]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups (%[p3]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ - /* Do 3x scalar multiplications */ - SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("jmp 110f") - - __ASM_EMIT("108:") - __ASM_EMIT("movss %[x2], %[x0]") + /* xmm0 = r0 = m0 dot m1 */ + /* xmm1 = r1 = m1 dot m2 */ + /* xmm2 = r2 = m2 dot m0 */ + __ASM_EMIT("xorps %[x4], %[x4]") /* xmm4 = 0 */ + __ASM_EMIT("ucomiss %[x4], %[x0]") /* r0 <=> 0 */ + __ASM_EMIT("jb 110f") /* r0 < 0 */ + __ASM_EMIT("mulss %[x1], %[x0]") /* xmm0 = r0 * r1 */ + __ASM_EMIT("ucomiss %[x4], %[x1]") /* r1 <=> 0 */ + __ASM_EMIT("jb 109f") /* r1 < 0 */ + __ASM_EMIT("mulss %[x2], %[x0]") /* xmm0 = r0 * r1 * r2 */ + __ASM_EMIT("ucomiss %[x4], %[x2]") /* r2 <=> 0 */ + __ASM_EMIT("jae 110f") /* r2 >= 0 */ + /* Fail cases */ + __ASM_EMIT("movaps %[x2], %[x0]") __ASM_EMIT("jmp 110f") __ASM_EMIT("109:") - __ASM_EMIT("movss %[x1], %[x0]") + __ASM_EMIT("movaps %[x1], %[x0]") + /* End */ __ASM_EMIT("110:") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) @@ -1963,48 +1422,6 @@ namespace lsp return x0; } - float calc_angle3d_v2(const vector3d_t *v1, const vector3d_t *v2) - { - float x0, x1, x2, x3, x4; - - ARCH_X86_ASM - ( - /* Load vectors */ - __ASM_EMIT("movups (%[v1]), %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("movups (%[v2]), %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - CALC_COSINE2V("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[M_ONE]", "[ONE]") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) - : [v1] "r" (v1), [v2] "r" (v2), - [ONE] "m" (ONE), - [M_ONE] "m" (X_MINUS_ONE) - : "cc", "memory" - ); - - return x0; - } - - float calc_angle3d_vv(const vector3d_t *v) - { - float x0, x1, x2, x3, x4; - - ARCH_X86_ASM - ( - /* Load vectors */ - __ASM_EMIT("movups 0x00(%[v]), %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("movups 0x10(%[v]), %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - CALC_COSINE2V("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[M_ONE]", "[ONE]") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) - : [v] "r" (v), - [ONE] "m" (ONE), - [M_ONE] "m" (X_MINUS_ONE) - : "cc", "memory" - ); - - return x0; - } - void calc_normal3d_v2(vector3d_t *n, const vector3d_t *v1, const vector3d_t *v2) { float x0, x1, x2, x3; @@ -2014,24 +1431,19 @@ namespace lsp __ASM_EMIT("movups (%[v1]), %[x0]") /* xmm0 = dx1 dy1 dz1 dw1 */ __ASM_EMIT("movups (%[v2]), %[x1]") /* xmm1 = dx2 dy2 dz2 dw2 */ VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY NW */ - // __ASM_EMIT("shufps $0xc9, %[x0], %[x0]") /* xmm0 = NX NY NZ NW */ - // NORMALIZE("[x0]", "[x1]", "[x2]") /* xmm0 = nx ny nz nw */ - // __ASM_EMIT("movups %[x0], (%[n])") - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ - __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ + __ASM_EMIT("shufps $0xc9, %[x1], %[x1]") /* xmm1 = NX NY NZ 0 */ __ASM_EMIT("sqrtss %[x0], %[x0]") /* xmm0 = sqrtf(W2) = W */ __ASM_EMIT("xorps %[x3], %[x3]") /* xmm3 = 0 */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ __ASM_EMIT("cmpps $4, %[x0], %[x3]") /* xmm3 = W != 0 */ - __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W NZ/W */ + __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W 0/W */ __ASM_EMIT("andps %[x3], %[x1]") /* xmm1 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz */ - __ASM_EMIT("andps %[X_3DMASK], %[x1]") /* xmm1 = nx ny nz 0 */ __ASM_EMIT("movups %[x1], (%[n])") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [n] "r" (n), [v1] "r" (v1), [v2] "r" (v2), - [X_3DMASK] "m" (X_3DMASK) + : [n] "r" (n), [v1] "r" (v1), [v2] "r" (v2) : "memory" ); } @@ -2045,24 +1457,19 @@ namespace lsp __ASM_EMIT("movups 0x00(%[vv]), %[x0]") /* xmm0 = dx1 dy1 dz1 dw1 */ __ASM_EMIT("movups 0x10(%[vv]), %[x1]") /* xmm1 = dx2 dy2 dz2 dw2 */ VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY NW */ - // __ASM_EMIT("shufps $0xc9, %[x0], %[x0]") /* xmm0 = NX NY NZ NW */ - // NORMALIZE("[x0]", "[x1]", "[x2]") /* xmm0 = nx ny nz nw */ - // __ASM_EMIT("movups %[x0], (%[n])") - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ - __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ + __ASM_EMIT("shufps $0xc9, %[x1], %[x1]") /* xmm1 = NX NY NZ 0 */ __ASM_EMIT("sqrtss %[x0], %[x0]") /* xmm0 = sqrtf(W2) = W */ __ASM_EMIT("xorps %[x3], %[x3]") /* xmm3 = 0 */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ __ASM_EMIT("cmpps $4, %[x0], %[x3]") /* xmm3 = W != 0 */ - __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W NZ/W */ + __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W 0/W */ __ASM_EMIT("andps %[x3], %[x1]") /* xmm1 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz */ - __ASM_EMIT("andps %[X_3DMASK], %[x1]") /* xmm1 = nx ny nz 0 */ __ASM_EMIT("movups %[x1], (%[n])") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [n] "r" (n), [vv] "r" (vv), - [X_3DMASK] "m" (X_3DMASK) + : [n] "r" (n), [vv] "r" (vv) : "memory" ); } @@ -2079,24 +1486,19 @@ namespace lsp __ASM_EMIT("subps %[x0], %[x1]") /* xmm0 = dx1 dy1 dz1 dw1 */ __ASM_EMIT("subps %[x2], %[x0]") /* xmm1 = dx2 dy2 dz2 dw2 */ VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY NW */ - // __ASM_EMIT("shufps $0xc9, %[x0], %[x0]") /* xmm0 = NX NY NZ NW */ - // NORMALIZE("[x0]", "[x1]", "[x2]") /* xmm0 = nx ny nz nw */ - // __ASM_EMIT("movups %[x0], (%[n])") - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ - __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ + __ASM_EMIT("shufps $0xc9, %[x1], %[x1]") /* xmm1 = NX NY NZ 0 */ __ASM_EMIT("sqrtss %[x0], %[x0]") /* xmm0 = sqrtf(W2) = W */ __ASM_EMIT("xorps %[x3], %[x3]") /* xmm3 = 0 */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ __ASM_EMIT("cmpps $4, %[x0], %[x3]") /* xmm3 = W != 0 */ - __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W NZ/W */ + __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W 0/W */ __ASM_EMIT("andps %[x3], %[x1]") /* xmm1 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz */ - __ASM_EMIT("andps %[X_3DMASK], %[x1]") /* xmm1 = nx ny nz 0 */ __ASM_EMIT("movups %[x1], (%[n])") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [n] "r" (n), [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3), - [X_3DMASK] "m" (X_3DMASK) + : [n] "r" (n), [p1] "r" (p1), [p2] "r" (p2), [p3] "r" (p3) : "memory" ); } @@ -2113,70 +1515,19 @@ namespace lsp __ASM_EMIT("subps %[x0], %[x1]") /* xmm0 = dx1 dy1 dz1 dw1 */ __ASM_EMIT("subps %[x2], %[x0]") /* xmm1 = dx2 dy2 dz2 dw2 */ VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY NW */ - // __ASM_EMIT("shufps $0xc9, %[x0], %[x0]") /* xmm0 = NX NY NZ NW */ - // NORMALIZE("[x0]", "[x1]", "[x2]") /* xmm0 = nx ny nz nw */ - // __ASM_EMIT("movups %[x0], (%[n])") - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ - __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ + __ASM_EMIT("shufps $0xc9, %[x1], %[x1]") /* xmm1 = NX NY NZ 0 */ __ASM_EMIT("sqrtss %[x0], %[x0]") /* xmm0 = sqrtf(W2) = W */ __ASM_EMIT("xorps %[x3], %[x3]") /* xmm3 = 0 */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ __ASM_EMIT("cmpps $4, %[x0], %[x3]") /* xmm3 = W != 0 */ - __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W NZ/W */ + __ASM_EMIT("divps %[x0], %[x1]") /* xmm1 = NX/W NY/W NZ/W 0/W */ __ASM_EMIT("andps %[x3], %[x1]") /* xmm1 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz */ - __ASM_EMIT("andps %[X_3DMASK], %[x1]") /* xmm1 = nx ny nz 0 */ __ASM_EMIT("movups %[x1], (%[n])") : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [n] "r" (n), [pv] "r" (pv), - [X_3DMASK] "m" (X_3DMASK) - : "memory" - ); - } - - void move_point3d_p2(point3d_t *p, const point3d_t *p1, const point3d_t *p2, float k) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[p1]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups (%[p2]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("shufps $0x00, %[x2], %[x2]") // xmm2 = k k k k - __ASM_EMIT("subps %[x0], %[x1]") // xmm1 = dx dy dz dw - __ASM_EMIT("mulps %[x2], %[x1]") // xmm1 = dx*k dy*k dz*k dw*k - __ASM_EMIT("addps %[x1], %[x0]") // xmm0 = x0+dx*k y0+dx*k z0+dx*k w0+dw*k - __ASM_EMIT("andps %[zmask], %[x0]") // xmm0 = x0+dx*k y0+dx*k z0+dx*k 0 - __ASM_EMIT("orps %[omask], %[x0]") // xmm0 = x0+dx*k y0+dx*k z0+dx*k 1 - __ASM_EMIT("movups %[x0], (%[p])") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "+x" (k) - : [p] "r" (p), [p1] "r" (p1), [p2] "r" (p2), - [zmask] "m" (X_MASK0111), - [omask] "m" (X_3DPOINT) - : "memory" - ); - } - - void move_point3d_pv(point3d_t *p, const point3d_t *pv, float k) - { - float x0, x1; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups 0x00(%[pv]), %[x0]") // xmm0 = x0 y0 z0 w0 - __ASM_EMIT("movups 0x10(%[pv]), %[x1]") // xmm1 = x1 y1 z1 w1 - __ASM_EMIT("shufps $0x00, %[x2], %[x2]") // xmm2 = k k k k - __ASM_EMIT("subps %[x0], %[x1]") // xmm1 = dx dy dz dw - __ASM_EMIT("mulps %[x2], %[x1]") // xmm1 = dx*k dy*k dz*k dw*k - __ASM_EMIT("addps %[x1], %[x0]") // xmm0 = x0+dx*k y0+dx*k z0+dx*k w0+dw*k - __ASM_EMIT("andps %[zmask], %[x0]") // xmm0 = x0+dx*k y0+dx*k z0+dx*k 0 - __ASM_EMIT("orps %[omask], %[x0]") // xmm0 = x0+dx*k y0+dx*k z0+dx*k 1 - __ASM_EMIT("movups %[x0], (%[p])") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "+x" (k) - : [p] "r" (p), [pv] "r" (pv), - [zmask] "m" (X_MASK0111), - [omask] "m" (X_3DPOINT) + : [n] "r" (n), [pv] "r" (pv) : "memory" ); } @@ -2190,8 +1541,8 @@ namespace lsp __ASM_EMIT("movups (%[p0]), %[x2]") /* xmm0 = x0 y0 z0 w0 */ __ASM_EMIT("movups (%[p1]), %[x0]") /* xmm1 = x1 y1 z1 w1 */ __ASM_EMIT("movups (%[p2]), %[x1]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 dw2 */ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 0 */ VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY NW */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ */ __ASM_EMIT("sqrtss %[x0], %[x0]") /* xmm0 = sqrtf(NX*NX + NY*NY + NZ*NZ) */ @@ -2213,8 +1564,8 @@ namespace lsp __ASM_EMIT("movups 0x00(%[pv]), %[x2]") /* xmm0 = x0 y0 z0 w0 */ __ASM_EMIT("movups 0x10(%[pv]), %[x0]") /* xmm1 = x1 y1 z1 w1 */ __ASM_EMIT("movups 0x20(%[pv]), %[x1]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 dw2 */ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 0 */ VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY NW */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ */ __ASM_EMIT("sqrtss %[x0], %[x0]") /* xmm0 = sqrtf(NX*NX + NY*NY + NZ*NZ) */ @@ -2236,10 +1587,10 @@ namespace lsp __ASM_EMIT("movups (%[p0]), %[x2]") /* xmm2 = x0 y0 z0 w0 */ __ASM_EMIT("movups (%[p1]), %[x0]") /* xmm0 = x1 y1 z1 w1 */ __ASM_EMIT("movups (%[p2]), %[x1]") /* xmm1 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 dw2 */ - VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY ? */ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 0 */ + VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY 0 */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ @@ -2250,7 +1601,7 @@ namespace lsp __ASM_EMIT("andps %[x3], %[x1]") /* xmm1 = (NX/W) & [W!=0] (NY/W) & [W!=0] (NZ/W) & [W!=0] (NZ/W) & [W!=0] = nx ny nz nz */ __ASM_EMIT("movaps %[x1], %[x2]") /* xmm2 = nx ny nz nz */ __ASM_EMIT("movups (%[p0]), %[x3]") /* xmm3 = x0 y0 z0 w0 */ - __ASM_EMIT("xorps %[X_ISIGN], %[x1]") /* xmm1 = -nx -ny -nz -nz */ + __ASM_EMIT("xorps %[X_ISIGN], %[x1]") /* xmm1 = -nx -ny -nz nz */ VECTOR_DPPS3("[x1]", "[x3]", "[x3]") /* xmm1 = -(nx*x0 + ny*y0 + nz*z0) = dw ? */ __ASM_EMIT("shufps $0xf0, %[x2], %[x1]") /* xmm1 = dw dw nz nz */ __ASM_EMIT("shufps $0x24, %[x1], %[x2]") /* xmm2 = nx ny nz dw */ @@ -2258,7 +1609,7 @@ namespace lsp : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [v] "r" (v), [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2), - [X_ISIGN] "m" (X_ISIGN) + [X_ISIGN] "m" (X_SMASK0111) : "memory" ); @@ -2274,10 +1625,10 @@ namespace lsp __ASM_EMIT("movups 0x00(%[pv]), %[x2]") /* xmm2 = x0 y0 z0 w0 */ __ASM_EMIT("movups 0x10(%[pv]), %[x0]") /* xmm0 = x1 y1 z1 w1 */ __ASM_EMIT("movups 0x20(%[pv]), %[x1]") /* xmm1 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 dw2 */ - VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY ? */ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 0 */ + __ASM_EMIT("subps %[x2], %[x1]") /* xmm1 = p2 - p0 = dx2 dy2 dz2 0 */ + VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY 0 */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ @@ -2296,7 +1647,7 @@ namespace lsp : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [v] "r" (v), [pv] "r" (pv), - [X_ISIGN] "m" (X_ISIGN) + [X_ISIGN] "m" (X_SMASK0111) : "memory" ); @@ -2311,10 +1662,10 @@ namespace lsp ( __ASM_EMIT("movups (%[p0]), %[x2]") /* xmm2 = x0 y0 z0 w0 */ __ASM_EMIT("movups (%[p1]), %[x0]") /* xmm0 = x1 y1 z1 w1 */ - __ASM_EMIT("movups (%[v0]), %[x1]") /* xmm1 = v = dx2 dy2 dz2 dw2 */ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 dw1 */ - VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY ? */ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY ? */ + __ASM_EMIT("movups (%[v0]), %[x1]") /* xmm1 = v = dx2 dy2 dz2 0 */ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = p1 - p0 = dx1 dy1 dz1 0 */ + VECTOR_MUL("[x0]", "[x1]", "[x2]", "[x3]") /* xmm0 = NZ NX NY 0 */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = NZ NX NY 0 */ VECTOR_DPPS3("[x0]", "[x0]", "[x2]") /* xmm0 = NX*NX + NY*NY + NZ*NZ = W2 */ __ASM_EMIT("shufps $0x09, %[x1], %[x1]") /* xmm1 = NX NY NZ NZ */ __ASM_EMIT("shufps $0x00, %[x0], %[x0]") /* xmm0 = W2 W2 W2 W2 */ @@ -2333,7 +1684,7 @@ namespace lsp : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [v] "r" (v), [v0] "r" (v0), [p0] "r" (p0), [p1] "r" (p1), - [X_ISIGN] "m" (X_ISIGN) + [X_ISIGN] "m" (X_SMASK0111) : "memory" ); @@ -2420,10 +1771,91 @@ namespace lsp ); } + float calc_min_distance_p3(const point3d_t *sp, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[sp]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups (%[p0]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups (%[p1]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups (%[p2]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = d0 */ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = d1 */ + __ASM_EMIT("mulps %[x0], %[x0]") /* xmm0 = d0 * d0 */ + __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = d2 */ + __ASM_EMIT("mulps %[x1], %[x1]") /* xmm1 = d1 * d1 */ + __ASM_EMIT("mulps %[x2], %[x2]") /* xmm2 = d2 * d2 */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + /* xmm0 = x0 x1 x2 ? */ + /* xmm1 = y0 y1 y2 ? */ + /* xmm2 = z0 z1 z2 ? */ + /* xmm3 = w0 w1 w2 ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("sqrtps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k1) sqrtf(k2) ? */ + __ASM_EMIT("movhlps %[x0], %[x1]") /* xmm1 = sqrtf(k2) */ + __ASM_EMIT("unpcklps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k0) sqrtf(k1) sqrtf(k1) */ + __ASM_EMIT("movhlps %[x0], %[x2]") /* xmm1 = sqrtf(k2) */ + __ASM_EMIT("minss %[x1], %[x0]") + __ASM_EMIT("minss %[x2], %[x0]") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [sp] "r" (sp), [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2) + : + ); + + return x0; + } + + float calc_min_distance_pv(const point3d_t *sp, const point3d_t *pv) + { + float x0, x1, x2, x3, x4; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[sp]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = d0 */ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = d1 */ + __ASM_EMIT("mulps %[x0], %[x0]") /* xmm0 = d0 * d0 */ + __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = d2 */ + __ASM_EMIT("mulps %[x1], %[x1]") /* xmm1 = d1 * d1 */ + __ASM_EMIT("mulps %[x2], %[x2]") /* xmm2 = d2 * d2 */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + /* xmm0 = x0 x1 x2 ? */ + /* xmm1 = y0 y1 y2 ? */ + /* xmm2 = z0 z1 z2 ? */ + /* xmm3 = w0 w1 w2 ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("sqrtps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k1) sqrtf(k2) ? */ + __ASM_EMIT("movhlps %[x0], %[x1]") /* xmm1 = sqrtf(k2) */ + __ASM_EMIT("unpcklps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k0) sqrtf(k1) sqrtf(k1) */ + __ASM_EMIT("movhlps %[x0], %[x2]") /* xmm1 = sqrtf(k2) */ + __ASM_EMIT("minss %[x1], %[x0]") + __ASM_EMIT("minss %[x2], %[x0]") + + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [sp] "r" (sp), [pv] "r" (pv) + : + ); + + return x0; + } + size_t colocation_x2_v1p2(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1) { float x0, x1, x2, x3; - float res[4] __lsp_aligned16; ARCH_X86_ASM ( @@ -2444,22 +1876,21 @@ namespace lsp __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL ? ? */ __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL ? ? */ - __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ - __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ - __ASM_EMIT("paddd %[x1], %[x0]") - __ASM_EMIT("movdqa %[x0], (%[res])") - __ASM_EMIT32("movl 0x00(%[res]), %[p0]") - __ASM_EMIT32("movl 0x04(%[res]), %[p1]") - __ASM_EMIT64("movl 0x00(%[res]), %k[p0]") - __ASM_EMIT64("movl 0x04(%[res]), %k[p1]") + __ASM_EMIT("andps %[ONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("andps %[ONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[p0]") + __ASM_EMIT64("cvttss2si %[x0], %k[p0]") + __ASM_EMIT("shufps $0x55, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[p1]") + __ASM_EMIT64("cvttss2si %[x0], %k[p1]") __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") : [p0] "+r" (p0), [p1] "+r" (p1), [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [pl] "r" (pl), - [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), - [IONE] "m" (IONE) + [ONE] "m" (ONE) : "cc" ); @@ -2469,7 +1900,6 @@ namespace lsp size_t colocation_x2_v1pv(const vector3d_t *pl, const point3d_t *pv) { float x0, x1, x2, x3; - float res[4] __lsp_aligned16; ARCH_X86_ASM ( @@ -2490,21 +1920,21 @@ namespace lsp __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL ? ? */ __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL ? ? */ - __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ - __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ - __ASM_EMIT("paddd %[x1], %[x0]") - __ASM_EMIT("movdqa %[x0], (%[res])") - __ASM_EMIT32("movl 0x00(%[res]), %[pl]") - __ASM_EMIT32("movl 0x04(%[res]), %[pv]") - __ASM_EMIT64("movl 0x00(%[res]), %k[pl]") - __ASM_EMIT64("movl 0x04(%[res]), %k[pv]") + __ASM_EMIT("andps %[ONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("andps %[ONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[pl]") + __ASM_EMIT64("cvttss2si %[x0], %k[pl]") + __ASM_EMIT("shufps $0x55, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[pv]") + __ASM_EMIT64("cvttss2si %[x0], %k[pv]") __ASM_EMIT("lea (%[pl], %[pv], 4), %[pl]") + : [pl] "+r" (pl), [pv] "+r" (pv), [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) - : [res] "r" (res), - [PTOL] "m" (X_3D_TOLERANCE), + : [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), - [IONE] "m" (IONE) + [ONE] "m" (ONE) : "cc" ); @@ -2514,7 +1944,6 @@ namespace lsp size_t colocation_x3_v1p3(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) { float x0, x1, x2, x3, x4; - float res[4] __lsp_aligned16; ARCH_X86_ASM ( @@ -2537,26 +1966,26 @@ namespace lsp __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ - __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ - __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ - __ASM_EMIT("paddd %[x1], %[x0]") - __ASM_EMIT("movdqa %[x0], (%[res])") - __ASM_EMIT32("movl 0x00(%[res]), %[p0]") - __ASM_EMIT32("movl 0x04(%[res]), %[p1]") - __ASM_EMIT32("movl 0x08(%[res]), %[p2]") - __ASM_EMIT64("movl 0x00(%[res]), %k[p0]") - __ASM_EMIT64("movl 0x04(%[res]), %k[p1]") - __ASM_EMIT64("movl 0x08(%[res]), %k[p2]") + __ASM_EMIT("andps %[ONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[ONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[p0]") + __ASM_EMIT64("cvttss2si %[x0], %k[p0]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[p1]") + __ASM_EMIT64("cvttss2si %[x0], %k[p1]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[p2]") + __ASM_EMIT64("cvttss2si %[x0], %k[p2]") __ASM_EMIT("lea (%[p1], %[p2], 4), %[p1]") __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") : [p0] "+r" (p0), [p1] "+r" (p1), [p2] "+r" (p2), [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) : [pl] "r" (pl), - [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), - [IONE] "m" (IONE) + [ONE] "m" (ONE) : "cc" ); @@ -2566,7 +1995,6 @@ namespace lsp size_t colocation_x3_v1pv(const vector3d_t *pl, const point3d_t *pv) { float x0, x1, x2, x3, x4; - float res[4] __lsp_aligned16; size_t pt; ARCH_X86_ASM @@ -2590,25 +2018,25 @@ namespace lsp __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ - __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ - __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ - __ASM_EMIT("paddd %[x1], %[x0]") - __ASM_EMIT("movdqa %[x0], (%[res])") - __ASM_EMIT32("movl 0x00(%[res]), %[pl]") - __ASM_EMIT32("movl 0x04(%[res]), %[pv]") - __ASM_EMIT32("movl 0x08(%[res]), %[pt]") - __ASM_EMIT64("movl 0x00(%[res]), %k[pl]") - __ASM_EMIT64("movl 0x04(%[res]), %k[pv]") - __ASM_EMIT64("movl 0x08(%[res]), %k[pt]") + __ASM_EMIT("andps %[ONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[ONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[pl]") + __ASM_EMIT64("cvttss2si %[x0], %k[pl]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[pv]") + __ASM_EMIT64("cvttss2si %[x0], %k[pv]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[pt]") + __ASM_EMIT64("cvttss2si %[x0], %k[pt]") __ASM_EMIT("lea (%[pv], %[pt], 4), %[pt]") __ASM_EMIT("lea (%[pl], %[pt], 4), %[pt]") : [pl] "+r" (pl), [pv] "+r" (pv), [pt] "=&r" (pt), [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) - : [res] "r" (res), - [PTOL] "m" (X_3D_TOLERANCE), + : [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), - [IONE] "m" (IONE) + [ONE] "m" (ONE) : "cc" ); @@ -2618,7 +2046,6 @@ namespace lsp size_t colocation_x3_v3p1(const vector3d_t *v0, const vector3d_t *v1, const vector3d_t *v2, const point3d_t *p) { float x0, x1, x2, x3, x4; - float res[4] __lsp_aligned16; ARCH_X86_ASM ( @@ -2641,16 +2068,17 @@ namespace lsp __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ - __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ - __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ - __ASM_EMIT("paddd %[x1], %[x0]") - __ASM_EMIT("movdqa %[x0], (%[res])") - __ASM_EMIT32("movl 0x00(%[res]), %[v0]") - __ASM_EMIT32("movl 0x04(%[res]), %[v1]") - __ASM_EMIT32("movl 0x08(%[res]), %[v2]") - __ASM_EMIT64("movl 0x00(%[res]), %k[v0]") - __ASM_EMIT64("movl 0x04(%[res]), %k[v1]") - __ASM_EMIT64("movl 0x08(%[res]), %k[v2]") + __ASM_EMIT("andps %[ONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[ONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[v0]") + __ASM_EMIT64("cvttss2si %[x0], %k[v0]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[v1]") + __ASM_EMIT64("cvttss2si %[x0], %k[v1]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[v2]") + __ASM_EMIT64("cvttss2si %[x0], %k[v2]") __ASM_EMIT("lea (%[v1], %[v2], 4), %[v1]") __ASM_EMIT("lea (%[v0], %[v1], 4), %[v0]") @@ -2658,10 +2086,9 @@ namespace lsp [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) : [p] "r" (p), - [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), - [IONE] "m" (IONE) + [ONE] "m" (ONE) : "cc" ); @@ -2671,7 +2098,6 @@ namespace lsp size_t colocation_x3_vvp1(const vector3d_t *vv, const point3d_t *p) { float x0, x1, x2, x3, x4; - float res[4] __lsp_aligned16; size_t pt; ARCH_X86_ASM @@ -2695,800 +2121,33 @@ namespace lsp __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ - __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ - __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ - __ASM_EMIT("paddd %[x1], %[x0]") - __ASM_EMIT("movdqa %[x0], (%[res])") - __ASM_EMIT32("movl 0x00(%[res]), %[vv]") - __ASM_EMIT32("movl 0x04(%[res]), %[p]") - __ASM_EMIT32("movl 0x08(%[res]), %[pt]") - __ASM_EMIT64("movl 0x00(%[res]), %k[vv]") - __ASM_EMIT64("movl 0x04(%[res]), %k[p]") - __ASM_EMIT64("movl 0x08(%[res]), %k[pt]") + __ASM_EMIT("andps %[ONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[ONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[vv]") + __ASM_EMIT64("cvttss2si %[x0], %k[vv]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[p]") + __ASM_EMIT64("cvttss2si %[x0], %k[p]") + __ASM_EMIT("shufps $0x39, %[x0], %[x0]") + __ASM_EMIT32("cvttss2si %[x0], %[pt]") + __ASM_EMIT64("cvttss2si %[x0], %k[pt]") __ASM_EMIT("lea (%[p], %[pt], 4), %[pt]") __ASM_EMIT("lea (%[vv], %[pt], 4), %[pt]") : [vv] "+r" (vv), [p] "+r" (p), [pt] "=&r" (pt), [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) - : [res] "r" (res), - [PTOL] "m" (X_3D_TOLERANCE), + : [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), - [IONE] "m" (IONE) + [ONE] "m" (ONE) : "cc" ); return pt; } - - float calc_min_distance_p3(const point3d_t *sp, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) - { - float x0, x1, x2, x3, x4; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[sp]), %[x3]") /* xmm3 = pl */ - __ASM_EMIT("movups (%[p0]), %[x0]") /* xmm0 = p0 */ - __ASM_EMIT("movups (%[p1]), %[x1]") /* xmm1 = p1 */ - __ASM_EMIT("movups (%[p2]), %[x2]") /* xmm2 = p2 */ - - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = d0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = d1 */ - __ASM_EMIT("mulps %[x0], %[x0]") /* xmm0 = d0 * d0 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = d2 */ - __ASM_EMIT("mulps %[x1], %[x1]") /* xmm1 = d1 * d1 */ - __ASM_EMIT("mulps %[x2], %[x2]") /* xmm2 = d2 * d2 */ - MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") - /* xmm0 = x0 x1 x2 ? */ - /* xmm1 = y0 y1 y2 ? */ - /* xmm2 = z0 z1 z2 ? */ - /* xmm3 = w0 w1 w2 ? */ - __ASM_EMIT("addps %[x1], %[x0]") - __ASM_EMIT("addps %[x3], %[x2]") - __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ - __ASM_EMIT("sqrtps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k1) sqrtf(k2) ? */ - __ASM_EMIT("movhlps %[x0], %[x1]") /* xmm1 = sqrtf(k2) */ - __ASM_EMIT("unpcklps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k0) sqrtf(k1) sqrtf(k1) */ - __ASM_EMIT("movhlps %[x0], %[x2]") /* xmm1 = sqrtf(k2) */ - __ASM_EMIT("minss %[x1], %[x0]") - __ASM_EMIT("minss %[x2], %[x0]") - - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) - : [sp] "r" (sp), [p0] "r" (p0), [p1] "r" (p1), [p2] "r" (p2) - : - ); - - return x0; - } - - float calc_min_distance_pv(const point3d_t *sp, const point3d_t *pv) - { - float x0, x1, x2, x3, x4; - - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[sp]), %[x3]") /* xmm3 = pl */ - __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ - __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ - __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ - - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = d0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = d1 */ - __ASM_EMIT("mulps %[x0], %[x0]") /* xmm0 = d0 * d0 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = d2 */ - __ASM_EMIT("mulps %[x1], %[x1]") /* xmm1 = d1 * d1 */ - __ASM_EMIT("mulps %[x2], %[x2]") /* xmm2 = d2 * d2 */ - MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") - /* xmm0 = x0 x1 x2 ? */ - /* xmm1 = y0 y1 y2 ? */ - /* xmm2 = z0 z1 z2 ? */ - /* xmm3 = w0 w1 w2 ? */ - __ASM_EMIT("addps %[x1], %[x0]") - __ASM_EMIT("addps %[x3], %[x2]") - __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ - __ASM_EMIT("sqrtps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k1) sqrtf(k2) ? */ - __ASM_EMIT("movhlps %[x0], %[x1]") /* xmm1 = sqrtf(k2) */ - __ASM_EMIT("unpcklps %[x0], %[x0]") /* xmm0 = sqrtf(k0) sqrtf(k0) sqrtf(k1) sqrtf(k1) */ - __ASM_EMIT("movhlps %[x0], %[x2]") /* xmm1 = sqrtf(k2) */ - __ASM_EMIT("minss %[x1], %[x0]") - __ASM_EMIT("minss %[x2], %[x0]") - - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) - : [sp] "r" (sp), [pv] "r" (pv) - : - ); - - return x0; - } - - void split_triangle_raw( - raw_triangle_t *out, - size_t *n_out, - raw_triangle_t *in, - size_t *n_in, - const vector3d_t *pl, - const raw_triangle_t *pv - ) - { - float x0, x1, x2, x3, x4, x5, x6, x7; - float k[4] __lsp_aligned16; - size_t t0; - - in += *n_in; - out += *n_out; - - // Estimate co-location of triangle and point - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ - __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ - __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ - __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ - - __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl */ - __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl */ - __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl */ - MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") - - __ASM_EMIT("addps %[x1], %[x0]") - __ASM_EMIT("addps %[x3], %[x2]") - __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ - __ASM_EMIT("movaps %[x0], (%[k])") /* *k = xmm0 */ - __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ - __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ - __ASM_EMIT("pand %[ICULL3], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ - __ASM_EMIT("pand %[ICULL3], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ - __ASM_EMIT("paddd %[x1], %[x0]") /* xmm0 = x0 x1 x2 0 */ - __ASM_EMIT("movdqa %[x0], %[x2]") /* xmm2 = x0 x1 x2 0 */ - __ASM_EMIT("movdqa %[x0], %[x1]") /* xmm1 = x0 x1 x2 0 */ - __ASM_EMIT("psrldq $8, %[x2]") /* xmm2 = x2 0 0 0 */ - __ASM_EMIT("psrldq $4, %[x1]") /* xmm1 = x1 x2 0 0 */ - __ASM_EMIT("por %[x2], %[x0]") - __ASM_EMIT("por %[x1], %[x0]") - __ASM_EMIT32("movd %[x0], %[t0]") - __ASM_EMIT64("movd %[x0], %k[t0]") - : [t0] "=&r" (t0), - [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) - : [pl] "r" (pl), [pv] "r" (pv), - [k] "r" (k), - [PTOL] "m" (X_3D_TOLERANCE), - [MTOL] "m" (X_3D_MTOLERANCE), - [ICULL3] "m" (ICULL3) - : "cc" - ); - - #define STR_COPY_TO(tgt) \ - ARCH_X86_ASM( \ - __ASM_EMIT("movups 0x00(%[src]), %[x0]") \ - __ASM_EMIT("movups 0x10(%[src]), %[x1]") \ - __ASM_EMIT("movups 0x20(%[src]), %[x2]") \ - __ASM_EMIT("movups %[x0], 0x00(%[dst])") \ - __ASM_EMIT("movups %[x1], 0x10(%[dst])") \ - __ASM_EMIT("movups %[x2], 0x20(%[dst])") \ - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) \ - : [dst] "r" (tgt), \ - [src] "r" (pv) \ - : "cc", "memory" \ - ); - - #define STR_SPLIT_1P(off0, off1, koff, store) \ - ARCH_X86_ASM( \ - __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ - __ASM_EMIT("movups 0x" off1 "(%[st]), %[x1]") /* xmm1 = p1 = lx1 ly1 lz1 1 */ \ - __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm2 = pl = nx ny nz nw */ \ - \ - __ASM_EMIT("subps %[x0], %[x1]") /* xmm1 = d = p1 - p0 = dx dy dz 0 */ \ - __ASM_EMIT("movss 0x" koff "(%[k]), %[x3]") /* xmm3 = k 0 0 0 */ \ - __ASM_EMIT("mulps %[x1], %[x2]") /* xmm2 = dx*nx dy*ny dz*nz 0 */ \ - __ASM_EMIT("shufps $0x00, %[x3], %[x3]") /* xmm3 = k k k k */ \ - __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dz*nz 0 ? ? */ \ - __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dz*nz dy*ny ? ? */ \ - __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = dx*nx+dz*nz dx*nx+dz*nz dy*ny dy*ny */ \ - __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = k*dx k*dy k*dz 0 */ \ - __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dy*ny dy*ny ? ? */ \ - __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dy*ny+dw*nw dx*nx+dy*ny+dw*nw ? ? = b b ? ? */ \ - __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = b b b b */ \ - __ASM_EMIT("divps %[x2], %[x1]") /* xmm1 = k*dx/b k*dy/b k*dz/b 0 */ \ - __ASM_EMIT("subps %[x1], %[x0]") /* xmm0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ - \ - store \ - \ - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ - : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ - [k] "r" (k) \ - : "cc", "memory" \ - ); - - #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ - ARCH_X86_ASM( \ - __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ - __ASM_EMIT("movups 0x" off1 "(%[st]), %[x2]") /* xmm2 = p1 = lx1 ly1 lz1 1 */ \ - __ASM_EMIT("movups 0x" off2 "(%[st]), %[x3]") /* xmm3 = p2 = lx2 ly2 lz2 1 */ \ - __ASM_EMIT("movups (%[pl]), %[x4]") /* xmm4 = pl = nx ny nz nw */ \ - \ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = pl = nx ny nz nw */ \ - __ASM_EMIT("movaps %[x4], %[x5]") /* xmm5 = pl = nx ny nz nw */ \ - __ASM_EMIT("subps %[x0], %[x2]") /* xmm2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ - __ASM_EMIT("subps %[x1], %[x3]") /* xmm3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ - __ASM_EMIT("mulps %[x2], %[x4]") /* xmm4 = dx1*nx dy1*ny dz1*nz 0 */ \ - __ASM_EMIT("mulps %[x3], %[x5]") /* xmm5 = dx2*nx dy2*ny dz2*nz 0 */ \ - __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dz1*nz 0 ? ? */ \ - __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dz2*nz 0 ? ? */ \ - __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dz1*nz dy1*ny ? ? */ \ - __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx1*nx+dz1*nz dy1*ny ? ? */ \ - __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = dx1*nx+dz1*nz dx1*nx+dz1*nz dy1*ny dy1*ny */ \ - __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = dx2*nx+dz2*nz dx2*nx+dz2*nz dy2*ny dy2*ny */ \ - __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dy1*ny dy1*ny ? ? */ \ - __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dy2*ny dy2*ny ? ? */ \ - __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dy1*ny+dz1*nz dx1*nx+dy1*ny+dz1*nz ? ? = b1 b1 ? ? */ \ - __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx2*nx+dy2*ny+dz2*nz dx2*nx+dy2*ny+dz2*nz ? ? = b2 b2 ? ? */ \ - __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = b1 b1 b1 b1 */ \ - __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = b2 b2 b2 b2 */ \ - __ASM_EMIT("movss 0x" koff "(%[k]), %[x6]") /* xmm6 = k */ \ - __ASM_EMIT("divps %[x4], %[x2]") /* xmm2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ - __ASM_EMIT("shufps $0x00, %[x6], %[x6]") /* xmm6 = k k k k */ \ - __ASM_EMIT("divps %[x5], %[x3]") /* xmm3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ - __ASM_EMIT("mulps %[x6], %[x2]") /* xmm2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ - __ASM_EMIT("mulps %[x6], %[x3]") /* xmm3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = lx1-k*dx2/b2 ly1-k*dy2/b2 lz1-k*dz2/b2 1 */ \ - \ - store \ - \ - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ - [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ - : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ - [k] "r" (k) \ - : "cc", "memory" \ - ); - - switch (t0) - { - // 0 intersections, triangle is above - case 0x00: // 0 0 0 - case 0x01: // 0 0 1 - case 0x04: // 0 1 0 - case 0x05: // 0 1 1 - case 0x10: // 1 0 0 - case 0x11: // 1 0 1 - case 0x14: // 1 1 0 - case 0x15: // 1 1 1 - STR_COPY_TO(out); - ++(*n_out); - break; - - // 0 intersections, triangle is below - case 0x16: // 1 1 2 - case 0x19: // 1 2 1 - case 0x1a: // 1 2 2 - case 0x25: // 2 1 1 - case 0x26: // 2 1 2 - case 0x29: // 2 2 1 - case 0x2a: // 2 2 2 - STR_COPY_TO(in); - ++(*n_in); - break; - - // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise - case 0x06: // 0 1 2 - STR_SPLIT_1P("00", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x1], 0x00(%[in])") - __ASM_EMIT("movups %[x2], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x2], 0x00(%[out])") - __ASM_EMIT("movups %[x3], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - ); - ++(*n_out); ++(*n_in); - break; - case 0x21: // 2 0 1 - STR_SPLIT_1P("00", "10", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x2], 0x00(%[out])") - __ASM_EMIT("movups %[x0], 0x10(%[out])") - __ASM_EMIT("movups %[x1], 0x20(%[out])") - ); - ++(*n_out); ++(*n_in); - break; - case 0x18: // 1 2 0 - STR_SPLIT_1P("10", "20", "04", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x3], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x1], 0x00(%[out])") - __ASM_EMIT("movups %[x0], 0x10(%[out])") - __ASM_EMIT("movups %[x3], 0x20(%[out])") - ); - ++(*n_out); ++(*n_in); - break; - - // 1 intersection, 1 triangle above, 1 triangle below, clockwise - case 0x24: // 2 1 0 - STR_SPLIT_1P("00", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - __ASM_EMIT("movups %[x1], 0x00(%[out])") - __ASM_EMIT("movups %[x2], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - ); - ++(*n_out); ++(*n_in); - break; - case 0x12: // 1 0 2 - STR_SPLIT_1P("00", "10", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x1], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x3], 0x20(%[in])") - __ASM_EMIT("movups %[x2], 0x00(%[out])") - __ASM_EMIT("movups %[x3], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - ); - ++(*n_out); ++(*n_in); - break; - case 0x09: // 0 2 1 - STR_SPLIT_1P("10", "20", "04", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - __ASM_EMIT("movups %[x3], 0x00(%[out])") - __ASM_EMIT("movups %[x1], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - ); - ++(*n_out); ++(*n_in); - break; - - // 2 intersections, 1 triangle below, 2 triangles above - case 0x02: // 0 0 2 - STR_SPLIT_2P("00", "10", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - __ASM_EMIT("movups %[x3], 0x00(%[out])") - __ASM_EMIT("movups %[x1], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - __ASM_EMIT("movups %[x4], 0x30(%[out])") - __ASM_EMIT("movups %[x1], 0x40(%[out])") - __ASM_EMIT("movups %[x3], 0x50(%[out])") - ); - (*n_out) += 2; ++(*n_in); - break; - case 0x08: // 0 2 0 - STR_SPLIT_2P("10", "00", "20", "04", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x4], 0x00(%[out])") - __ASM_EMIT("movups %[x0], 0x10(%[out])") - __ASM_EMIT("movups %[x1], 0x20(%[out])") - __ASM_EMIT("movups %[x2], 0x30(%[out])") - __ASM_EMIT("movups %[x0], 0x40(%[out])") - __ASM_EMIT("movups %[x4], 0x50(%[out])") - ); - (*n_out) += 2; ++(*n_in); - break; - case 0x20: // 2 0 0 - STR_SPLIT_2P("20", "00", "10", "08", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x4], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - __ASM_EMIT("movups %[x2], 0x00(%[out])") - __ASM_EMIT("movups %[x1], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - __ASM_EMIT("movups %[x3], 0x30(%[out])") - __ASM_EMIT("movups %[x1], 0x40(%[out])") - __ASM_EMIT("movups %[x2], 0x50(%[out])") - ); - (*n_out) += 2; ++(*n_in); - break; - - // 2 intersections, 1 triangle above, 2 triangles below - case 0x28: // 2 2 0 - STR_SPLIT_2P("00", "10", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x4], 0x30(%[in])") - __ASM_EMIT("movups %[x1], 0x40(%[in])") - __ASM_EMIT("movups %[x3], 0x50(%[in])") - __ASM_EMIT("movups %[x2], 0x00(%[out])") - __ASM_EMIT("movups %[x0], 0x10(%[out])") - __ASM_EMIT("movups %[x1], 0x20(%[out])") - ); - ++(*n_out); (*n_in) += 2; - break; - - case 0x22: // 2 0 2 - STR_SPLIT_2P("10", "00", "20", "04", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x4], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - __ASM_EMIT("movups %[x2], 0x30(%[in])") - __ASM_EMIT("movups %[x0], 0x40(%[in])") - __ASM_EMIT("movups %[x4], 0x50(%[in])") - __ASM_EMIT("movups %[x3], 0x00(%[out])") - __ASM_EMIT("movups %[x1], 0x10(%[out])") - __ASM_EMIT("movups %[x0], 0x20(%[out])") - ); - ++(*n_out); (*n_in) += 2; - break; - - case 0x0a: // 0 2 2 - STR_SPLIT_2P("20", "00", "10", "08", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x3], 0x30(%[in])") - __ASM_EMIT("movups %[x1], 0x40(%[in])") - __ASM_EMIT("movups %[x2], 0x50(%[in])") - __ASM_EMIT("movups %[x4], 0x00(%[out])") - __ASM_EMIT("movups %[x0], 0x10(%[out])") - __ASM_EMIT("movups %[x1], 0x20(%[out])") - ); - ++(*n_out); (*n_in) += 2; - break; - - default: - break; - } - - #undef STR_COPY_TO - #undef STR_SPLIT_1P - #undef STR_SPLIT_2P - } - - void cull_triangle_raw( - raw_triangle_t *in, - size_t *n_in, - const vector3d_t *pl, - const raw_triangle_t *pv - ) - { - float x0, x1, x2, x3, x4, x5, x6, x7; - float k[4] __lsp_aligned16; - size_t t0; - - in += *n_in; - - // Estimate co-location of triangle and point - ARCH_X86_ASM - ( - __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ - __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ - __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ - __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ - - __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl */ - __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl */ - __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl */ - MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") - - __ASM_EMIT("addps %[x1], %[x0]") - __ASM_EMIT("addps %[x3], %[x2]") - __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ - __ASM_EMIT("movaps %[x0], (%[k])") /* *k = xmm0 */ - __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ - __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ - __ASM_EMIT("pand %[ICULL3], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ - __ASM_EMIT("pand %[ICULL3], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ - __ASM_EMIT("paddd %[x1], %[x0]") /* xmm0 = x0 x1 x2 0 */ - __ASM_EMIT("movdqa %[x0], %[x2]") /* xmm2 = x0 x1 x2 0 */ - __ASM_EMIT("movdqa %[x0], %[x1]") /* xmm1 = x0 x1 x2 0 */ - __ASM_EMIT("psrldq $8, %[x2]") /* xmm2 = x2 0 0 0 */ - __ASM_EMIT("psrldq $4, %[x1]") /* xmm1 = x1 x2 0 0 */ - __ASM_EMIT("por %[x2], %[x0]") - __ASM_EMIT("por %[x1], %[x0]") - __ASM_EMIT32("movd %[x0], %[t0]") - __ASM_EMIT64("movd %[x0], %k[t0]") - : [t0] "=&r" (t0), - [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) - : [pl] "r" (pl), [pv] "r" (pv), - [k] "r" (k), - [PTOL] "m" (X_3D_TOLERANCE), - [MTOL] "m" (X_3D_MTOLERANCE), - [ICULL3] "m" (ICULL3) - : "cc" - ); - - #define STR_COPY_TO(tgt) \ - ARCH_X86_ASM( \ - __ASM_EMIT("movups 0x00(%[src]), %[x0]") \ - __ASM_EMIT("movups 0x10(%[src]), %[x1]") \ - __ASM_EMIT("movups 0x20(%[src]), %[x2]") \ - __ASM_EMIT("movups %[x0], 0x00(%[dst])") \ - __ASM_EMIT("movups %[x1], 0x10(%[dst])") \ - __ASM_EMIT("movups %[x2], 0x20(%[dst])") \ - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) \ - : [dst] "r" (tgt), \ - [src] "r" (pv) \ - : "cc", "memory" \ - ); - - #define STR_SPLIT_1P(off0, off1, koff, store) \ - ARCH_X86_ASM( \ - __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ - __ASM_EMIT("movups 0x" off1 "(%[st]), %[x1]") /* xmm1 = p1 = lx1 ly1 lz1 1 */ \ - __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm2 = pl = nx ny nz nw */ \ - \ - __ASM_EMIT("subps %[x0], %[x1]") /* xmm1 = d = p1 - p0 = dx dy dz 0 */ \ - __ASM_EMIT("movss 0x" koff "(%[k]), %[x3]") /* xmm3 = k 0 0 0 */ \ - __ASM_EMIT("mulps %[x1], %[x2]") /* xmm2 = dx*nx dy*ny dz*nz 0 */ \ - __ASM_EMIT("shufps $0x00, %[x3], %[x3]") /* xmm3 = k k k k */ \ - __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dz*nz 0 ? ? */ \ - __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dz*nz dy*ny ? ? */ \ - __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = dx*nx+dz*nz dx*nx+dz*nz dy*ny dy*ny */ \ - __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = k*dx k*dy k*dz 0 */ \ - __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dy*ny dy*ny ? ? */ \ - __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dy*ny+dw*nw dx*nx+dy*ny+dw*nw ? ? = b b ? ? */ \ - __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = b b b b */ \ - __ASM_EMIT("divps %[x2], %[x1]") /* xmm1 = k*dx/b k*dy/b k*dz/b 0 */ \ - __ASM_EMIT("subps %[x1], %[x0]") /* xmm0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ - \ - store \ - \ - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ - : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ - [k] "r" (k) \ - : "cc", "memory" \ - ); - - #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ - ARCH_X86_ASM( \ - __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ - __ASM_EMIT("movups 0x" off1 "(%[st]), %[x2]") /* xmm2 = p1 = lx1 ly1 lz1 1 */ \ - __ASM_EMIT("movups 0x" off2 "(%[st]), %[x3]") /* xmm3 = p2 = lx2 ly2 lz2 1 */ \ - __ASM_EMIT("movups (%[pl]), %[x4]") /* xmm4 = pl = nx ny nz nw */ \ - \ - __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = pl = nx ny nz nw */ \ - __ASM_EMIT("movaps %[x4], %[x5]") /* xmm5 = pl = nx ny nz nw */ \ - __ASM_EMIT("subps %[x0], %[x2]") /* xmm2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ - __ASM_EMIT("subps %[x1], %[x3]") /* xmm3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ - __ASM_EMIT("mulps %[x2], %[x4]") /* xmm4 = dx1*nx dy1*ny dz1*nz 0 */ \ - __ASM_EMIT("mulps %[x3], %[x5]") /* xmm5 = dx2*nx dy2*ny dz2*nz 0 */ \ - __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dz1*nz 0 ? ? */ \ - __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dz2*nz 0 ? ? */ \ - __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dz1*nz dy1*ny ? ? */ \ - __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx1*nx+dz1*nz dy1*ny ? ? */ \ - __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = dx1*nx+dz1*nz dx1*nx+dz1*nz dy1*ny dy1*ny */ \ - __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = dx2*nx+dz2*nz dx2*nx+dz2*nz dy2*ny dy2*ny */ \ - __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dy1*ny dy1*ny ? ? */ \ - __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dy2*ny dy2*ny ? ? */ \ - __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dy1*ny+dz1*nz dx1*nx+dy1*ny+dz1*nz ? ? = b1 b1 ? ? */ \ - __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx2*nx+dy2*ny+dz2*nz dx2*nx+dy2*ny+dz2*nz ? ? = b2 b2 ? ? */ \ - __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = b1 b1 b1 b1 */ \ - __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = b2 b2 b2 b2 */ \ - __ASM_EMIT("movss 0x" koff "(%[k]), %[x6]") /* xmm6 = k */ \ - __ASM_EMIT("divps %[x4], %[x2]") /* xmm2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ - __ASM_EMIT("shufps $0x00, %[x6], %[x6]") /* xmm6 = k k k k */ \ - __ASM_EMIT("divps %[x5], %[x3]") /* xmm3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ - __ASM_EMIT("mulps %[x6], %[x2]") /* xmm2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ - __ASM_EMIT("mulps %[x6], %[x3]") /* xmm3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ - __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = lx1-k*dx2/b2 ly1-k*dy2/b2 lz1-k*dz2/b2 1 */ \ - \ - store \ - \ - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ - [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ - : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ - [k] "r" (k) \ - : "cc", "memory" \ - ); - - switch (t0) - { - // 0 intersections, triangle is above - case 0x00: // 0 0 0 - case 0x01: // 0 0 1 - case 0x04: // 0 1 0 - case 0x05: // 0 1 1 - case 0x10: // 1 0 0 - case 0x11: // 1 0 1 - case 0x14: // 1 1 0 - case 0x15: // 1 1 1 - break; - - // 0 intersections, triangle is below - case 0x16: // 1 1 2 - case 0x19: // 1 2 1 - case 0x1a: // 1 2 2 - case 0x25: // 2 1 1 - case 0x26: // 2 1 2 - case 0x29: // 2 2 1 - case 0x2a: // 2 2 2 - STR_COPY_TO(in); - ++(*n_in); - break; - - // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise - case 0x06: // 0 1 2 - STR_SPLIT_1P("00", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups %[x1], 0x00(%[in])") - __ASM_EMIT("movups %[x2], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - ); - ++(*n_in); - break; - case 0x21: // 2 0 1 - STR_SPLIT_1P("00", "10", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - ); - ++(*n_in); - break; - case 0x18: // 1 2 0 - STR_SPLIT_1P("10", "20", "04", - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x3], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - ); - ++(*n_in); - break; - - // 1 intersection, 1 triangle above, 1 triangle below, clockwise - case 0x24: // 2 1 0 - STR_SPLIT_1P("00", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - ); - ++(*n_in); - break; - case 0x12: // 1 0 2 - STR_SPLIT_1P("00", "10", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x20(%[st]), %[x3]") - __ASM_EMIT("movups %[x1], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x3], 0x20(%[in])") - ); - ++(*n_in); - break; - case 0x09: // 0 2 1 - STR_SPLIT_1P("10", "20", "04", - __ASM_EMIT("movups 0x00(%[st]), %[x1]") - __ASM_EMIT("movups 0x10(%[st]), %[x2]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - ); - ++(*n_in); - break; - - // 2 intersections, 1 triangle below, 2 triangles above - case 0x02: // 0 0 2 - STR_SPLIT_2P("00", "10", "20", "00", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - ); - ++(*n_in); - break; - case 0x08: // 0 2 0 - STR_SPLIT_2P("10", "00", "20", "04", - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - ); - ++(*n_in); - break; - case 0x20: // 2 0 0 - STR_SPLIT_2P("20", "00", "10", "08", - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x4], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - ); - ++(*n_in); - break; - - // 2 intersections, 1 triangle above, 2 triangles below - case 0x28: // 2 2 0 - STR_SPLIT_2P("00", "10", "20", "00", - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x3], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x4], 0x30(%[in])") - __ASM_EMIT("movups %[x1], 0x40(%[in])") - __ASM_EMIT("movups %[x3], 0x50(%[in])") - ); - (*n_in) += 2; - break; - - case 0x22: // 2 0 2 - STR_SPLIT_2P("10", "00", "20", "04", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x20(%[st]), %[x4]") - __ASM_EMIT("movups %[x4], 0x00(%[in])") - __ASM_EMIT("movups %[x0], 0x10(%[in])") - __ASM_EMIT("movups %[x1], 0x20(%[in])") - __ASM_EMIT("movups %[x2], 0x30(%[in])") - __ASM_EMIT("movups %[x0], 0x40(%[in])") - __ASM_EMIT("movups %[x4], 0x50(%[in])") - ); - (*n_in) += 2; - break; - - case 0x0a: // 0 2 2 - STR_SPLIT_2P("20", "00", "10", "08", - __ASM_EMIT("movups 0x00(%[st]), %[x2]") - __ASM_EMIT("movups 0x10(%[st]), %[x3]") - __ASM_EMIT("movups %[x2], 0x00(%[in])") - __ASM_EMIT("movups %[x1], 0x10(%[in])") - __ASM_EMIT("movups %[x0], 0x20(%[in])") - __ASM_EMIT("movups %[x3], 0x30(%[in])") - __ASM_EMIT("movups %[x1], 0x40(%[in])") - __ASM_EMIT("movups %[x2], 0x50(%[in])") - ); - (*n_in) += 2; - break; - - default: - break; - } - - #undef STR_COPY_TO - #undef STR_SPLIT_1P - #undef STR_SPLIT_2P - } - } -} + } /* namespace sse */ +} /* namespace lsp */ #undef SCALAR_MUL #undef MAT3_TRANSPOSE @@ -3501,6 +2160,5 @@ namespace lsp #undef VECTOR_MUL3 #undef VECTOR_MUL #undef VECTOR_XCHG -#undef CALC_COSINE2V #endif /* PRIVATE_DSP_ARCH_X86_SSE_3DMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/3dmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/3dmath.h 2025-08-26 18:15:43.746003097 +0000 @@ -0,0 +1,1105 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 17 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_3DMATH_H_ +#define PRIVATE_DSP_ARCH_X86_SSE2_3DMATH_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_IMPL */ + +/* 1x matrix transpose + * Input: + * x0 = row 0 (a1 a2 a3 a4) + * x1 = row 1 (b1 b2 b3 b4) + * x2 = row 2 (c1 c2 c3 c4) + * x3 = row 3 (d1 d2 d3 d4) + * x4 = temporary + * + * Output: + * x0 = row 0 (a1 b1 c1 d1) + * x1 = row 1 (a2 b2 c2 d2) + * x2 = row 2 (a3 b3 c3 d3) + * x3 = row 3 (a4 b4 c4 d4) + */ +#define MAT4_TRANSPOSE(x0, x1, x2, x3, x4) \ + __ASM_EMIT("movaps %" x2 ", %" x4) /* xmm4 = c1 c2 c3 c4 */ \ + __ASM_EMIT("punpckldq %" x3 ", %" x2) /* xmm2 = c1 d1 c2 d2 */ \ + __ASM_EMIT("punpckhdq %" x3 ", %" x4) /* xmm4 = c3 d3 c4 d4 */ \ + __ASM_EMIT("movaps %" x0 ", %" x3) /* xmm3 = a1 a2 a3 a4 */ \ + __ASM_EMIT("punpckldq %" x1 ", %" x0) /* xmm0 = a1 b1 a2 b2 */ \ + __ASM_EMIT("punpckhdq %" x1 ", %" x3) /* xmm3 = a3 b3 a4 b4 */ \ + __ASM_EMIT("movaps %" x0 ", %" x1) /* xmm1 = a1 b2 a2 b2 */ \ + __ASM_EMIT("punpcklqdq %" x2 ", %" x0) /* xmm0 = a1 b1 c1 d1 */ \ + __ASM_EMIT("punpckhqdq %" x2 ", %" x1) /* xmm1 = a2 b2 c2 d2 */ \ + __ASM_EMIT("movaps %" x3 ", %" x2) /* xmm2 = a3 b3 a4 b4 */ \ + __ASM_EMIT("punpcklqdq %" x4 ", %" x2) /* xmm2 = a3 b3 c3 d3 */ \ + __ASM_EMIT("punpckhqdq %" x4 ", %" x3) /* xmm3 = a4 b4 c4 d4 */ + +#define MATRIX_LOAD(ptr, x0, x1, x2, x3) \ + __ASM_EMIT("movups 0x00(%[" ptr "]), %" x0 ) \ + __ASM_EMIT("movups 0x10(%[" ptr "]), %" x1 ) \ + __ASM_EMIT("movups 0x20(%[" ptr "]), %" x2 ) \ + __ASM_EMIT("movups 0x30(%[" ptr "]), %" x3 ) + +#define MATRIX_STORE(ptr, x0, x1, x2, x3) \ + __ASM_EMIT("movups %" x0 ", 0x00(%[" ptr "])") \ + __ASM_EMIT("movups %" x1 ", 0x10(%[" ptr "])") \ + __ASM_EMIT("movups %" x2 ", 0x20(%[" ptr "])") \ + __ASM_EMIT("movups %" x3 ", 0x30(%[" ptr "])") + +namespace lsp +{ + namespace sse2 + { + using namespace dsp; + + IF_ARCH_X86( + static const float X_3D_TOLERANCE[] __lsp_aligned16 = { LSP_DSP_VEC4(DSP_3D_TOLERANCE) }; + static const float X_3D_MTOLERANCE[] __lsp_aligned16 = { LSP_DSP_VEC4(-DSP_3D_TOLERANCE) }; + + static const uint32_t IONE[] __lsp_aligned16 = { LSP_DSP_VEC4(1) }; + + static const uint32_t ICULL3[] __lsp_aligned16 = { 0x01, 0x04, 0x10, 0 }; + ) + + size_t colocation_x2_v1p2(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1) + { + float x0, x1, x2, x3; + float res[4] __lsp_aligned16; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm3 = pl */ + __ASM_EMIT("movups (%[p0]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups (%[p1]), %[x1]") /* xmm1 = p1 */ + + __ASM_EMIT("mulps %[x2], %[x0]") /* xmm0 = x0*px y0*py z0*pz w0*pw */ + __ASM_EMIT("mulps %[x2], %[x1]") /* xmm1 = x1*px y1*py z1*pz w1*pw */ + __ASM_EMIT("movaps %[x0], %[x3]") /* xmm3 = x0*px y0*py z0*pz w0*pw */ + __ASM_EMIT("movlhps %[x1], %[x0]") /* xmm0 = x0*px y0*py x1*px y1*py */ + __ASM_EMIT("movhlps %[x3], %[x1]") /* xmm1 = z0*pz w0*pw z1*pz w1*pw */ + __ASM_EMIT("addps %[x1], %[x0]") /* xmm0 = x0*px+z0*pz y0*py+w0*pw x1*px+z1*pz y1*py+w1*pw */ + __ASM_EMIT("shufps $0xd8, %[x0], %[x0]") /* xmm0 = x0*px+z0*pz x1*px+z1*pz y0*py+w0*pw y1*py+w1*pw */ + __ASM_EMIT("movhlps %[x0], %[x1]") /* xmm1 = y0*py+w0*pw y1*py+w1*pw ? ? */ + __ASM_EMIT("addps %[x1], %[x0]") /* xmm0 = x0*px+y0*py+z0*pz+w0*pw x1*px+y1*py+z1*pz+w1*pw ? ? = k0 k1 ? ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 ? ? */ + + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("paddd %[x1], %[x0]") + __ASM_EMIT("movdqa %[x0], (%[res])") + __ASM_EMIT32("movl 0x00(%[res]), %[p0]") + __ASM_EMIT32("movl 0x04(%[res]), %[p1]") + __ASM_EMIT64("movl 0x00(%[res]), %k[p0]") + __ASM_EMIT64("movl 0x04(%[res]), %k[p1]") + __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") + : [p0] "+r" (p0), [p1] "+r" (p1), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [pl] "r" (pl), + [res] "r" (res), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc" + ); + + return size_t(p0); + } + + size_t colocation_x2_v1pv(const vector3d_t *pl, const point3d_t *pv) + { + float x0, x1, x2, x3; + float res[4] __lsp_aligned16; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + + __ASM_EMIT("mulps %[x2], %[x0]") /* xmm0 = x0*px y0*py z0*pz w0*pw */ + __ASM_EMIT("mulps %[x2], %[x1]") /* xmm1 = x1*px y1*py z1*pz w1*pw */ + __ASM_EMIT("movaps %[x0], %[x3]") /* xmm3 = x0*px y0*py z0*pz w0*pw */ + __ASM_EMIT("movlhps %[x1], %[x0]") /* xmm0 = x0*px y0*py x1*px y1*py */ + __ASM_EMIT("movhlps %[x3], %[x1]") /* xmm1 = z0*pz w0*pw z1*pz w1*pw */ + __ASM_EMIT("addps %[x1], %[x0]") /* xmm0 = x0*px+z0*pz y0*py+w0*pw x1*px+z1*pz y1*py+w1*pw */ + __ASM_EMIT("shufps $0xd8, %[x0], %[x0]") /* xmm0 = x0*px+z0*pz x1*px+z1*pz y0*py+w0*pw y1*py+w1*pw */ + __ASM_EMIT("movhlps %[x0], %[x1]") /* xmm1 = y0*py+w0*pw y1*py+w1*pw ? ? */ + __ASM_EMIT("addps %[x1], %[x0]") /* xmm0 = x0*px+y0*py+z0*pz+w0*pw x1*px+y1*py+z1*pz+w1*pw ? ? = k0 k1 ? ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 ? ? */ + + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL ? ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL ? ? */ + __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] ? ? */ + __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] ? ? */ + __ASM_EMIT("paddd %[x1], %[x0]") + __ASM_EMIT("movdqa %[x0], (%[res])") + __ASM_EMIT32("movl 0x00(%[res]), %[pl]") + __ASM_EMIT32("movl 0x04(%[res]), %[pv]") + __ASM_EMIT64("movl 0x00(%[res]), %k[pl]") + __ASM_EMIT64("movl 0x04(%[res]), %k[pv]") + __ASM_EMIT("lea (%[pl], %[pv], 4), %[pl]") + : [pl] "+r" (pl), [pv] "+r" (pv), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) + : [res] "r" (res), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc" + ); + + return size_t(pl); + } + + size_t colocation_x3_v1p3(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) + { + float x0, x1, x2, x3, x4; + float res[4] __lsp_aligned16; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups (%[p0]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups (%[p1]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups (%[p2]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + /* xmm0 = x0 x1 x2 ? */ + /* xmm1 = y0 y1 y2 ? */ + /* xmm2 = z0 z1 z2 ? */ + /* xmm3 = w0 w1 w2 ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ + __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("paddd %[x1], %[x0]") + __ASM_EMIT("movdqa %[x0], (%[res])") + __ASM_EMIT32("movl 0x00(%[res]), %[p0]") + __ASM_EMIT32("movl 0x04(%[res]), %[p1]") + __ASM_EMIT32("movl 0x08(%[res]), %[p2]") + __ASM_EMIT64("movl 0x00(%[res]), %k[p0]") + __ASM_EMIT64("movl 0x04(%[res]), %k[p1]") + __ASM_EMIT64("movl 0x08(%[res]), %k[p2]") + __ASM_EMIT("lea (%[p1], %[p2], 4), %[p1]") + __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") + : [p0] "+r" (p0), [p1] "+r" (p1), [p2] "+r" (p2), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), + [res] "r" (res), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc" + ); + + return size_t(p0); + } + + size_t colocation_x3_v1pv(const vector3d_t *pl, const point3d_t *pv) + { + float x0, x1, x2, x3, x4; + float res[4] __lsp_aligned16; + size_t pt; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + /* xmm0 = x0 x1 x2 ? */ + /* xmm1 = y0 y1 y2 ? */ + /* xmm2 = z0 z1 z2 ? */ + /* xmm3 = w0 w1 w2 ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ + __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("paddd %[x1], %[x0]") + __ASM_EMIT("movdqa %[x0], (%[res])") + __ASM_EMIT32("movl 0x00(%[res]), %[pl]") + __ASM_EMIT32("movl 0x04(%[res]), %[pv]") + __ASM_EMIT32("movl 0x08(%[res]), %[pt]") + __ASM_EMIT64("movl 0x00(%[res]), %k[pl]") + __ASM_EMIT64("movl 0x04(%[res]), %k[pv]") + __ASM_EMIT64("movl 0x08(%[res]), %k[pt]") + __ASM_EMIT("lea (%[pv], %[pt], 4), %[pt]") + __ASM_EMIT("lea (%[pl], %[pt], 4), %[pt]") + : [pl] "+r" (pl), [pv] "+r" (pv), [pt] "=&r" (pt), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [res] "r" (res), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc" + ); + + return pt; + } + + size_t colocation_x3_v3p1(const vector3d_t *v0, const vector3d_t *v1, const vector3d_t *v2, const point3d_t *p) + { + float x0, x1, x2, x3, x4; + float res[4] __lsp_aligned16; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = p */ + __ASM_EMIT("movups (%[v0]), %[x0]") /* xmm0 = v0 */ + __ASM_EMIT("movups (%[v1]), %[x1]") /* xmm1 = v1 */ + __ASM_EMIT("movups (%[v2]), %[x2]") /* xmm2 = v2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = v0 * p */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = v1 * p */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = v2 * p */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + /* xmm0 = x0 x1 x2 ? */ + /* xmm1 = y0 y1 y2 ? */ + /* xmm2 = z0 z1 z2 ? */ + /* xmm3 = w0 w1 w2 ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ + __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("paddd %[x1], %[x0]") + __ASM_EMIT("movdqa %[x0], (%[res])") + __ASM_EMIT32("movl 0x00(%[res]), %[v0]") + __ASM_EMIT32("movl 0x04(%[res]), %[v1]") + __ASM_EMIT32("movl 0x08(%[res]), %[v2]") + __ASM_EMIT64("movl 0x00(%[res]), %k[v0]") + __ASM_EMIT64("movl 0x04(%[res]), %k[v1]") + __ASM_EMIT64("movl 0x08(%[res]), %k[v2]") + __ASM_EMIT("lea (%[v1], %[v2], 4), %[v1]") + __ASM_EMIT("lea (%[v0], %[v1], 4), %[v0]") + + : [v0] "+r" (v0), [v1] "+r" (v1), [v2] "+r" (v2), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [p] "r" (p), + [res] "r" (res), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc" + ); + + return size_t(v0); + } + + size_t colocation_x3_vvp1(const vector3d_t *vv, const point3d_t *p) + { + float x0, x1, x2, x3, x4; + float res[4] __lsp_aligned16; + size_t pt; + + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = p */ + __ASM_EMIT("movups 0x00(%[vv]), %[x0]") /* xmm0 = v0 */ + __ASM_EMIT("movups 0x10(%[vv]), %[x1]") /* xmm1 = v1 */ + __ASM_EMIT("movups 0x20(%[vv]), %[x2]") /* xmm2 = v2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = v0 * p */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = v1 * p */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = v2 * p */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + /* xmm0 = x0 x1 x2 ? */ + /* xmm1 = y0 y1 y2 ? */ + /* xmm2 = z0 z1 z2 ? */ + /* xmm3 = w0 w1 w2 ? */ + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ + __ASM_EMIT("andps %[IONE], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("andps %[IONE], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("paddd %[x1], %[x0]") + __ASM_EMIT("movdqa %[x0], (%[res])") + __ASM_EMIT32("movl 0x00(%[res]), %[vv]") + __ASM_EMIT32("movl 0x04(%[res]), %[p]") + __ASM_EMIT32("movl 0x08(%[res]), %[pt]") + __ASM_EMIT64("movl 0x00(%[res]), %k[vv]") + __ASM_EMIT64("movl 0x04(%[res]), %k[p]") + __ASM_EMIT64("movl 0x08(%[res]), %k[pt]") + __ASM_EMIT("lea (%[p], %[pt], 4), %[pt]") + __ASM_EMIT("lea (%[vv], %[pt], 4), %[pt]") + + : [vv] "+r" (vv), [p] "+r" (p), [pt] "=&r" (pt), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [res] "r" (res), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [IONE] "m" (IONE) + : "cc" + ); + + return pt; + } + + void transpose_matrix3d1(matrix3d_t *r) + { + ARCH_X86_ASM + ( + MATRIX_LOAD("m", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + MAT4_TRANSPOSE("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4") + MATRIX_STORE("m", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + : + : [m] "r" (r) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4" + ); + } + + void transpose_matrix3d2(matrix3d_t *r, const matrix3d_t *m) + { + ARCH_X86_ASM + ( + MATRIX_LOAD("m", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + MAT4_TRANSPOSE("%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4") + MATRIX_STORE("r", "%xmm0", "%xmm1", "%xmm2", "%xmm3") + : + : [r] "r" (r), [m] "r" (m) + : "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4" + ); + } + + void split_triangle_raw( + raw_triangle_t *out, + size_t *n_out, + raw_triangle_t *in, + size_t *n_in, + const vector3d_t *pl, + const raw_triangle_t *pv + ) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + float k[4] __lsp_aligned16; + size_t t0; + + in += *n_in; + out += *n_out; + + // Estimate co-location of triangle and point + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], (%[k])") /* *k = xmm0 */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ + __ASM_EMIT("pand %[ICULL3], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("pand %[ICULL3], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("paddd %[x1], %[x0]") /* xmm0 = x0 x1 x2 0 */ + __ASM_EMIT("movdqa %[x0], %[x2]") /* xmm2 = x0 x1 x2 0 */ + __ASM_EMIT("movdqa %[x0], %[x1]") /* xmm1 = x0 x1 x2 0 */ + __ASM_EMIT("psrldq $8, %[x2]") /* xmm2 = x2 0 0 0 */ + __ASM_EMIT("psrldq $4, %[x1]") /* xmm1 = x1 x2 0 0 */ + __ASM_EMIT("por %[x2], %[x0]") + __ASM_EMIT("por %[x1], %[x0]") + __ASM_EMIT32("movd %[x0], %[t0]") + __ASM_EMIT64("movd %[x0], %k[t0]") + : [t0] "=&r" (t0), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), [pv] "r" (pv), + [k] "r" (k), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [ICULL3] "m" (ICULL3) + : "cc" + ); + + #define STR_COPY_TO(tgt) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x00(%[src]), %[x0]") \ + __ASM_EMIT("movups 0x10(%[src]), %[x1]") \ + __ASM_EMIT("movups 0x20(%[src]), %[x2]") \ + __ASM_EMIT("movups %[x0], 0x00(%[dst])") \ + __ASM_EMIT("movups %[x1], 0x10(%[dst])") \ + __ASM_EMIT("movups %[x2], 0x20(%[dst])") \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) \ + : [dst] "r" (tgt), \ + [src] "r" (pv) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_1P(off0, off1, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x1]") /* xmm1 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm2 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("subps %[x0], %[x1]") /* xmm1 = d = p1 - p0 = dx dy dz 0 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x3]") /* xmm3 = k 0 0 0 */ \ + __ASM_EMIT("mulps %[x1], %[x2]") /* xmm2 = dx*nx dy*ny dz*nz 0 */ \ + __ASM_EMIT("shufps $0x00, %[x3], %[x3]") /* xmm3 = k k k k */ \ + __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dz*nz 0 ? ? */ \ + __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dz*nz dy*ny ? ? */ \ + __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = dx*nx+dz*nz dx*nx+dz*nz dy*ny dy*ny */ \ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = k*dx k*dy k*dz 0 */ \ + __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dy*ny dy*ny ? ? */ \ + __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dy*ny+dw*nw dx*nx+dy*ny+dw*nw ? ? = b b ? ? */ \ + __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = b b b b */ \ + __ASM_EMIT("divps %[x2], %[x1]") /* xmm1 = k*dx/b k*dy/b k*dz/b 0 */ \ + __ASM_EMIT("subps %[x1], %[x0]") /* xmm0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ + : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x2]") /* xmm2 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups 0x" off2 "(%[st]), %[x3]") /* xmm3 = p2 = lx2 ly2 lz2 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x4]") /* xmm4 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = pl = nx ny nz nw */ \ + __ASM_EMIT("movaps %[x4], %[x5]") /* xmm5 = pl = nx ny nz nw */ \ + __ASM_EMIT("subps %[x0], %[x2]") /* xmm2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("subps %[x1], %[x3]") /* xmm3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("mulps %[x2], %[x4]") /* xmm4 = dx1*nx dy1*ny dz1*nz 0 */ \ + __ASM_EMIT("mulps %[x3], %[x5]") /* xmm5 = dx2*nx dy2*ny dz2*nz 0 */ \ + __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dz1*nz 0 ? ? */ \ + __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dz2*nz 0 ? ? */ \ + __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dz1*nz dy1*ny ? ? */ \ + __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx1*nx+dz1*nz dy1*ny ? ? */ \ + __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = dx1*nx+dz1*nz dx1*nx+dz1*nz dy1*ny dy1*ny */ \ + __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = dx2*nx+dz2*nz dx2*nx+dz2*nz dy2*ny dy2*ny */ \ + __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dy1*ny dy1*ny ? ? */ \ + __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dy2*ny dy2*ny ? ? */ \ + __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dy1*ny+dz1*nz dx1*nx+dy1*ny+dz1*nz ? ? = b1 b1 ? ? */ \ + __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx2*nx+dy2*ny+dz2*nz dx2*nx+dy2*ny+dz2*nz ? ? = b2 b2 ? ? */ \ + __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = b1 b1 b1 b1 */ \ + __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = b2 b2 b2 b2 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x6]") /* xmm6 = k */ \ + __ASM_EMIT("divps %[x4], %[x2]") /* xmm2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ + __ASM_EMIT("shufps $0x00, %[x6], %[x6]") /* xmm6 = k k k k */ \ + __ASM_EMIT("divps %[x5], %[x3]") /* xmm3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ + __ASM_EMIT("mulps %[x6], %[x2]") /* xmm2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ + __ASM_EMIT("mulps %[x6], %[x3]") /* xmm3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = lx1-k*dx2/b2 ly1-k*dy2/b2 lz1-k*dz2/b2 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ + : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + switch (t0) + { + // 0 intersections, triangle is above + case 0x00: // 0 0 0 + case 0x01: // 0 0 1 + case 0x04: // 0 1 0 + case 0x05: // 0 1 1 + case 0x10: // 1 0 0 + case 0x11: // 1 0 1 + case 0x14: // 1 1 0 + case 0x15: // 1 1 1 + STR_COPY_TO(out); + ++(*n_out); + break; + + // 0 intersections, triangle is below + case 0x16: // 1 1 2 + case 0x19: // 1 2 1 + case 0x1a: // 1 2 2 + case 0x25: // 2 1 1 + case 0x26: // 2 1 2 + case 0x29: // 2 2 1 + case 0x2a: // 2 2 2 + STR_COPY_TO(in); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise + case 0x06: // 0 1 2 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x2], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x3], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x21: // 2 0 1 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x18: // 1 2 0 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x3], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x1], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x3], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, clockwise + case 0x24: // 2 1 0 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x1], 0x00(%[out])") + __ASM_EMIT("movups %[x2], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x12: // 1 0 2 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x3], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x3], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x09: // 0 2 1 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + + // 2 intersections, 1 triangle below, 2 triangles above + case 0x02: // 0 0 2 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + __ASM_EMIT("movups %[x4], 0x30(%[out])") + __ASM_EMIT("movups %[x1], 0x40(%[out])") + __ASM_EMIT("movups %[x3], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + case 0x08: // 0 2 0 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x4], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + __ASM_EMIT("movups %[x2], 0x30(%[out])") + __ASM_EMIT("movups %[x0], 0x40(%[out])") + __ASM_EMIT("movups %[x4], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + case 0x20: // 2 0 0 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + __ASM_EMIT("movups %[x3], 0x30(%[out])") + __ASM_EMIT("movups %[x1], 0x40(%[out])") + __ASM_EMIT("movups %[x2], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + + // 2 intersections, 1 triangle above, 2 triangles below + case 0x28: // 2 2 0 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x4], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x3], 0x50(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + case 0x22: // 2 0 2 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x30(%[in])") + __ASM_EMIT("movups %[x0], 0x40(%[in])") + __ASM_EMIT("movups %[x4], 0x50(%[in])") + __ASM_EMIT("movups %[x3], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + case 0x0a: // 0 2 2 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x2], 0x50(%[in])") + __ASM_EMIT("movups %[x4], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + default: + break; + } + + #undef STR_COPY_TO + #undef STR_SPLIT_1P + #undef STR_SPLIT_2P + } + + void cull_triangle_raw( + raw_triangle_t *in, + size_t *n_in, + const vector3d_t *pl, + const raw_triangle_t *pv + ) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + float k[4] __lsp_aligned16; + size_t t0; + + in += *n_in; + + // Estimate co-location of triangle and point + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl */ + MAT4_TRANSPOSE("[x0]", "[x1]", "[x2]", "[x3]", "[x4]") + + __ASM_EMIT("addps %[x1], %[x0]") + __ASM_EMIT("addps %[x3], %[x2]") + __ASM_EMIT("addps %[x2], %[x0]") /* xmm0 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 ? */ + __ASM_EMIT("movaps %[x0], (%[k])") /* *k = xmm0 */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL ? */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL ? */ + __ASM_EMIT("pand %[ICULL3], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] ? */ + __ASM_EMIT("pand %[ICULL3], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] ? */ + __ASM_EMIT("paddd %[x1], %[x0]") /* xmm0 = x0 x1 x2 0 */ + __ASM_EMIT("movdqa %[x0], %[x2]") /* xmm2 = x0 x1 x2 0 */ + __ASM_EMIT("movdqa %[x0], %[x1]") /* xmm1 = x0 x1 x2 0 */ + __ASM_EMIT("psrldq $8, %[x2]") /* xmm2 = x2 0 0 0 */ + __ASM_EMIT("psrldq $4, %[x1]") /* xmm1 = x1 x2 0 0 */ + __ASM_EMIT("por %[x2], %[x0]") + __ASM_EMIT("por %[x1], %[x0]") + __ASM_EMIT32("movd %[x0], %[t0]") + __ASM_EMIT64("movd %[x0], %k[t0]") + : [t0] "=&r" (t0), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), [pv] "r" (pv), + [k] "r" (k), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [ICULL3] "m" (ICULL3) + : "cc" + ); + + #define STR_COPY_TO(tgt) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x00(%[src]), %[x0]") \ + __ASM_EMIT("movups 0x10(%[src]), %[x1]") \ + __ASM_EMIT("movups 0x20(%[src]), %[x2]") \ + __ASM_EMIT("movups %[x0], 0x00(%[dst])") \ + __ASM_EMIT("movups %[x1], 0x10(%[dst])") \ + __ASM_EMIT("movups %[x2], 0x20(%[dst])") \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) \ + : [dst] "r" (tgt), \ + [src] "r" (pv) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_1P(off0, off1, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x1]") /* xmm1 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm2 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("subps %[x0], %[x1]") /* xmm1 = d = p1 - p0 = dx dy dz 0 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x3]") /* xmm3 = k 0 0 0 */ \ + __ASM_EMIT("mulps %[x1], %[x2]") /* xmm2 = dx*nx dy*ny dz*nz 0 */ \ + __ASM_EMIT("shufps $0x00, %[x3], %[x3]") /* xmm3 = k k k k */ \ + __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dz*nz 0 ? ? */ \ + __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dz*nz dy*ny ? ? */ \ + __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = dx*nx+dz*nz dx*nx+dz*nz dy*ny dy*ny */ \ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = k*dx k*dy k*dz 0 */ \ + __ASM_EMIT("movhlps %[x2], %[x4]") /* xmm4 = dy*ny dy*ny ? ? */ \ + __ASM_EMIT("addps %[x4], %[x2]") /* xmm2 = dx*nx+dy*ny+dw*nw dx*nx+dy*ny+dw*nw ? ? = b b ? ? */ \ + __ASM_EMIT("unpcklps %[x2], %[x2]") /* xmm2 = b b b b */ \ + __ASM_EMIT("divps %[x2], %[x1]") /* xmm1 = k*dx/b k*dy/b k*dz/b 0 */ \ + __ASM_EMIT("subps %[x1], %[x0]") /* xmm0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ + : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x2]") /* xmm2 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups 0x" off2 "(%[st]), %[x3]") /* xmm3 = p2 = lx2 ly2 lz2 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x4]") /* xmm4 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = pl = nx ny nz nw */ \ + __ASM_EMIT("movaps %[x4], %[x5]") /* xmm5 = pl = nx ny nz nw */ \ + __ASM_EMIT("subps %[x0], %[x2]") /* xmm2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("subps %[x1], %[x3]") /* xmm3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("mulps %[x2], %[x4]") /* xmm4 = dx1*nx dy1*ny dz1*nz 0 */ \ + __ASM_EMIT("mulps %[x3], %[x5]") /* xmm5 = dx2*nx dy2*ny dz2*nz 0 */ \ + __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dz1*nz 0 ? ? */ \ + __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dz2*nz 0 ? ? */ \ + __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dz1*nz dy1*ny ? ? */ \ + __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx1*nx+dz1*nz dy1*ny ? ? */ \ + __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = dx1*nx+dz1*nz dx1*nx+dz1*nz dy1*ny dy1*ny */ \ + __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = dx2*nx+dz2*nz dx2*nx+dz2*nz dy2*ny dy2*ny */ \ + __ASM_EMIT("movhlps %[x4], %[x6]") /* xmm6 = dy1*ny dy1*ny ? ? */ \ + __ASM_EMIT("movhlps %[x5], %[x7]") /* xmm7 = dy2*ny dy2*ny ? ? */ \ + __ASM_EMIT("addps %[x6], %[x4]") /* xmm4 = dx1*nx+dy1*ny+dz1*nz dx1*nx+dy1*ny+dz1*nz ? ? = b1 b1 ? ? */ \ + __ASM_EMIT("addps %[x7], %[x5]") /* xmm5 = dx2*nx+dy2*ny+dz2*nz dx2*nx+dy2*ny+dz2*nz ? ? = b2 b2 ? ? */ \ + __ASM_EMIT("unpcklps %[x4], %[x4]") /* xmm4 = b1 b1 b1 b1 */ \ + __ASM_EMIT("unpcklps %[x5], %[x5]") /* xmm5 = b2 b2 b2 b2 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x6]") /* xmm6 = k */ \ + __ASM_EMIT("divps %[x4], %[x2]") /* xmm2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ + __ASM_EMIT("shufps $0x00, %[x6], %[x6]") /* xmm6 = k k k k */ \ + __ASM_EMIT("divps %[x5], %[x3]") /* xmm3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ + __ASM_EMIT("mulps %[x6], %[x2]") /* xmm2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ + __ASM_EMIT("mulps %[x6], %[x3]") /* xmm3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = lx1-k*dx2/b2 ly1-k*dy2/b2 lz1-k*dz2/b2 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ + : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + switch (t0) + { + // 0 intersections, triangle is above + case 0x00: // 0 0 0 + case 0x01: // 0 0 1 + case 0x04: // 0 1 0 + case 0x05: // 0 1 1 + case 0x10: // 1 0 0 + case 0x11: // 1 0 1 + case 0x14: // 1 1 0 + case 0x15: // 1 1 1 + break; + + // 0 intersections, triangle is below + case 0x16: // 1 1 2 + case 0x19: // 1 2 1 + case 0x1a: // 1 2 2 + case 0x25: // 2 1 1 + case 0x26: // 2 1 2 + case 0x29: // 2 2 1 + case 0x2a: // 2 2 2 + STR_COPY_TO(in); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise + case 0x06: // 0 1 2 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x2], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x21: // 2 0 1 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x18: // 1 2 0 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x3], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, clockwise + case 0x24: // 2 1 0 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x12: // 1 0 2 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x3], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x09: // 0 2 1 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 2 intersections, 1 triangle below, 2 triangles above + case 0x02: // 0 0 2 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x08: // 0 2 0 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x20: // 2 0 0 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 2 intersections, 1 triangle above, 2 triangles below + case 0x28: // 2 2 0 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x4], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x3], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + case 0x22: // 2 0 2 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x30(%[in])") + __ASM_EMIT("movups %[x0], 0x40(%[in])") + __ASM_EMIT("movups %[x4], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + case 0x0a: // 0 2 2 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x2], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + default: + break; + } + + #undef STR_COPY_TO + #undef STR_SPLIT_1P + #undef STR_SPLIT_2P + } + + } /* namespace sse2 */ +} /* namespace lsp */ + +#undef MAT4_TRANSPOSE +#undef MAT4_LOAD +#undef MAT4_STORE + +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_3DMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/cos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/cos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/cos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/cos.h 2025-08-26 18:15:43.750003058 +0000 @@ -0,0 +1,230 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_PMATH_COS_H_ +#define PRIVATE_DSP_ARCH_X86_SSE2_PMATH_COS_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_IMPL */ + +#include + +namespace lsp +{ + namespace sse2 + { + void cosf1(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm0") // xmm0 = PI + __ASM_EMIT("movups 0x00(%[dst]), %%xmm1") // xmm1 = x1 + __ASM_EMIT("movaps %%xmm0, %%xmm4") // xmm4 = PI + __ASM_EMIT("movups 0x10(%[dst]), %%xmm5") // xmm5 = x2 + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("subps %%xmm5, %%xmm4") // xmm4 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("movups %%xmm4, 0x10(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm0") // xmm0 = PI + __ASM_EMIT("movups 0x00(%[dst]), %%xmm1") // xmm1 = x + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 12f") + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm0") // xmm0 = PI + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movss 0x00(%[src]), %%xmm1") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("movhps 0x00(%[src]), %%xmm1") + __ASM_EMIT("8:") + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("movhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void cosf2(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm0") // xmm0 = PI + __ASM_EMIT("movups 0x00(%[src]), %%xmm1") // xmm1 = x1 + __ASM_EMIT("movaps %%xmm0, %%xmm4") // xmm4 = PI + __ASM_EMIT("movups 0x10(%[src]), %%xmm5") // xmm5 = x2 + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + __ASM_EMIT("subps %%xmm5, %%xmm4") // xmm4 = PI/2 - x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("movups %%xmm4, 0x10(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm0") // xmm0 = PI + __ASM_EMIT("movups 0x00(%[src]), %%xmm1") // xmm1 = x1 + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 12f") + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm0") // xmm0 = PI + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movss 0x00(%[src]), %%xmm1") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("movhps 0x00(%[src]), %%xmm1") + __ASM_EMIT("8:") + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - x1 + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("movhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void cosf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("movss %[k], %%xmm6") // xmm6 = k + __ASM_EMIT("movss %[p], %%xmm0") // xmm7 = p + __ASM_EMIT("shufps $0x00, %%xmm6, %%xmm6") // xmm6 = k k k k + __ASM_EMIT("shufps $0x00, %%xmm0, %%xmm0") // xmm0 = p p p p + __ASM_EMIT("movaps 0x10 + %[S2C], %%xmm7") // xmm7 = PI PI PI PI + __ASM_EMIT("movaps 0x00 + %[S2KP], %%xmm4") // xmm4 = i = 0 1 2 3 + __ASM_EMIT("movaps 0x10 + %[S2KP], %%xmm5") // xmm5 = step = 4 4 4 4 + __ASM_EMIT("subps %%xmm0, %%xmm7") // xmm7 = PI/2 - p + PI/2 + // x4 blocks + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps %%xmm4, %%xmm1") // xmm1 = i + __ASM_EMIT("movaps %%xmm7, %%xmm0") // xmm0 = PI/2 - p + PI/2 + __ASM_EMIT("mulps %%xmm6, %%xmm1") // xmm1 = k*i + __ASM_EMIT("addps %%xmm5, %%xmm4") // xmm4 = i + step + __ASM_EMIT("subps %%xmm1, %%xmm0") // xmm0 = PI/2 - (p + k*i) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 6f") + __ASM_EMIT("movaps %%xmm7, %%xmm0") // xmm0 = PI/2 - p + PI/2 + __ASM_EMIT("mulps %%xmm6, %%xmm4") // xmm4 = k*i + __ASM_EMIT("subps %%xmm4, %%xmm0") // xmm0 = PI/2 - (p + k*i) + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 4f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("shufps $0x39, %%xmm0, %%xmm0") // xmm0 = S1 S2 S3 S0 + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("4:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("6:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + } /* namespace sse2 */ +} /* namespace lsp */ + + +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_PMATH_COS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/lanczos.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/lanczos.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/lanczos.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/lanczos.h 2025-08-26 18:15:43.750003058 +0000 @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 16 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_PMATH_LANCZOS_H_ +#define PRIVATE_DSP_ARCH_X86_SSE2_PMATH_LANCZOS_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_IMPL */ + +#include + +namespace lsp +{ + namespace sse2 + { + IF_ARCH_X86( + static const uint32_t lanczos_const[] __lsp_aligned16 = + { + LSP_DSP_VEC4(0x7fffffff), // +0x00: Mask for fabsf + LSP_DSP_VEC4(0x38d1b717), // +0x10: Sinc threshold = 1e-4 + LSP_DSP_VEC4(0x3f800000), // +0x20: 1.0 + }; + ) + + typedef struct lanczos_gen_t + { + float k[4]; // +0x00: Multiplier + float p[4]; // +0x10: Initial phase + float a[4]; // +0x20: Number of lobes + float i[4]; // +0x30: Indices + float x1[4]; // +0x40: Computed X1 + float d[4]; // +0x50: Denominator + float t[4]; // +0x60: Time range + } lanczos_gen_t; + + #define LANCZOS_GEN_FUNC_X4 \ + /* xmm0 = x1 */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm4") /* xmm4 = x1 */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm2") /* xmm2 = x1 */ \ + __ASM_EMIT("mulps 0x20 + %[state], %%xmm4") /* xmm4 = x2 = x1*a */ \ + __ASM_EMIT("movaps %%xmm0, 0x40 + %[state]") /* *x = x1 */ \ + __ASM_EMIT("mulps %%xmm4, %%xmm2") /* xmm2 = d = x1 * x2 */ \ + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm0") /* xmm0 = x1 + PI/2 */ \ + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm4") /* xmm4 = x2 + PI/2 */ \ + __ASM_EMIT("movaps %%xmm2, 0x50 + %[state]") /* *d = d */ \ + SINF_X_PLUS_PI_2_CORE_X8 /* xmm0 = sinf(x1), xmm4 = sinf(x2) */ \ + __ASM_EMIT("movaps 0x40 + %[state], %%xmm1") /* xmm1 = x */ \ + __ASM_EMIT("mulps %%xmm4, %%xmm0") /* xmm0 = sinf(x1)*sinf(x2) */ \ + __ASM_EMIT("andps 0x00 + %[LC], %%xmm1") /* xmm1 = fabsf(x) */ \ + __ASM_EMIT("divps 0x50 + %[state], %%xmm0") /* xmm0 = F = (sinf(x1)*sinf(x2)) / (x1 * x2) */ \ + __ASM_EMIT("movaps %%xmm1, %%xmm2") /* xmm2 = fabsf(x) */ \ + __ASM_EMIT("cmpps $5, 0x10 + %[LC], %%xmm1") /* xmm1 = [ fabsf(x) >= 1e-4 ] */ \ + __ASM_EMIT("andps %%xmm1, %%xmm0") /* xmm0 = [ fabsf(x) >= 1e-4 ] & f */ \ + __ASM_EMIT("cmpps $1, 0x60 + %[state], %%xmm2") /* xmm2 = [ fabsf(x) < t ] */ \ + __ASM_EMIT("andnps 0x20 + %[LC], %%xmm1") /* xmm1 = [ fabsf(x) < 1e-4 ] & 1.0 */ \ + __ASM_EMIT("orps %%xmm1, %%xmm0") /* xmm0 = [ fabsf(x) >= 1e-4 ] ? f : 1.0 */ \ + __ASM_EMIT("andps %%xmm2, %%xmm0") /* xmm0 = [ fabsf(x) < t ] ? ([ fabsf(x) >= 1e-4 ] ? f : 1.0) : 0.0 */ + + void lanczos1(float *dst, float k, float p, float t, float a, size_t count) + { + IF_ARCH_X86( + lanczos_gen_t state __lsp_aligned16; + float stub[4] __lsp_aligned16; + ); + + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("movss %[k], %%xmm4") // xmm4 = k + __ASM_EMIT("movss %[p], %%xmm5") // xmm5 = p + __ASM_EMIT("movss %[a], %%xmm6") // xmm6 = a + __ASM_EMIT("movss %[t], %%xmm7") // xmm7 = t + __ASM_EMIT("shufps $0x00, %%xmm4, %%xmm4") // xmm4 = k k k k + __ASM_EMIT("shufps $0x00, %%xmm5, %%xmm5") // xmm5 = p p p p + __ASM_EMIT("shufps $0x00, %%xmm6, %%xmm6") // xmm6 = a a a a + __ASM_EMIT("shufps $0x00, %%xmm7, %%xmm7") // xmm7 = t t t t + __ASM_EMIT("movaps %%xmm4, 0x00 + %[state]") + __ASM_EMIT("movaps %%xmm5, 0x10 + %[state]") + __ASM_EMIT("movaps %%xmm6, 0x20 + %[state]") + __ASM_EMIT("movaps %%xmm7, 0x60 + %[state]") + __ASM_EMIT("movaps 0x00 + %[LGEN], %%xmm1") // xmm1 = i = 0 1 2 3 + // x4 blocks + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps %%xmm1, %%xmm0") // xmm0 = i + __ASM_EMIT("mulps 0x00 + %[state], %%xmm0") // xmm0 = k*i + __ASM_EMIT("addps 0x10 + %[LGEN], %%xmm1") // xmm1 = i' = i + step + __ASM_EMIT("subps 0x10 + %[state], %%xmm0") // xmm0 = x1 = k*i - p + __ASM_EMIT("movaps %%xmm1, 0x30 + %[state]") // *i = i' + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("movaps 0x30 + %[state], %%xmm1") // xmm1 = i' + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 6f") + __ASM_EMIT("movaps %%xmm1, %%xmm0") // xmm0 = i + __ASM_EMIT("mulps 0x00 + %[state], %%xmm0") // xmm0 = k*i + __ASM_EMIT("subps 0x10 + %[state], %%xmm0") // xmm0 = x1 = k*i - p + LANCZOS_GEN_FUNC_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 4f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("shufps $0x39, %%xmm0, %%xmm0") // xmm0 = S1 S2 S3 S0 + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("4:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("6:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [state] "o" (state), + [S2C] "o" (sinf_const), + [LGEN] "o" (kp_gen_const), + [LC] "o" (lanczos_const), + [stub] "o" (stub), + [k] "m" (k), + [p] "m" (p), + [a] "m" (a), + [t] "m" (t) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + } /* namespace sse2 */ +} /* namespace lsp */ + + + + +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_PMATH_LANCZOS_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/sin.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/sin.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/sin.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath/sin.h 2025-08-26 18:15:43.750003058 +0000 @@ -0,0 +1,365 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 10 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_PMATH_SIN_H_ +#define PRIVATE_DSP_ARCH_X86_SSE2_PMATH_SIN_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_IMPL */ + +namespace lsp +{ + namespace sse2 + { + /* + Time-optimized sinf implementation: + + float sinf(float x) + { + // Limit x to [-pi/2 .. pi/2] + x += PI/2; + int32_t period = (x / 2*PI) - (x < 0.0f); + x = x - period * 2*PI; + x = (x < PI) ? x - PI/2 : 3*PI/2 - x; + + const float x2 = x*x; + return x * (1.0f + x2*(-0.166666666667f + x2*(0.00833333333333f + x2 * (-0.000198412698413f + x2 * (2.7557319224e-06f + x2 * -2.50521083854e-08f))))); + } + */ + + IF_ARCH_X86( + static const float kp_gen_const[] __lsp_aligned16 = + { + 0.0f, 1.0f, 2.0f, 3.0f, // +0x00: Initial values 0..3 + LSP_DSP_VEC4(4.0f) // +0x10: Step + }; + ) + + IF_ARCH_X86( + static const uint32_t sinf_const[] __lsp_aligned16 = + { + LSP_DSP_VEC4(0x3fc90fdb), // +0x00: PI/2 + LSP_DSP_VEC4(0x40490fdb), // +0x10: PI + LSP_DSP_VEC4(0x3e22f983), // +0x20: 1/(2*PI) + LSP_DSP_VEC4(0x40c90fdb), // +0x30: 2*PI + LSP_DSP_VEC4(0x4096cbe4), // +0x40: 3*PI/2 + LSP_DSP_VEC4(0xb2d7322b), // +0x50: C0 = -1/11! = -2.50521083854e-08 + LSP_DSP_VEC4(0x3638ef1d), // +0x60: C1 = 1/9! = 2.7557319224e-06 + LSP_DSP_VEC4(0xb9500d01), // +0x70: C2 = -1/7! = -0.000198412698413 + LSP_DSP_VEC4(0x3c088889), // +0x80: C3 = 1/5! = 0.00833333333333 + LSP_DSP_VEC4(0xbe2aaaab), // +0x90: C4 = -1/3! = -0.166666666667 + LSP_DSP_VEC4(0x3f800000), // +0xa0: 1.0 + }; + ) + + #define SINF_X_PLUS_PI_2_CORE_X8 \ + /* xmm0 = X1 = x1 + PI/2 */ \ + /* xmm4 = X2 = x2 + PI/2 */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm1") /* xmm1 = X */ \ + __ASM_EMIT("movaps %%xmm4, %%xmm5") \ + __ASM_EMIT("movaps %%xmm0, %%xmm3") /* xmm3 = X */ \ + __ASM_EMIT("movaps %%xmm4, %%xmm7") \ + __ASM_EMIT("mulps 0x20 + %[S2C], %%xmm1") /* xmm1 = X / (2*PI) */ \ + __ASM_EMIT("mulps 0x20 + %[S2C], %%xmm5") \ + __ASM_EMIT("psrad $31, %%xmm3") /* xmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("psrad $31, %%xmm7") \ + __ASM_EMIT("cvttps2dq %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("cvttps2dq %%xmm5, %%xmm5") \ + __ASM_EMIT("paddd %%xmm3, %%xmm1") /* xmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("paddd %%xmm7, %%xmm5") \ + __ASM_EMIT("cvtdq2ps %%xmm1, %%xmm1") /* xmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("cvtdq2ps %%xmm5, %%xmm5") \ + __ASM_EMIT("mulps 0x30 + %[S2C], %%xmm1") /* xmm1 = period * 2 * PI */ \ + __ASM_EMIT("mulps 0x30 + %[S2C], %%xmm5") \ + __ASM_EMIT("subps %%xmm1, %%xmm0") /* xmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("subps %%xmm5, %%xmm4") \ + __ASM_EMIT("movaps %%xmm0, %%xmm2") /* xmm2 = Y */ \ + __ASM_EMIT("movaps %%xmm4, %%xmm6") \ + __ASM_EMIT("movaps 0x40 + %[S2C], %%xmm1") /* xmm1 = 3*PI/2 */ \ + __ASM_EMIT("movaps 0x40 + %[S2C], %%xmm5") \ + __ASM_EMIT("cmpps $1, 0x10 + %[S2C], %%xmm2") /* xmm2 = [ Y < PI ] */ \ + __ASM_EMIT("cmpps $1, 0x10 + %[S2C], %%xmm6") \ + __ASM_EMIT("subps %%xmm0, %%xmm1") /* xmm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("subps %%xmm4, %%xmm5") \ + __ASM_EMIT("subps 0x00 + %[S2C], %%xmm0") /* xmm0 = Y - PI/2 */ \ + __ASM_EMIT("subps 0x00 + %[S2C], %%xmm4") \ + __ASM_EMIT("andps %%xmm2, %%xmm0") /* xmm0 = (Y - PI/2) & [ Y < PI ] */ \ + __ASM_EMIT("andps %%xmm6, %%xmm4") \ + __ASM_EMIT("andnps %%xmm1, %%xmm2") /* xmm2 = (3*PI/2 - Y) & [ Y >= PI ] */ \ + __ASM_EMIT("andnps %%xmm5, %%xmm6") \ + __ASM_EMIT("orps %%xmm2, %%xmm0") /* xmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + __ASM_EMIT("orps %%xmm6, %%xmm4") \ + /* xmm0 = XX1 */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm1") /* xmm1 = XX */ \ + __ASM_EMIT("movaps %%xmm4, %%xmm5") \ + __ASM_EMIT("mulps %%xmm0, %%xmm0") /* xmm0 = X2 = XX*XX */ \ + __ASM_EMIT("mulps %%xmm4, %%xmm4") \ + __ASM_EMIT("movaps %%xmm0, %%xmm2") /* xmm2 = X2 */ \ + __ASM_EMIT("movaps %%xmm4, %%xmm6") \ + __ASM_EMIT("mulps 0x50 + %[S2C], %%xmm0") /* xmm0 = X2*C0 */ \ + __ASM_EMIT("mulps 0x50 + %[S2C], %%xmm4") \ + __ASM_EMIT("addps 0x60 + %[S2C], %%xmm0") /* xmm0 = C1 + X2*C0 */ \ + __ASM_EMIT("addps 0x60 + %[S2C], %%xmm4") \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("mulps %%xmm6, %%xmm4") \ + __ASM_EMIT("addps 0x70 + %[S2C], %%xmm0") /* xmm0 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("addps 0x70 + %[S2C], %%xmm4") \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("mulps %%xmm6, %%xmm4") \ + __ASM_EMIT("addps 0x80 + %[S2C], %%xmm0") /* xmm0 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("addps 0x80 + %[S2C], %%xmm4") \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("mulps %%xmm6, %%xmm4") \ + __ASM_EMIT("addps 0x90 + %[S2C], %%xmm0") /* xmm0 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("addps 0x90 + %[S2C], %%xmm4") \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("mulps %%xmm6, %%xmm4") \ + __ASM_EMIT("addps 0xa0 + %[S2C], %%xmm0") /* xmm0 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("addps 0xa0 + %[S2C], %%xmm4") \ + __ASM_EMIT("mulps %%xmm1, %%xmm0") /* xmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ \ + __ASM_EMIT("mulps %%xmm5, %%xmm4") + + #define SINF_X_PLUS_PI_2_CORE_X4 \ + /* xmm0 = X = x + PI/2 */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm1") /* xmm1 = X */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm3") /* xmm3 = X */ \ + __ASM_EMIT("mulps 0x20 + %[S2C], %%xmm1") /* xmm1 = X / (2*PI) */ \ + __ASM_EMIT("psrad $31, %%xmm3") /* xmm3 = [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("cvttps2dq %%xmm1, %%xmm1") /* xmm1 = int(X / (2*PI)) */ \ + __ASM_EMIT("paddd %%xmm3, %%xmm1") /* xmm1 = int(X / (2*PI)) + [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("cvtdq2ps %%xmm1, %%xmm1") /* xmm1 = period = int(X / (2*PI)) [ X < 0.0 ] ? -1 : 0 */ \ + __ASM_EMIT("mulps 0x30 + %[S2C], %%xmm1") /* xmm1 = period * 2 * PI */ \ + __ASM_EMIT("subps %%xmm1, %%xmm0") /* xmm0 = Y = X - period * 2 * PI */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm2") /* xmm2 = Y */ \ + __ASM_EMIT("movaps 0x40 + %[S2C], %%xmm1") /* xmm1 = 3*PI/2 */ \ + __ASM_EMIT("cmpps $1, 0x10 + %[S2C], %%xmm2") /* xmm2 = [ Y < PI ] */ \ + __ASM_EMIT("subps %%xmm0, %%xmm1") /* xmm1 = 3*PI/2 - Y */ \ + __ASM_EMIT("subps 0x00 + %[S2C], %%xmm0") /* xmm0 = Y - PI/2 */ \ + __ASM_EMIT("andps %%xmm2, %%xmm0") /* xmm0 = (Y - PI/2) & [ Y < PI ] */ \ + __ASM_EMIT("andnps %%xmm1, %%xmm2") /* xmm2 = (3*PI/2 - Y) & [ Y >= PI ] */ \ + __ASM_EMIT("orps %%xmm2, %%xmm0") /* xmm0 = XX = [ Y < PI ] ? (Y - PI/2) : (3*PI/2 - Y) */ \ + /* xmm0 = XX1 */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm1") /* xmm1 = XX */ \ + __ASM_EMIT("mulps %%xmm0, %%xmm0") /* xmm0 = X2 = XX*XX */ \ + __ASM_EMIT("movaps %%xmm0, %%xmm2") /* xmm2 = X2 */ \ + __ASM_EMIT("mulps 0x50 + %[S2C], %%xmm0") /* xmm0 = X2*C0 */ \ + __ASM_EMIT("addps 0x60 + %[S2C], %%xmm0") /* xmm0 = C1 + X2*C0 */ \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C1 + X2*C0) */ \ + __ASM_EMIT("addps 0x70 + %[S2C], %%xmm0") /* xmm0 = C2 + X2*(C1 + X2*C0) */ \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("addps 0x80 + %[S2C], %%xmm0") /* xmm0 = C3 + X2*(C2 + X2*(C1 + X2*C0)) */ \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("addps 0x90 + %[S2C], %%xmm0") /* xmm0 = C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))) */ \ + __ASM_EMIT("mulps %%xmm2, %%xmm0") /* xmm0 = X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("addps 0xa0 + %[S2C], %%xmm0") /* xmm0 = 1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0)))) */ \ + __ASM_EMIT("mulps %%xmm1, %%xmm0") /* xmm0 = sinf(x) = XX * (1.0 + X2*(C4 + X2*(C3 + X2*(C2 + X2*(C1 + X2*C0))))) */ + + void sinf1(float *dst, size_t count) + { + IF_ARCH_X86(float *src); + + ARCH_X86_ASM( + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps 0x00 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("movups 0x00(%[dst]), %%xmm0") // xmm0 = x1 + __ASM_EMIT("movups 0x10(%[dst]), %%xmm4") // xmm4 = x2 + __ASM_EMIT("addps %%xmm1, %%xmm0") // xmm0 = x1 + PI/2 + __ASM_EMIT("addps %%xmm1, %%xmm4") // xmm4 = x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("movups %%xmm4, 0x10(%[dst])") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("movups 0x00(%[dst]), %%xmm0") // xmm0 = x + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 12f") + __ASM_EMIT("mov %[dst], %[src]") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("movhps 0x00(%[src]), %%xmm0") + __ASM_EMIT("8:") + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("movhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [src] "=&r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void sinf2(float *dst, const float *src, size_t count) + { + ARCH_X86_ASM( + // x8 blocks + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps 0x00 + %[S2C], %%xmm1") // xmm1 = PI/2 + __ASM_EMIT("movups 0x00(%[src]), %%xmm0") // xmm0 = x1 + __ASM_EMIT("movups 0x10(%[src]), %%xmm4") // xmm4 = x2 + __ASM_EMIT("addps %%xmm1, %%xmm0") // xmm0 = x1 + PI/2 + __ASM_EMIT("addps %%xmm1, %%xmm4") // xmm4 = x2 + PI/2 + SINF_X_PLUS_PI_2_CORE_X8 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("movups %%xmm4, 0x10(%[dst])") + __ASM_EMIT("add $0x20, %[src]") + __ASM_EMIT("add $0x20, %[dst]") + __ASM_EMIT("sub $8, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // x4 block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jl 4f") + __ASM_EMIT("movups 0x00(%[src]), %%xmm0") // xmm0 = x + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[src]") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("4:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 12f") + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movss 0x00(%[src]), %%xmm0") + __ASM_EMIT("add $4, %[src]") + __ASM_EMIT("6:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 8f") + __ASM_EMIT("movhps 0x00(%[src]), %%xmm0") + __ASM_EMIT("8:") + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm0") // xmm0 = x + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 10f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("10:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 12f") + __ASM_EMIT("movhps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("12:") + + : [dst] "+r" (dst), [src] "+r" (src), [count] "+r" (count) + : [S2C] "o" (sinf_const) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + void sinf_kp1(float *dst, float k, float p, size_t count) + { + ARCH_X86_ASM( + // Prepare + __ASM_EMIT("movss %[k], %%xmm6") // xmm6 = k + __ASM_EMIT("movss %[p], %%xmm7") // xmm7 = p + __ASM_EMIT("shufps $0x00, %%xmm6, %%xmm6") // xmm6 = k k k k + __ASM_EMIT("shufps $0x00, %%xmm7, %%xmm7") // xmm7 = p p p p + __ASM_EMIT("movaps 0x00 + %[S2KP], %%xmm4") // xmm4 = i = 0 1 2 3 + __ASM_EMIT("movaps 0x10 + %[S2KP], %%xmm5") // xmm5 = step = 4 4 4 4 + __ASM_EMIT("addps 0x00 + %[S2C], %%xmm7") // xmm7 = p+PI/2 p+PI/2 p+PI/2 p+PI/2 + // x4 blocks + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("jb 2f") + __ASM_EMIT("1:") + __ASM_EMIT("movaps %%xmm4, %%xmm0") // xmm0 = i + __ASM_EMIT("mulps %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("addps %%xmm5, %%xmm4") // xmm4 = i + step + __ASM_EMIT("addps %%xmm7, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("movups %%xmm0, 0x00(%[dst])") + __ASM_EMIT("add $0x10, %[dst]") + __ASM_EMIT("sub $4, %[count]") + __ASM_EMIT("jae 1b") + __ASM_EMIT("2:") + // Tail: 1x-3x block + __ASM_EMIT("add $4, %[count]") + __ASM_EMIT("jle 6f") + __ASM_EMIT("movaps %%xmm4, %%xmm0") // xmm0 = i + __ASM_EMIT("mulps %%xmm6, %%xmm0") // xmm0 = k*i + __ASM_EMIT("addps %%xmm7, %%xmm0") // xmm0 = k*i + p + PI/2 + SINF_X_PLUS_PI_2_CORE_X4 + __ASM_EMIT("test $1, %[count]") + __ASM_EMIT("jz 4f") + __ASM_EMIT("movss %%xmm0, 0x00(%[dst])") + __ASM_EMIT("shufps $0x39, %%xmm0, %%xmm0") // xmm0 = S1 S2 S3 S0 + __ASM_EMIT("add $4, %[dst]") + __ASM_EMIT("4:") + __ASM_EMIT("test $2, %[count]") + __ASM_EMIT("jz 6f") + __ASM_EMIT("movlps %%xmm0, 0x00(%[dst])") + // End + __ASM_EMIT("6:") + + : [dst] "+r" (dst), [count] "+r" (count) + : [S2C] "o" (sinf_const), + [S2KP] "o" (kp_gen_const), + [k] "m" (k), + [p] "m" (p) + : "cc", "memory", + "%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7" + ); + } + + } /* namespace sse2 */ +} /* namespace lsp */ + + + +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_PMATH_SIN_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse2/pmath.h 2025-08-26 18:15:43.750003058 +0000 @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_PMATH_H_ +#define PRIVATE_DSP_ARCH_X86_SSE2_PMATH_H_ + +#ifndef PRIVATE_DSP_ARCH_X86_SSE2_IMPL + #error "This header should not be included directly" +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_IMPL */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* PRIVATE_DSP_ARCH_X86_SSE2_PMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse3/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse3/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse3/3dmath.h 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse3/3dmath.h 2025-08-26 18:15:43.754003019 +0000 @@ -182,7 +182,7 @@ namespace lsp size_t colocation_x3_v1p3(const vector3d_t *pl, const point3d_t *p0, const point3d_t *p1, const point3d_t *p2) { - float x0, x1, x2, x3, x4; + float x0, x1, x2, x3; float res[4] __lsp_aligned16; ARCH_X86_ASM @@ -214,8 +214,7 @@ namespace lsp __ASM_EMIT("lea (%[p1], %[p2], 4), %[p1]") __ASM_EMIT("lea (%[p0], %[p1], 4), %[p0]") : [p0] "+r" (p0), [p1] "+r" (p1), [p2] "+r" (p2), - [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [pl] "r" (pl), [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), @@ -229,7 +228,7 @@ namespace lsp size_t colocation_x3_v1pv(const vector3d_t *pl, const point3d_t *pv) { - float x0, x1, x2, x3, x4; + float x0, x1, x2, x3; float res[4] __lsp_aligned16; size_t pt; @@ -262,8 +261,7 @@ namespace lsp __ASM_EMIT("lea (%[pl], %[pv], 4), %[pl]") __ASM_EMIT("lea (%[pt], %[pl], 4), %[pt]") : [pl] "+r" (pl), [pv] "+r" (pv), [pt] "=&r" (pt), - [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), @@ -276,7 +274,7 @@ namespace lsp size_t colocation_x3_v3p1(const vector3d_t *v0, const vector3d_t *v1, const vector3d_t *v2, const point3d_t *p) { - float x0, x1, x2, x3, x4; + float x0, x1, x2, x3; float res[4] __lsp_aligned16; ARCH_X86_ASM @@ -309,8 +307,7 @@ namespace lsp __ASM_EMIT("lea (%[v0], %[v1], 4), %[v0]") : [v0] "+r" (v0), [v1] "+r" (v1), [v2] "+r" (v2), - [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [p] "r" (p), [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), @@ -324,7 +321,7 @@ namespace lsp size_t colocation_x3_vvp1(const vector3d_t *vv, const point3d_t *p) { - float x0, x1, x2, x3, x4; + float x0, x1, x2, x3; float res[4] __lsp_aligned16; size_t pt; @@ -358,8 +355,7 @@ namespace lsp __ASM_EMIT("lea (%[pt], %[vv], 4), %[pt]") : [p] "+r" (p), [vv] "+r" (vv), [pt] "=&r" (pt), - [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4) + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3) : [res] "r" (res), [PTOL] "m" (X_3D_TOLERANCE), [MTOL] "m" (X_3D_MTOLERANCE), @@ -487,6 +483,365 @@ namespace lsp __ASM_EMIT("por %[x1], %[x0]") __ASM_EMIT32("movd %[x0], %[t0]") __ASM_EMIT64("movd %[x0], %k[t0]") + + : [t0] "=&r" (t0), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), [pv] "r" (pv), + [k] "r" (k), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [ICULL3] "m" (ICULL3) + : "cc", "memory" + ); + + #define STR_COPY_TO(tgt) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x00(%[src]), %[x0]") \ + __ASM_EMIT("movups 0x10(%[src]), %[x1]") \ + __ASM_EMIT("movups 0x20(%[src]), %[x2]") \ + __ASM_EMIT("movups %[x0], 0x00(%[dst])") \ + __ASM_EMIT("movups %[x1], 0x10(%[dst])") \ + __ASM_EMIT("movups %[x2], 0x20(%[dst])") \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) \ + : [dst] "r" (tgt), \ + [src] "r" (pv) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_1P(off0, off1, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x1]") /* xmm1 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm2 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("subps %[x0], %[x1]") /* xmm1 = d = p1 - p0 = dx dy dz 0 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x3]") /* xmm3 = k 0 0 0 */ \ + __ASM_EMIT("mulps %[x1], %[x2]") /* xmm2 = dx*nx dy*ny dz*nz 0 */ \ + __ASM_EMIT("shufps $0x00, %[x3], %[x3]") /* xmm3 = k k k k */ \ + __ASM_EMIT("haddps %[x2], %[x2]") /* xmm2 = dx*nx+dy*ny dz*nz dx*nx+dy*ny dz*nz */ \ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = k*dx k*dy k*dz 0 */ \ + __ASM_EMIT("haddps %[x2], %[x2]") /* xmm2 = dx*nx+dy*ny+dz*nz = b b b b */ \ + __ASM_EMIT("divps %[x2], %[x1]") /* xmm1 = k*dx/b k*dy/b k*dz/b 0 */ \ + __ASM_EMIT("subps %[x1], %[x0]") /* xmm0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ + : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x2]") /* xmm2 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups 0x" off2 "(%[st]), %[x3]") /* xmm3 = p2 = lx2 ly2 lz2 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x4]") /* xmm4 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = pl = nx ny nz nw */ \ + __ASM_EMIT("movaps %[x4], %[x5]") /* xmm5 = pl = nx ny nz nw */ \ + __ASM_EMIT("subps %[x0], %[x2]") /* xmm2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("subps %[x1], %[x3]") /* xmm3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("mulps %[x2], %[x4]") /* xmm4 = dx1*nx dy1*ny dz1*nz 0 */ \ + __ASM_EMIT("mulps %[x3], %[x5]") /* xmm5 = dx2*nx dy2*ny dz2*nz 0 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x6]") /* xmm6 = k */ \ + __ASM_EMIT("haddps %[x4], %[x4]") /* xmm4 = dx1*nx+dy1*ny dz1*nz dx1*nx+dy1*ny dz1*nz */ \ + __ASM_EMIT("haddps %[x5], %[x5]") /* xmm5 = dx2*nx+dy2*ny dz2*nz dx2*nx+dy2*ny dz2*nz */ \ + __ASM_EMIT("shufps $0x00, %[x6], %[x6]") /* xmm6 = k k k k */ \ + __ASM_EMIT("haddps %[x4], %[x4]") /* xmm4 = dx1*nx+dy1*ny+dz1*nz = b1 b1 b1 b1 */ \ + __ASM_EMIT("haddps %[x5], %[x5]") /* xmm5 = dx2*nx+dy2*ny+dz2*nz = b2 b2 b2 b2 */ \ + __ASM_EMIT("divps %[x4], %[x2]") /* xmm2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ + __ASM_EMIT("divps %[x5], %[x3]") /* xmm3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ + __ASM_EMIT("mulps %[x6], %[x2]") /* xmm2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ + __ASM_EMIT("mulps %[x6], %[x3]") /* xmm3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = lx1-k*dx2/b2 ly1-k*dy2/b2 lz1-k*dz2/b2 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ + : [st] "r" (pv), [pl] "r" (pl), [out] "r" (out), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + switch (t0) + { + // 0 intersections, triangle is above + case 0x00: // 0 0 0 + case 0x01: // 0 0 1 + case 0x04: // 0 1 0 + case 0x05: // 0 1 1 + case 0x10: // 1 0 0 + case 0x11: // 1 0 1 + case 0x14: // 1 1 0 + case 0x15: // 1 1 1 + STR_COPY_TO(out); + ++(*n_out); + break; + + // 0 intersections, triangle is below + case 0x16: // 1 1 2 + case 0x19: // 1 2 1 + case 0x1a: // 1 2 2 + case 0x25: // 2 1 1 + case 0x26: // 2 1 2 + case 0x29: // 2 2 1 + case 0x2a: // 2 2 2 + STR_COPY_TO(in); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise + case 0x06: // 0 1 2 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x2], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x3], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x21: // 2 0 1 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x18: // 1 2 0 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x3], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x1], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x3], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, clockwise + case 0x24: // 2 1 0 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x1], 0x00(%[out])") + __ASM_EMIT("movups %[x2], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x12: // 1 0 2 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x3], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x3], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + case 0x09: // 0 2 1 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); ++(*n_in); + break; + + // 2 intersections, 1 triangle below, 2 triangles above + case 0x02: // 0 0 2 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + __ASM_EMIT("movups %[x4], 0x30(%[out])") + __ASM_EMIT("movups %[x1], 0x40(%[out])") + __ASM_EMIT("movups %[x3], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + case 0x08: // 0 2 0 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x4], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + __ASM_EMIT("movups %[x2], 0x30(%[out])") + __ASM_EMIT("movups %[x0], 0x40(%[out])") + __ASM_EMIT("movups %[x4], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + case 0x20: // 2 0 0 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + __ASM_EMIT("movups %[x3], 0x30(%[out])") + __ASM_EMIT("movups %[x1], 0x40(%[out])") + __ASM_EMIT("movups %[x2], 0x50(%[out])") + ); + (*n_out) += 2; ++(*n_in); + break; + + // 2 intersections, 1 triangle above, 2 triangles below + case 0x28: // 2 2 0 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x4], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x3], 0x50(%[in])") + __ASM_EMIT("movups %[x2], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + case 0x22: // 2 0 2 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x30(%[in])") + __ASM_EMIT("movups %[x0], 0x40(%[in])") + __ASM_EMIT("movups %[x4], 0x50(%[in])") + __ASM_EMIT("movups %[x3], 0x00(%[out])") + __ASM_EMIT("movups %[x1], 0x10(%[out])") + __ASM_EMIT("movups %[x0], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + case 0x0a: // 0 2 2 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x2], 0x50(%[in])") + __ASM_EMIT("movups %[x4], 0x00(%[out])") + __ASM_EMIT("movups %[x0], 0x10(%[out])") + __ASM_EMIT("movups %[x1], 0x20(%[out])") + ); + ++(*n_out); (*n_in) += 2; + break; + + default: + break; + } + + #undef STR_COPY_TO + #undef STR_SPLIT_1P + #undef STR_SPLIT_2P + } + + void split_triangle_raw_ssse3( + raw_triangle_t *out, + size_t *n_out, + raw_triangle_t *in, + size_t *n_in, + const vector3d_t *pl, + const raw_triangle_t *pv + ) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + float k[4] __lsp_aligned16; + size_t t0; + + in += *n_in; + out += *n_out; + + // Estimate co-location of triangle and point + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl = sx0 sy0 sz0 sw0 */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl = sx1 sy1 sz1 sw1 */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl = sx2 sy2 sz2 sw2 */ + __ASM_EMIT("haddps %[x1], %[x0]") /* xmm0 = sx0+sy0 sz0+sw0 sx1+sy1 sz1+sw1 */ + __ASM_EMIT("haddps %[x2], %[x2]") /* xmm2 = sx2+sy2 sz2+sw2 sx2+sy2 sz2+sw2 */ + __ASM_EMIT("haddps %[x2], %[x0]") /* xmm0 = sx0+sy0+sz0+sw0 sx1+sy1+sz1+sw1 sx2+sy2+sz2+sw2 sx2+sy2+sz2+sw2 = k0 k1 k2 k2 */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 k2 */ + __ASM_EMIT("movaps %[x0], (%[k])") /* *k = xmm0 */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL k2 <= +TOL */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL k2 < -TOL */ + __ASM_EMIT("pand %[ICULL3], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] 0 */ + __ASM_EMIT("pand %[ICULL3], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] 0 */ + __ASM_EMIT("paddd %[x1], %[x0]") /* xmm0 = x0 x1 x2 0 */ + __ASM_EMIT("phaddd %[x0], %[x0]") /* xmm0 = x0+x1 x2+0 x0+x1 x2+0 */ + __ASM_EMIT("phaddd %[x0], %[x0]") /* xmm0 = x0+x1+x2+0 x0+x1+x2+0 x0+x1+x2+0 */ + __ASM_EMIT32("movd %[x0], %[t0]") + __ASM_EMIT64("movd %[x0], %k[t0]") + : [t0] "=&r" (t0), [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) @@ -1099,7 +1454,300 @@ namespace lsp #undef STR_SPLIT_1P #undef STR_SPLIT_2P } - } -} + + void cull_triangle_raw_ssse3( + raw_triangle_t *in, + size_t *n_in, + const vector3d_t *pl, + const raw_triangle_t *pv + ) + { + float x0, x1, x2, x3, x4, x5, x6, x7; + float k[4] __lsp_aligned16; + size_t t0; + + in += *n_in; + + // Estimate co-location of triangle and point + ARCH_X86_ASM + ( + __ASM_EMIT("movups (%[pl]), %[x3]") /* xmm3 = pl */ + __ASM_EMIT("movups 0x00(%[pv]), %[x0]") /* xmm0 = p0 */ + __ASM_EMIT("movups 0x10(%[pv]), %[x1]") /* xmm1 = p1 */ + __ASM_EMIT("movups 0x20(%[pv]), %[x2]") /* xmm2 = p2 */ + + __ASM_EMIT("mulps %[x3], %[x0]") /* xmm0 = p0 * pl = sx0 sy0 sz0 sw0 */ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = p1 * pl = sx1 sy1 sz1 sw1 */ + __ASM_EMIT("mulps %[x3], %[x2]") /* xmm2 = p2 * pl = sx2 sy2 sz2 sw2 */ + __ASM_EMIT("haddps %[x1], %[x0]") /* xmm0 = sx0+sy0 sz0+sw0 sx1+sy1 sz1+sw1 */ + __ASM_EMIT("haddps %[x2], %[x2]") /* xmm2 = sx2+sy2 sz2+sw2 sx2+sy2 sz2+sw2 */ + __ASM_EMIT("haddps %[x2], %[x0]") /* xmm0 = sx0+sy0+sz0+sw0 sx1+sy1+sz1+sw1 sx2+sy2+sz2+sw2 sx2+sy2+sz2+sw2 = k0 k1 k2 k2 */ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = k0 k1 k2 k2 */ + __ASM_EMIT("movaps %[x0], (%[k])") /* *k = xmm0 */ + __ASM_EMIT("cmpps $2, %[PTOL], %[x0]") /* xmm0 = k0 <= +TOL k1 <= +TOL k2 <= +TOL k2 <= +TOL */ + __ASM_EMIT("cmpps $1, %[MTOL], %[x1]") /* xmm1 = k0 < -TOL k1 < -TOL k2 < -TOL k2 < -TOL */ + __ASM_EMIT("pand %[ICULL3], %[x0]") /* xmm0 = 1*[k0 <= +TOL] 1*[k1 <= +TOL] 1*[k2 <= +TOL] 0 */ + __ASM_EMIT("pand %[ICULL3], %[x1]") /* xmm1 = 1*[k0 < -TOL] 1*[k1 < -TOL] 1*[k2 < -TOL] 0 */ + __ASM_EMIT("paddd %[x1], %[x0]") /* xmm0 = x0 x1 x2 0 */ + __ASM_EMIT("phaddd %[x0], %[x0]") /* xmm0 = x0+x1 x2+0 x0+x1 x2+0 */ + __ASM_EMIT("phaddd %[x0], %[x0]") /* xmm0 = x0+x1+x2+0 x0+x1+x2+0 x0+x1+x2+0 */ + __ASM_EMIT32("movd %[x0], %[t0]") + __ASM_EMIT64("movd %[x0], %k[t0]") + + : [t0] "=&r" (t0), + [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), + [x4] "=&x" (x4) + : [pl] "r" (pl), [pv] "r" (pv), + [k] "r" (k), + [PTOL] "m" (X_3D_TOLERANCE), + [MTOL] "m" (X_3D_MTOLERANCE), + [ICULL3] "m" (ICULL3) + : "cc", "memory" + ); + + #define STR_COPY_TO(tgt) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x00(%[src]), %[x0]") \ + __ASM_EMIT("movups 0x10(%[src]), %[x1]") \ + __ASM_EMIT("movups 0x20(%[src]), %[x2]") \ + __ASM_EMIT("movups %[x0], 0x00(%[dst])") \ + __ASM_EMIT("movups %[x1], 0x10(%[dst])") \ + __ASM_EMIT("movups %[x2], 0x20(%[dst])") \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2) \ + : [dst] "r" (tgt), \ + [src] "r" (pv) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_1P(off0, off1, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x1]") /* xmm1 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x2]") /* xmm2 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("subps %[x0], %[x1]") /* xmm1 = d = p1 - p0 = dx dy dz 0 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x3]") /* xmm3 = k 0 0 0 */ \ + __ASM_EMIT("mulps %[x1], %[x2]") /* xmm2 = dx*nx dy*ny dz*nz 0 */ \ + __ASM_EMIT("shufps $0x00, %[x3], %[x3]") /* xmm3 = k k k k */ \ + __ASM_EMIT("haddps %[x2], %[x2]") /* xmm2 = dx*nx+dy*ny dz*nz dx*nx+dy*ny dz*nz */ \ + __ASM_EMIT("mulps %[x3], %[x1]") /* xmm1 = k*dx k*dy k*dz 0 */ \ + __ASM_EMIT("haddps %[x2], %[x2]") /* xmm2 = dx*nx+dy*ny+dz*nz = b b b b */ \ + __ASM_EMIT("divps %[x2], %[x1]") /* xmm1 = k*dx/b k*dy/b k*dz/b 0 */ \ + __ASM_EMIT("subps %[x1], %[x0]") /* xmm0 = lx0-k*dx/b ly0-k*dy/b lz0-k*dz/b 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), [x4] "=&x" (x4) \ + : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + #define STR_SPLIT_2P(off0, off1, off2, koff, store) \ + ARCH_X86_ASM( \ + __ASM_EMIT("movups 0x" off0 "(%[st]), %[x0]") /* xmm0 = p0 = lx0 ly0 lz0 1 */ \ + __ASM_EMIT("movups 0x" off1 "(%[st]), %[x2]") /* xmm2 = p1 = lx1 ly1 lz1 1 */ \ + __ASM_EMIT("movups 0x" off2 "(%[st]), %[x3]") /* xmm3 = p2 = lx2 ly2 lz2 1 */ \ + __ASM_EMIT("movups (%[pl]), %[x4]") /* xmm4 = pl = nx ny nz nw */ \ + \ + __ASM_EMIT("movaps %[x0], %[x1]") /* xmm1 = pl = nx ny nz nw */ \ + __ASM_EMIT("movaps %[x4], %[x5]") /* xmm5 = pl = nx ny nz nw */ \ + __ASM_EMIT("subps %[x0], %[x2]") /* xmm2 = d1 = p1 - p0 = dx1 dy1 dz1 0 */ \ + __ASM_EMIT("subps %[x1], %[x3]") /* xmm3 = d2 = p2 - p0 = dx2 dy2 dz2 0 */ \ + __ASM_EMIT("mulps %[x2], %[x4]") /* xmm4 = dx1*nx dy1*ny dz1*nz 0 */ \ + __ASM_EMIT("mulps %[x3], %[x5]") /* xmm5 = dx2*nx dy2*ny dz2*nz 0 */ \ + __ASM_EMIT("movss 0x" koff "(%[k]), %[x6]") /* xmm6 = k */ \ + __ASM_EMIT("haddps %[x4], %[x4]") /* xmm4 = dx1*nx+dy1*ny dz1*nz dx1*nx+dy1*ny dz1*nz */ \ + __ASM_EMIT("haddps %[x5], %[x5]") /* xmm5 = dx2*nx+dy2*ny dz2*nz dx2*nx+dy2*ny dz2*nz */ \ + __ASM_EMIT("shufps $0x00, %[x6], %[x6]") /* xmm6 = k k k k */ \ + __ASM_EMIT("haddps %[x4], %[x4]") /* xmm4 = dx1*nx+dy1*ny+dz1*nz = b1 b1 b1 b1 */ \ + __ASM_EMIT("haddps %[x5], %[x5]") /* xmm5 = dx2*nx+dy2*ny+dz2*nz = b2 b2 b2 b2 */ \ + __ASM_EMIT("divps %[x4], %[x2]") /* xmm2 = dx1/b1 dy1/b1 dz1/b1 0 */ \ + __ASM_EMIT("divps %[x5], %[x3]") /* xmm3 = dx2/b2 dy2/b2 dz2/b2 0 */ \ + __ASM_EMIT("mulps %[x6], %[x2]") /* xmm2 = k*dx1/b1 k*dy1/b1 k*dz1/b1 0 */ \ + __ASM_EMIT("mulps %[x6], %[x3]") /* xmm3 = k*dx2/b2 k*dy2/b2 k*dz2/b2 0 */ \ + __ASM_EMIT("subps %[x2], %[x0]") /* xmm0 = lx0-k*dx1/b1 ly0-k*dy1/b1 lz0-k*dz1/b1 1 */ \ + __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = lx1-k*dx2/b2 ly1-k*dy2/b2 lz1-k*dz2/b2 1 */ \ + \ + store \ + \ + : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), \ + [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) \ + : [st] "r" (pv), [pl] "r" (pl), [in] "r" (in), \ + [k] "r" (k) \ + : "cc", "memory" \ + ); + + switch (t0) + { + // 0 intersections, triangle is above + case 0x00: // 0 0 0 + case 0x01: // 0 0 1 + case 0x04: // 0 1 0 + case 0x05: // 0 1 1 + case 0x10: // 1 0 0 + case 0x11: // 1 0 1 + case 0x14: // 1 1 0 + case 0x15: // 1 1 1 + break; + + // 0 intersections, triangle is below + case 0x16: // 1 1 2 + case 0x19: // 1 2 1 + case 0x1a: // 1 2 2 + case 0x25: // 2 1 1 + case 0x26: // 2 1 2 + case 0x29: // 2 2 1 + case 0x2a: // 2 2 2 + STR_COPY_TO(in); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, counter-clockwise + case 0x06: // 0 1 2 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x2], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x21: // 2 0 1 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x18: // 1 2 0 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x3], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 1 intersection, 1 triangle above, 1 triangle below, clockwise + case 0x24: // 2 1 0 + STR_SPLIT_1P("00", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x12: // 1 0 2 + STR_SPLIT_1P("00", "10", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x20(%[st]), %[x3]") + __ASM_EMIT("movups %[x1], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x3], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x09: // 0 2 1 + STR_SPLIT_1P("10", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x1]") + __ASM_EMIT("movups 0x10(%[st]), %[x2]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 2 intersections, 1 triangle below, 2 triangles above + case 0x02: // 0 0 2 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x08: // 0 2 0 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + ); + ++(*n_in); + break; + case 0x20: // 2 0 0 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + ); + ++(*n_in); + break; + + // 2 intersections, 1 triangle above, 2 triangles below + case 0x28: // 2 2 0 + STR_SPLIT_2P("00", "10", "20", "00", + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x3], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x4], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x3], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + case 0x22: // 2 0 2 + STR_SPLIT_2P("10", "00", "20", "04", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x20(%[st]), %[x4]") + __ASM_EMIT("movups %[x4], 0x00(%[in])") + __ASM_EMIT("movups %[x0], 0x10(%[in])") + __ASM_EMIT("movups %[x1], 0x20(%[in])") + __ASM_EMIT("movups %[x2], 0x30(%[in])") + __ASM_EMIT("movups %[x0], 0x40(%[in])") + __ASM_EMIT("movups %[x4], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + case 0x0a: // 0 2 2 + STR_SPLIT_2P("20", "00", "10", "08", + __ASM_EMIT("movups 0x00(%[st]), %[x2]") + __ASM_EMIT("movups 0x10(%[st]), %[x3]") + __ASM_EMIT("movups %[x2], 0x00(%[in])") + __ASM_EMIT("movups %[x1], 0x10(%[in])") + __ASM_EMIT("movups %[x0], 0x20(%[in])") + __ASM_EMIT("movups %[x3], 0x30(%[in])") + __ASM_EMIT("movups %[x1], 0x40(%[in])") + __ASM_EMIT("movups %[x2], 0x50(%[in])") + ); + (*n_in) += 2; + break; + + default: + break; + } + + #undef STR_COPY_TO + #undef STR_SPLIT_1P + #undef STR_SPLIT_2P + } + } /* namespace sse3 */ +} /* namespace lsp */ #endif /* PRIVATE_DSP_ARCH_X86_SSE3_3DMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse4/3dmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse4/3dmath.h --- 1.2.21-5/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse4/3dmath.h 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/include/private/dsp/arch/x86/sse4/3dmath.h 2025-08-26 18:15:43.754003019 +0000 @@ -260,65 +260,6 @@ namespace lsp ); } - float check_point3d_on_triangle_tp(const triangle3d_t *t, const point3d_t *p) - { - float x0, x1, x2, x3, x4, x5, x6, x7; - - ARCH_X86_ASM - ( - /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups 0x00(%[t]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups 0x10(%[t]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups 0x20(%[t]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ - /* 3x vector multiplications */ - VECTOR_MUL3("[x0]", "[x1]", "[x2]", "[x3]", "[x4]", "[x5]", "[x6]", "[x7]") - /* 3x scalar multiplications */ - SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") - /* Compare with zeros */ - __ASM_EMIT("xorps %[x4], %[x4]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jb 110f") - __ASM_EMIT("ucomiss %[x4], %[x1]") - __ASM_EMIT("jb 109f") - __ASM_EMIT("ucomiss %[x4], %[x2]") - __ASM_EMIT("jb 108f") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("ucomiss %[x4], %[x0]") - __ASM_EMIT("jne 110f") - /* There is somewhere zero, need additional check */ - /* Load vectors */ - __ASM_EMIT("movups (%[p]), %[x3]") /* xmm3 = px py pz pw */ - __ASM_EMIT("movups 0x00(%[t]), %[x0]") /* xmm0 = x0 y0 z0 w0 */ - __ASM_EMIT("movups 0x10(%[t]), %[x1]") /* xmm1 = x1 y1 z1 w1 */ - __ASM_EMIT("movups 0x20(%[t]), %[x2]") /* xmm2 = x2 y2 z2 w2 */ - __ASM_EMIT("subps %[x3], %[x0]") /* xmm0 = dx0 dy0 dz0 dw0 */ - __ASM_EMIT("subps %[x3], %[x1]") /* xmm1 = dx1 dy1 dz1 dw1 */ - __ASM_EMIT("subps %[x3], %[x2]") /* xmm2 = dx2 dy2 dz2 dw2 */ - /* Do 3x scalar multiplications */ - SCALAR_MUL3("[x0]", "[x1]", "[x2]", "[x3]") - __ASM_EMIT("mulss %[x1], %[x0]") - __ASM_EMIT("mulss %[x2], %[x0]") - __ASM_EMIT("jmp 110f") - - __ASM_EMIT("108:") - __ASM_EMIT("movss %[x2], %[x0]") - __ASM_EMIT("jmp 110f") - __ASM_EMIT("109:") - __ASM_EMIT("movss %[x1], %[x0]") - __ASM_EMIT("110:") - : [x0] "=&x" (x0), [x1] "=&x" (x1), [x2] "=&x" (x2), [x3] "=&x" (x3), - [x4] "=&x" (x4), [x5] "=&x" (x5), [x6] "=&x" (x6), [x7] "=&x" (x7) - : [p] "r" (p), [t] "r" (t) - ); - - return x0; - } - float check_point3d_on_triangle_pvp(const point3d_t *pv, const point3d_t *p) { float x0, x1, x2, x3, x4, x5, x6, x7; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-dsp-lib/make/tools.mk --- 1.2.21-5/modules/lsp-dsp-lib/make/tools.mk 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/make/tools.mk 2025-08-26 18:15:43.754003019 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-dsp-lib/modules.mk 1.2.23-0ubuntu1/modules/lsp-dsp-lib/modules.mk --- 1.2.21-5/modules/lsp-dsp-lib/modules.mk 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/modules.mk 2025-08-26 18:15:43.754003019 +0000 @@ -19,13 +19,13 @@ # # Variables that describe dependencies -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git diff -pruN 1.2.21-5/modules/lsp-dsp-lib/project.mk 1.2.23-0ubuntu1/modules/lsp-dsp-lib/project.mk --- 1.2.21-5/modules/lsp-dsp-lib/project.mk 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/project.mk 2025-08-26 18:15:43.754003019 +0000 @@ -23,4 +23,4 @@ ARTIFACT_ID = LSP_DSP_LI ARTIFACT_NAME = lsp-dsp-lib ARTIFACT_DESC = DSP library for digital signal processing ARTIFACT_HEADERS = lsp-plug.in -ARTIFACT_VERSION = 1.0.29 +ARTIFACT_VERSION = 1.0.31 diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/aarch64/asimd.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/aarch64/asimd.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/aarch64/asimd.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/aarch64/asimd.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -74,18 +74,7 @@ #include #include #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include + #include #include #include #include @@ -302,6 +291,16 @@ EXPORT1(powvx1); EXPORT1(powvx2); + EXPORT1(cosf1); + EXPORT1(cosf2); + EXPORT1(cosf_kp1); + + EXPORT1(sinf1); + EXPORT1(sinf2); + EXPORT1(sinf_kp1); + + EXPORT1(lanczos1); + EXPORT1(sqr1); EXPORT1(sqr2); EXPORT1(ssqrt1); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/arm/neon-d32.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/arm/neon-d32.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/arm/neon-d32.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/arm/neon-d32.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -71,18 +71,7 @@ #include #include #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include + #include #include #include #include @@ -311,6 +300,16 @@ EXPORT1(ssqrt1); EXPORT1(ssqrt2); + EXPORT1(cosf1); + EXPORT1(cosf2); + EXPORT1(cosf_kp1); + + EXPORT1(sinf1); + EXPORT1(sinf2); + EXPORT1(sinf_kp1); + + EXPORT1(lanczos1); + EXPORT1(h_sum); EXPORT1(h_abs_sum); EXPORT1(h_sqr_sum); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/generic/generic.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/generic/generic.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/generic/generic.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/generic/generic.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -165,6 +165,14 @@ namespace lsp EXPORT1(ssqrt1); EXPORT1(ssqrt2); + EXPORT1(sinf1); + EXPORT1(sinf2); + EXPORT1(sinf_kp1); + EXPORT1(cosf1); + EXPORT1(cosf2); + EXPORT1(cosf_kp1); + EXPORT1(lanczos1); + EXPORT1(lramp_set1); EXPORT1(lramp1); EXPORT1(lramp2); @@ -490,10 +498,6 @@ namespace lsp EXPORT1(init_normal3d_dxyz); EXPORT1(init_normal3d); - EXPORT1(init_segment_xyz); - EXPORT1(init_segment_p2); - EXPORT1(init_segment_pv); - EXPORT1(init_matrix3d); EXPORT1(init_matrix3d_zero); EXPORT1(init_matrix3d_one); @@ -510,8 +514,6 @@ namespace lsp EXPORT1(init_matrix3d_lookat_p1v2); EXPORT1(init_matrix3d_lookat_p2v1); EXPORT1(init_matrix3d_orientation); - EXPORT1(calc_matrix3d_transform_r1); - EXPORT1(calc_matrix3d_transform_p1v1); EXPORT1(apply_matrix3d_mv2); EXPORT1(apply_matrix3d_mv1); EXPORT1(apply_matrix3d_mp2); @@ -521,57 +523,23 @@ namespace lsp EXPORT1(transpose_matrix3d1); EXPORT1(transpose_matrix3d2); - EXPORT1(init_ray_xyz); - EXPORT1(init_ray_dxyz); - EXPORT1(init_ray_pdv); - EXPORT1(init_ray_p2); - EXPORT1(init_ray_pv); - EXPORT1(init_ray); - EXPORT1(calc_ray_xyz); - EXPORT1(calc_ray_dxyz); - EXPORT1(calc_ray_pdv); - EXPORT1(calc_ray_p2); - EXPORT1(calc_ray_pv); - EXPORT1(calc_ray); - - EXPORT1(calc_triangle3d_params); - EXPORT1(init_triangle3d_xyz); - EXPORT1(init_triangle3d_p3); - EXPORT1(init_triangle3d_pv); - EXPORT1(init_triangle3d); - EXPORT1(calc_triangle3d_xyz); - EXPORT1(calc_triangle3d_p3); - EXPORT1(calc_triangle3d_pv); - EXPORT1(calc_triangle3d); - EXPORT1(check_triplet3d_p3n); EXPORT1(check_triplet3d_pvn); EXPORT1(check_triplet3d_v2n); EXPORT1(check_triplet3d_vvn); EXPORT1(check_triplet3d_vv); - EXPORT1(check_triplet3d_t); - EXPORT1(check_triplet3d_tn); EXPORT1(check_point3d_on_triangle_p3p); EXPORT1(check_point3d_on_triangle_pvp); - EXPORT1(check_point3d_on_triangle_tp); EXPORT1(longest_edge3d_p3); EXPORT1(longest_edge3d_pv); - EXPORT1(calc_angle3d_v2); - EXPORT1(calc_angle3d_vv); - EXPORT1(calc_normal3d_p3); EXPORT1(calc_normal3d_pv); EXPORT1(calc_normal3d_v2); EXPORT1(calc_normal3d_vv); - EXPORT1(move_point3d_p2); - EXPORT1(move_point3d_pv); - - EXPORT1(calc_bound_box); - EXPORT1(calc_plane_p3); EXPORT1(calc_plane_pv); EXPORT1(calc_plane_v1p2); @@ -595,9 +563,6 @@ namespace lsp EXPORT1(calc_distance_v1); EXPORT1(calc_sqr_distance_pv); - EXPORT1(projection_length_p2); - EXPORT1(projection_length_v2); - EXPORT1(split_triangle_raw); EXPORT1(cull_triangle_raw); EXPORT1(colocation_x2_v1p2); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/avx.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/avx.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/avx.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/avx.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -76,6 +76,8 @@ #include #include + + #include #undef PRIVATE_DSP_ARCH_X86_AVX_IMPL namespace lsp @@ -423,6 +425,72 @@ CEXPORT1(favx, normalize1); CEXPORT1(favx, normalize2); + // 3D math + EXPORT1(init_point_xyz); + EXPORT1(init_point); + EXPORT1(normalize_point); + + EXPORT1(init_vector_dxyz); + EXPORT1(init_vector); + EXPORT1(normalize_vector); + EXPORT1(normalize_vector2); + + EXPORT1(init_matrix3d); + EXPORT1(init_matrix3d_zero); + EXPORT1(init_matrix3d_one); + EXPORT1(init_matrix3d_identity); + EXPORT1(init_matrix3d_translate); + EXPORT1(init_matrix3d_scale); + EXPORT1(init_matrix3d_rotate_x); + EXPORT1(init_matrix3d_rotate_y); + EXPORT1(init_matrix3d_rotate_z); +// EXPORT1(init_matrix3d_rotate_xyz); + EXPORT1(apply_matrix3d_mv2); + EXPORT1(apply_matrix3d_mv1); + EXPORT1(apply_matrix3d_mp2); + EXPORT1(apply_matrix3d_mp1); + EXPORT1(apply_matrix3d_mm2); + EXPORT1(apply_matrix3d_mm1); + EXPORT1(transpose_matrix3d1); + EXPORT1(transpose_matrix3d2); + + EXPORT1(calc_area_p3); + EXPORT1(calc_area_pv); + + EXPORT1(colocation_x2_v1p2); + EXPORT1(colocation_x2_v1pv); + EXPORT1(colocation_x3_v1p3); + EXPORT1(colocation_x3_v1pv); + EXPORT1(colocation_x3_v3p1); + EXPORT1(colocation_x3_vvp1); + + EXPORT1(split_triangle_raw); + EXPORT1(cull_triangle_raw); + + EXPORT1(longest_edge3d_p3); + EXPORT1(longest_edge3d_pv); + + EXPORT1(calc_normal3d_p3); + EXPORT1(calc_normal3d_pv); + EXPORT1(calc_normal3d_v2); + EXPORT1(calc_normal3d_vv); + + EXPORT1(calc_plane_p3); + EXPORT1(calc_plane_pv); + EXPORT1(calc_plane_v1p2); + + EXPORT1(calc_split_point_p2v1); + EXPORT1(calc_split_point_pvv1); + + EXPORT1(check_triplet3d_p3n); + EXPORT1(check_triplet3d_pvn); + EXPORT1(check_triplet3d_v2n); + EXPORT1(check_triplet3d_vvn); + EXPORT1(check_triplet3d_vv); + + EXPORT1(check_point3d_on_triangle_p3p); + EXPORT1(check_point3d_on_triangle_pvp); + // FMA3 support? if (f->features & CPU_OPTION_FMA3) { @@ -515,6 +583,38 @@ CEXPORT2(ffma, dyn_biquad_process_x8, dyn_biquad_process_x8_fma3); CEXPORT2(favx, depan_eqpow, depan_eqpow_fma3); + + // 3D math + CEXPORT2(favx, apply_matrix3d_mm2, apply_matrix3d_mm2_fma3); + CEXPORT2(favx, apply_matrix3d_mm1, apply_matrix3d_mm1_fma3); + CEXPORT2(favx, apply_matrix3d_mp2, apply_matrix3d_mp2_fma3); + CEXPORT2(favx, apply_matrix3d_mp1, apply_matrix3d_mp1_fma3); + CEXPORT2(favx, apply_matrix3d_mv2, apply_matrix3d_mv2_fma3); + CEXPORT2(favx, apply_matrix3d_mv1, apply_matrix3d_mv1_fma3); + + CEXPORT2(favx, calc_area_p3, calc_area_p3_fma3); + CEXPORT2(favx, calc_area_pv, calc_area_pv_fma3); + + CEXPORT2(favx, calc_normal3d_p3, calc_normal3d_p3_fma3); + CEXPORT2(favx, calc_normal3d_pv, calc_normal3d_pv_fma3); + CEXPORT2(favx, calc_normal3d_v2, calc_normal3d_v2_fma3); + CEXPORT2(favx, calc_normal3d_vv, calc_normal3d_vv_fma3); + + CEXPORT2(favx, calc_plane_p3, calc_plane_p3_fma3); + CEXPORT2(favx, calc_plane_pv, calc_plane_pv_fma3); + CEXPORT2(favx, calc_plane_v1p2, calc_plane_v1p2_fma3); + + CEXPORT2(favx, calc_split_point_p2v1, calc_split_point_p2v1_fma3); + CEXPORT2(favx, calc_split_point_pvv1, calc_split_point_pvv1_fma3); + + CEXPORT2(favx, check_triplet3d_p3n, check_triplet3d_p3n_fma3); + CEXPORT2(favx, check_triplet3d_pvn, check_triplet3d_pvn_fma3); + CEXPORT2(favx, check_triplet3d_v2n, check_triplet3d_v2n_fma3); + CEXPORT2(favx, check_triplet3d_vvn, check_triplet3d_vvn_fma3); + CEXPORT2(favx, check_triplet3d_vv, check_triplet3d_vv_fma3); + + CEXPORT2(favx, check_point3d_on_triangle_p3p, check_point3d_on_triangle_p3p_fma3); + CEXPORT2(favx, check_point3d_on_triangle_pvp, check_point3d_on_triangle_pvp_fma3); } } diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/avx2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/avx2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/avx2.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/avx2.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -44,12 +44,7 @@ #include #include - - #include - #include - #include - #include - #include + #include #include @@ -190,6 +185,19 @@ namespace lsp CEXPORT2_X64(favx, powvx1, x64_powvx1); CEXPORT2_X64(favx, powvx2, x64_powvx2); + CEXPORT1(favx, cosf1); + CEXPORT1(favx, cosf2); + CEXPORT1(favx, cosf_kp1); + CEXPORT2_X64(favx, cosf_kp1, x64_cosf_kp1); + + CEXPORT1(favx, sinf1); + CEXPORT1(favx, sinf2); + CEXPORT1(favx, sinf_kp1); + CEXPORT2_X64(favx, sinf_kp1, x64_sinf_kp1); + + CEXPORT1(favx, lanczos1); + CEXPORT2_X64(favx, lanczos1, x64_lanczos1); + CEXPORT2_X64(favx, eff_hsla_hue, x64_eff_hsla_hue); CEXPORT2_X64(favx, eff_hsla_sat, x64_eff_hsla_sat); CEXPORT2_X64(favx, eff_hsla_light, x64_eff_hsla_light); @@ -272,6 +280,19 @@ namespace lsp CEXPORT2_X64(favx, powvx1, x64_powvx1_fma3); CEXPORT2_X64(favx, powvx2, x64_powvx2_fma3); + CEXPORT2(favx, cosf1, cosf1_fma3); + CEXPORT2(favx, cosf2, cosf2_fma3); + CEXPORT2(favx, cosf_kp1, cosf_kp1_fma3); + CEXPORT2_X64(favx, cosf_kp1, x64_cosf_kp1_fma3); + + CEXPORT2(favx, sinf1, sinf1_fma3); + CEXPORT2(favx, sinf2, sinf2_fma3); + CEXPORT2(favx, sinf_kp1, sinf_kp1_fma3); + CEXPORT2_X64(favx, sinf_kp1, x64_sinf_kp1_fma3); + + CEXPORT2(favx, lanczos1, lanczos1_fma3); + CEXPORT2_X64(favx, lanczos1, x64_lanczos1_fma3); + CEXPORT2(favx, compressor_x2_gain, compressor_x2_gain_fma3); CEXPORT2(favx, compressor_x2_curve, compressor_x2_curve_fma3); CEXPORT2_X64(favx, compressor_x2_gain, x64_compressor_x2_gain_fma3); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/avx512.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/avx512.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/avx512.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/avx512.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -158,12 +158,12 @@ CEXPORT1(vl, fmmod4); CEXPORT1(vl, fmrmod4); - CEXPORT2(vl, logb1, logb1); - CEXPORT2(vl, logb2, logb2); - CEXPORT2(vl, loge1, loge1); - CEXPORT2(vl, loge2, loge2); - CEXPORT2(vl, logd1, logd1); - CEXPORT2(vl, logd2, logd2); + CEXPORT1(vl, logb1); + CEXPORT1(vl, logb2); + CEXPORT1(vl, loge1); + CEXPORT1(vl, loge2); + CEXPORT1(vl, logd1); + CEXPORT1(vl, logd2); CEXPORT2_X64(vl, logb1, x64_logb1); CEXPORT2_X64(vl, logb2, x64_logb2); @@ -172,6 +172,19 @@ CEXPORT2_X64(vl, logd1, x64_logd1); CEXPORT2_X64(vl, logd2, x64_logd2); + CEXPORT1(vl, cosf1); + CEXPORT1(vl, cosf2); + CEXPORT1(vl, cosf_kp1); + CEXPORT2_X64(vl, cosf_kp1, x64_cosf_kp1); + + CEXPORT1(vl, sinf1); + CEXPORT1(vl, sinf2); + CEXPORT1(vl, sinf_kp1); + CEXPORT2_X64(vl, sinf_kp1, x64_sinf_kp1); + + CEXPORT1(vl, lanczos1); + CEXPORT2_X64(vl, lanczos1, x64_lanczos1); + CEXPORT1(vl, lramp_set1); CEXPORT1(vl, lramp1); CEXPORT1(vl, lramp2); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -419,23 +419,6 @@ EXPORT1(add_vector_pvk1); EXPORT1(add_vector_pvk2); - EXPORT1(init_ray_xyz); - EXPORT1(init_ray_dxyz); - EXPORT1(init_ray_pdv); - EXPORT1(init_ray_p2); - EXPORT1(init_ray_pv); - EXPORT1(init_ray); - EXPORT1(calc_ray_xyz); - EXPORT1(calc_ray_dxyz); - EXPORT1(calc_ray_pdv); - EXPORT1(calc_ray_p2); - EXPORT1(calc_ray_pv); - EXPORT1(calc_ray); - - EXPORT1(init_segment_xyz); - EXPORT1(init_segment_p2); - EXPORT1(init_segment_pv); - EXPORT1(init_matrix3d); EXPORT1(init_matrix3d_zero); EXPORT1(init_matrix3d_one); @@ -455,9 +438,15 @@ EXPORT1(transpose_matrix3d1); EXPORT1(transpose_matrix3d2); + EXPORT1(colocation_x2_v1p2); + EXPORT1(colocation_x2_v1pv); + EXPORT1(colocation_x3_v1p3); + EXPORT1(colocation_x3_v1pv); + EXPORT1(colocation_x3_v3p1); + EXPORT1(colocation_x3_vvp1); + EXPORT1(check_point3d_on_triangle_p3p); EXPORT1(check_point3d_on_triangle_pvp); - EXPORT1(check_point3d_on_triangle_tp); EXPORT1(longest_edge3d_p3); EXPORT1(longest_edge3d_pv); @@ -467,31 +456,15 @@ EXPORT1(check_triplet3d_v2n); EXPORT1(check_triplet3d_vvn); EXPORT1(check_triplet3d_vv); - EXPORT1(check_triplet3d_t); - EXPORT1(check_triplet3d_tn); - - // EXPORT1(reflect_ray); - - EXPORT1(calc_angle3d_v2); - EXPORT1(calc_angle3d_vv); EXPORT1(calc_normal3d_p3); EXPORT1(calc_normal3d_pv); EXPORT1(calc_normal3d_v2); EXPORT1(calc_normal3d_vv); - EXPORT1(move_point3d_p2); - EXPORT1(move_point3d_pv); EXPORT1(calc_split_point_p2v1); EXPORT1(calc_split_point_pvv1); - EXPORT1(colocation_x2_v1p2); - EXPORT1(colocation_x2_v1pv); - EXPORT1(colocation_x3_v1p3); - EXPORT1(colocation_x3_v1pv); - EXPORT1(colocation_x3_v3p1); - EXPORT1(colocation_x3_vvp1); - EXPORT1(calc_plane_p3); EXPORT1(calc_plane_pv); EXPORT1(calc_plane_v1p2); @@ -501,9 +474,6 @@ EXPORT1(calc_min_distance_p3); EXPORT1(calc_min_distance_pv); - EXPORT1(split_triangle_raw); - EXPORT1(cull_triangle_raw); - EXPORT1(convolve); EXPORT1(corr_init); EXPORT1(corr_incr); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse2.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse2.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -53,13 +53,9 @@ #include #include - #include - #include - #include - #include - #include - #include - #include + #include + + #include #undef PRIVATE_DSP_ARCH_X86_SSE2_IMPL namespace lsp @@ -123,6 +119,16 @@ EXPORT1(powvx1); EXPORT1(powvx2); + EXPORT1(cosf1); + EXPORT1(cosf2); + EXPORT1(cosf_kp1); + + EXPORT1(sinf1); + EXPORT1(sinf2); + EXPORT1(sinf_kp1); + + EXPORT1(lanczos1); + EXPORT1(min_index); EXPORT1(max_index); EXPORT1(minmax_index); @@ -155,6 +161,20 @@ EXPORT1(uexpander_x1_curve) EXPORT1(dexpander_x1_gain) EXPORT1(dexpander_x1_curve) + + // 3D Math + EXPORT1(transpose_matrix3d1); + EXPORT1(transpose_matrix3d2); + + EXPORT1(colocation_x2_v1p2); + EXPORT1(colocation_x2_v1pv); + EXPORT1(colocation_x3_v1p3); + EXPORT1(colocation_x3_v1pv); + EXPORT1(colocation_x3_v3p1); + EXPORT1(colocation_x3_vvp1); + + EXPORT1(split_triangle_raw); + EXPORT1(cull_triangle_raw); } #undef EXPORT1 diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse3.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse3.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse3.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse3.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -119,6 +119,12 @@ EXPORT1(cull_triangle_raw); EXPORT2_X64(corr_incr, x64_corr_incr); + + if (f->features & CPU_OPTION_SSSE3) + { + EXPORT2(split_triangle_raw, split_triangle_raw_ssse3); + EXPORT2(cull_triangle_raw, cull_triangle_raw_ssse3); + } } #undef EXPORT2 diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse4.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse4.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/sse4.cpp 2025-03-01 12:42:56.808648290 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/sse4.cpp 2025-08-26 18:15:43.754003019 +0000 @@ -73,7 +73,6 @@ EXPORT1(check_point3d_on_triangle_p3p); EXPORT1(check_point3d_on_triangle_pvp); - EXPORT1(check_point3d_on_triangle_tp); } #undef EXPORT1 diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/x86.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/x86.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/main/x86/x86.cpp 2025-03-01 12:42:56.812648266 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/main/x86/x86.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -572,10 +572,10 @@ // Only starting with ZEN 1 architecture AMD's implementation of AVX is fast enough if ((f->vendor == CPU_VENDOR_AMD) || (f->vendor == CPU_VENDOR_HYGON)) { - if (f->family < AMD_FAMILY_ZEN_3_4) - return false; if (f->family == AMD_FAMILY_DHYANA) return false; + if (f->family < AMD_FAMILY_ZEN_3_4) + return false; return true; } break; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/area.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/area.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/area.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/area.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define POINTS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + float calc_area_p3(const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_area_pv(const dsp::point3d_t *pv); + } + + IF_ARCH_X86( + namespace sse + { + float calc_area_p3(const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_area_pv(const dsp::point3d_t *pv); + } + + namespace avx + { + float calc_area_p3(const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_area_p3_fma3(const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_area_pv(const dsp::point3d_t *pv); + float calc_area_pv_fma3(const dsp::point3d_t *pv); + } + ) + + typedef float (* calc_area_p3_t)(const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + typedef float (* calc_area_pv_t)(const dsp::point3d_t *pv); +} + + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", area, 5, 1000) + + void call(const char *label, const dsp::point3d_t *pv, calc_area_p3_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + PTEST_LOOP(label, + const dsp::point3d_t *p = pv; + for (size_t i=0; i<(POINTS_COUNT - 2); ++i, ++p) + { + func(&p[0], &p[1], &p[2]); + } + ); + } + + void call(const char *label, const dsp::point3d_t *pv, calc_area_pv_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + PTEST_LOOP(label, + for (size_t i=0; i<(POINTS_COUNT - 2); ++i) + func(&pv[i]); + ); + } + + PTEST_MAIN + { + const size_t buf_size = POINTS_COUNT; + uint8_t *data = NULL; + dsp::point3d_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + for (size_t i=0; i < POINTS_COUNT; ++i) + dsp::init_point_xyz(&src[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::calc_area_p3); + IF_ARCH_X86(CALL(sse::calc_area_p3)); + IF_ARCH_X86(CALL(avx::calc_area_p3)); + IF_ARCH_X86(CALL(avx::calc_area_p3_fma3)); + PTEST_SEPARATOR; + + CALL(generic::calc_area_pv); + IF_ARCH_X86(CALL(sse::calc_area_pv)); + IF_ARCH_X86(CALL(avx::calc_area_pv)); + IF_ARCH_X86(CALL(avx::calc_area_pv_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/check_point_on_triangle.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/check_point_on_triangle.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/check_point_on_triangle.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/check_point_on_triangle.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 25 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define TRIANGLES_COUNT 0x4000 + +namespace lsp +{ + namespace generic + { + float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); + } + + IF_ARCH_X86( + namespace sse + { + float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); + } + + namespace avx + { + float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); + + float check_point3d_on_triangle_p3p_fma3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp_fma3(const dsp::point3d_t *pv, const dsp::point3d_t *p); + } + ) + + typedef float (* check_point3d_on_triangle_p3p_t)(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + typedef float (* check_point3d_on_triangle_pvp_t)(const dsp::point3d_t *pv, const dsp::point3d_t *p); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", check_point_on_triangle, 5, 1000) + + void call(const char *label, const dsp::point3d_t *pv, check_point3d_on_triangle_p3p_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::point3d_t t; + dsp::init_point_xyz(&t, 0.0f, 0.0f, 0.0f); + + PTEST_LOOP(label, + const dsp::point3d_t *p = pv; + for (size_t i=0; i(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + dsp::point3d_t *p = src; + for (size_t i=0; i < TRIANGLES_COUNT; ++i, p += 3) + { + size_t m = i % 3; + const float x1 = randf(-10.0f, 10.0f); + const float x2 = randf(-10.0f, 10.0f); + const float x3 = randf(-10.0f, 10.0f); + const float y1 = randf(-10.0f, 10.0f); + const float y2 = randf(-10.0f, 10.0f); + const float y3 = randf(-10.0f, 10.0f); + + if (m == 0) + { + dsp::init_point_xyz(&p[0], x1, y1, 0.0f); + dsp::init_point_xyz(&p[1], x2, y2, 0.0f); + dsp::init_point_xyz(&p[2], x3, y3, 0.0f); + } + else if (m == 1) + { + dsp::init_point_xyz(&p[0], y1, 0.0f, x1); + dsp::init_point_xyz(&p[1], y2, 0.0f, x2); + dsp::init_point_xyz(&p[2], y3, 0.0f, x3); + } + else + { + dsp::init_point_xyz(&p[0], 0.0f, x1, y1); + dsp::init_point_xyz(&p[1], 0.0f, x2, y2); + dsp::init_point_xyz(&p[2], 0.0f, x3, y3); + } + } + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::check_point3d_on_triangle_p3p); + IF_ARCH_X86(CALL(sse::check_point3d_on_triangle_p3p)); + IF_ARCH_X86(CALL(avx::check_point3d_on_triangle_p3p)); + IF_ARCH_X86(CALL(avx::check_point3d_on_triangle_p3p_fma3)); + PTEST_SEPARATOR; + + CALL(generic::check_point3d_on_triangle_pvp); + IF_ARCH_X86(CALL(sse::check_point3d_on_triangle_pvp)); + IF_ARCH_X86(CALL(avx::check_point3d_on_triangle_pvp)); + IF_ARCH_X86(CALL(avx::check_point3d_on_triangle_pvp_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x2.cpp 2025-03-01 12:42:56.812648266 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x2.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -44,11 +44,23 @@ namespace lsp size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); } + namespace sse2 + { + size_t colocation_x2_v1p2(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + } + namespace sse3 { size_t colocation_x2_v1p2(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); } + + namespace avx + { + size_t colocation_x2_v1p2(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + } ) typedef size_t (* colocation_x2_v1p2_t)(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); @@ -66,7 +78,7 @@ PTEST_BEGIN("dsp.3d", colocation_x2, 5, char buf[80]; snprintf(buf, sizeof(buf), "%s", label); - printf("Testing %s numbers...\n", buf); + printf("Testing %s ...\n", buf); PTEST_LOOP(buf, const dsp::vector3d_t *xpl = pl; @@ -86,7 +98,7 @@ PTEST_BEGIN("dsp.3d", colocation_x2, 5, char buf[80]; snprintf(buf, sizeof(buf), "%s", label); - printf("Testing %s numbers...\n", buf); + printf("Testing %s ...\n", buf); PTEST_LOOP(buf, const dsp::vector3d_t *xpl = pl; @@ -131,15 +143,21 @@ PTEST_BEGIN("dsp.3d", colocation_x2, 5, for (size_t i=0; i < N_LINES*2; ++i) dsp::init_point_xyz(&points[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + #define CALL(func) \ + call(#func, planes, points, func); - call("generic::colocation_x2_v1p2", planes, points, generic::colocation_x2_v1p2); - IF_ARCH_X86(call("sse::colocation_x2_v1p2", planes, points, sse::colocation_x2_v1p2)); - IF_ARCH_X86(call("sse3::colocation_x2_v1p2", planes, points, sse3::colocation_x2_v1p2)); + CALL(generic::colocation_x2_v1p2); + IF_ARCH_X86(CALL(sse::colocation_x2_v1p2)); + IF_ARCH_X86(CALL(sse2::colocation_x2_v1p2)); + IF_ARCH_X86(CALL(sse3::colocation_x2_v1p2)); + IF_ARCH_X86(CALL(avx::colocation_x2_v1p2)); PTEST_SEPARATOR; - call("generic::colocation_x2_v1pv", planes, points, generic::colocation_x2_v1pv); - IF_ARCH_X86(call("sse::colocation_x2_v1pv", planes, points, sse::colocation_x2_v1pv)); - IF_ARCH_X86(call("sse3::colocation_x2_v1pv", planes, points, sse3::colocation_x2_v1pv)); + CALL(generic::colocation_x2_v1pv); + IF_ARCH_X86(CALL(sse::colocation_x2_v1pv)); + IF_ARCH_X86(CALL(sse2::colocation_x2_v1pv)); + IF_ARCH_X86(CALL(sse3::colocation_x2_v1pv)); + IF_ARCH_X86(CALL(avx::colocation_x2_v1pv)); PTEST_SEPARATOR; free_aligned(data); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x3.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x3.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x3.cpp 2025-03-01 12:42:56.812648266 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/colocation_x3.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -48,6 +48,14 @@ namespace lsp size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); } + namespace sse2 + { + size_t colocation_x3_v1p3(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + size_t colocation_x3_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + size_t colocation_x3_v3p1(const dsp::vector3d_t *v0, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::point3d_t *p); + size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); + } + namespace sse3 { size_t colocation_x3_v1p3(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); @@ -55,6 +63,14 @@ namespace lsp size_t colocation_x3_v3p1(const dsp::vector3d_t *v0, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::point3d_t *p); size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); } + + namespace avx + { + size_t colocation_x3_v1p3(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + size_t colocation_x3_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + size_t colocation_x3_v3p1(const dsp::vector3d_t *v0, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::point3d_t *p); + size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); + } ) typedef size_t (* colocation_x3_v1p3_t)(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); @@ -74,7 +90,7 @@ PTEST_BEGIN("dsp.3d", colocation_x3, 5, char buf[80]; snprintf(buf, sizeof(buf), "%s", label); - printf("Testing %s numbers...\n", buf); + printf("Testing %s ...\n", buf); PTEST_LOOP(buf, const dsp::vector3d_t *xpl = pl; @@ -94,7 +110,7 @@ PTEST_BEGIN("dsp.3d", colocation_x3, 5, char buf[80]; snprintf(buf, sizeof(buf), "%s", label); - printf("Testing %s numbers...\n", buf); + printf("Testing %s ...\n", buf); PTEST_LOOP(buf, const dsp::vector3d_t *xpl = pl; @@ -114,7 +130,7 @@ PTEST_BEGIN("dsp.3d", colocation_x3, 5, char buf[80]; snprintf(buf, sizeof(buf), "%s", label); - printf("Testing %s numbers...\n", buf); + printf("Testing %s ...\n", buf); PTEST_LOOP(buf, const dsp::vector3d_t *xpl = pl; @@ -134,7 +150,7 @@ PTEST_BEGIN("dsp.3d", colocation_x3, 5, char buf[80]; snprintf(buf, sizeof(buf), "%s", label); - printf("Testing %s numbers...\n", buf); + printf("Testing %s ...\n", buf); PTEST_LOOP(buf, const dsp::vector3d_t *xpl = pl; @@ -179,25 +195,37 @@ PTEST_BEGIN("dsp.3d", colocation_x3, 5, for (size_t i=0; i < N_POINTS*3; ++i) dsp::init_point_xyz(&points[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - - call_pv("generic::colocation_x3_v1p3", planes, points, generic::colocation_x3_v1p3); - IF_ARCH_X86(call_pv("sse::colocation_x3_v1p3", planes, points, sse::colocation_x3_v1p3)); - IF_ARCH_X86(call_pv("sse3::colocation_x3_v1p3", planes, points, sse3::colocation_x3_v1p3)); + #define CALL_PV(func) \ + call_pv(#func, planes, points, func) + #define CALL_VV(func) \ + call_vv(#func, planes, points, func) + + CALL_PV(generic::colocation_x3_v1p3); + IF_ARCH_X86(CALL_PV(sse::colocation_x3_v1p3)); + IF_ARCH_X86(CALL_PV(sse2::colocation_x3_v1p3)); + IF_ARCH_X86(CALL_PV(sse3::colocation_x3_v1p3)); + IF_ARCH_X86(CALL_PV(avx::colocation_x3_v1p3)); PTEST_SEPARATOR; - call_pv("generic::colocation_x3_v1pv", planes, points, generic::colocation_x3_v1pv); - IF_ARCH_X86(call_pv("sse::colocation_x3_v1pv", planes, points, sse::colocation_x3_v1pv)); - IF_ARCH_X86(call_pv("sse3::colocation_x3_v1pv", planes, points, sse3::colocation_x3_v1pv)); + CALL_PV(generic::colocation_x3_v1pv); + IF_ARCH_X86(CALL_PV(sse::colocation_x3_v1pv)); + IF_ARCH_X86(CALL_PV(sse2::colocation_x3_v1pv)); + IF_ARCH_X86(CALL_PV(sse3::colocation_x3_v1pv)); + IF_ARCH_X86(CALL_PV(avx::colocation_x3_v1pv)); PTEST_SEPARATOR; - call_vv("generic::colocation_x3_v3p1", planes, points, generic::colocation_x3_v3p1); - IF_ARCH_X86(call_vv("sse::colocation_x3_v3p1", planes, points, sse::colocation_x3_v3p1)); - IF_ARCH_X86(call_vv("sse3::colocation_x3_v3p1", planes, points, sse3::colocation_x3_v3p1)); + CALL_VV(generic::colocation_x3_v3p1); + IF_ARCH_X86(CALL_VV(sse::colocation_x3_v3p1)); + IF_ARCH_X86(CALL_VV(sse2::colocation_x3_v3p1)); + IF_ARCH_X86(CALL_VV(sse3::colocation_x3_v3p1)); + IF_ARCH_X86(CALL_VV(avx::colocation_x3_v3p1)); PTEST_SEPARATOR; - call_vv("generic::colocation_x3_vvp1", planes, points, generic::colocation_x3_vvp1); - IF_ARCH_X86(call_vv("sse::colocation_x3_vvp1", planes, points, sse::colocation_x3_vvp1)); - IF_ARCH_X86(call_vv("sse3::colocation_x3_vvp1", planes, points, sse3::colocation_x3_vvp1)); + CALL_VV(generic::colocation_x3_vvp1); + IF_ARCH_X86(CALL_VV(sse::colocation_x3_vvp1)); + IF_ARCH_X86(CALL_VV(sse2::colocation_x3_vvp1)); + IF_ARCH_X86(CALL_VV(sse3::colocation_x3_vvp1)); + IF_ARCH_X86(CALL_VV(avx::colocation_x3_vvp1)); PTEST_SEPARATOR; free_aligned(data); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/edge.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/edge.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/edge.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/edge.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 21 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define POINTS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + size_t longest_edge3d_p3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + size_t longest_edge3d_pv(const dsp::point3d_t *p); + } + + IF_ARCH_X86( + namespace sse + { + size_t longest_edge3d_p3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + size_t longest_edge3d_pv(const dsp::point3d_t *p); + } + + namespace avx + { + size_t longest_edge3d_p3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + size_t longest_edge3d_pv(const dsp::point3d_t *p); + } + ) + + typedef size_t (* longest_edge3d_p3_t)(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + typedef size_t (* longest_edge3d_pv_t)(const dsp::point3d_t *p); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", edge, 5, 1000) + + void call(const char *label, const dsp::point3d_t *pv, longest_edge3d_p3_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + PTEST_LOOP(label, + const dsp::point3d_t *p = pv; + for (size_t i=0; i<(POINTS_COUNT - 2); ++i, ++p) + { + func(&p[0], &p[1], &p[2]); + } + ); + } + + void call(const char *label, const dsp::point3d_t *pv, longest_edge3d_pv_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + PTEST_LOOP(label, + for (size_t i=0; i<(POINTS_COUNT - 2); ++i) + func(&pv[i]); + ); + } + + PTEST_MAIN + { + const size_t buf_size = POINTS_COUNT; + uint8_t *data = NULL; + dsp::point3d_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + for (size_t i=0; i < POINTS_COUNT; ++i) + dsp::init_point_xyz(&src[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::longest_edge3d_p3); + IF_ARCH_X86(CALL(sse::longest_edge3d_p3)); + IF_ARCH_X86(CALL(avx::longest_edge3d_p3)); + PTEST_SEPARATOR; + + CALL(generic::longest_edge3d_pv); + IF_ARCH_X86(CALL(sse::longest_edge3d_pv)); + IF_ARCH_X86(CALL(avx::longest_edge3d_pv)); + PTEST_SEPARATOR; + } +PTEST_END + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/mat4_transpose.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/mat4_transpose.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/mat4_transpose.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/mat4_transpose.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 18 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define N_MATRICES 0x1000 + +namespace lsp +{ + namespace generic + { + void transpose_matrix3d1(dsp::matrix3d_t *r); + void transpose_matrix3d2(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + } + + IF_ARCH_X86( + namespace sse + { + void transpose_matrix3d1(dsp::matrix3d_t *r); + void transpose_matrix3d2(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + } + + namespace sse2 + { + void transpose_matrix3d1(dsp::matrix3d_t *r); + void transpose_matrix3d2(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + } + + namespace avx + { + void transpose_matrix3d1(dsp::matrix3d_t *r); + void transpose_matrix3d2(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + } + ) + + typedef void (* transpose_matrix3d1_t)(dsp::matrix3d_t *r); + typedef void (* transpose_matrix3d2_t)(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", mat4_transpose, 5, 1000) + + void call(const char *label, dsp::matrix3d_t *dst, const dsp::matrix3d_t *src, transpose_matrix3d2_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s", label); + printf("Testing %s ...\n", buf); + + PTEST_LOOP(buf, + for (size_t i=0; i(data, buf_size * 2, 64); + + dsp::matrix3d_t *dst = reinterpret_cast(ptr); + dsp::matrix3d_t *src = reinterpret_cast(&dst[N_MATRICES]); + + // Initialize matrices + for (size_t i=0; i < N_MATRICES;) + { + randomize_sign(src[i].m, 16); + ++i; + } + + #define CALL1(func) \ + memcpy(dst, src, buf_size); \ + call(#func, dst, func); + + #define CALL2(func) \ + memcpy(dst, src, buf_size); \ + call(#func, dst, src, func); + + CALL1(generic::transpose_matrix3d1); + IF_ARCH_X86(CALL1(sse::transpose_matrix3d1)); + IF_ARCH_X86(CALL1(sse2::transpose_matrix3d1)); + IF_ARCH_X86(CALL1(avx::transpose_matrix3d1)); + PTEST_SEPARATOR; + + CALL2(generic::transpose_matrix3d2); + IF_ARCH_X86(CALL2(sse::transpose_matrix3d2)); + IF_ARCH_X86(CALL2(sse2::transpose_matrix3d2)); + IF_ARCH_X86(CALL2(avx::transpose_matrix3d2)); + PTEST_SEPARATOR; + + free_aligned(data); + } +PTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/normal_p.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/normal_p.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/normal_p.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/normal_p.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define POINTS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); + } + + IF_ARCH_X86( + namespace sse + { + void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); + } + + namespace avx + { + void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); + + void calc_normal3d_p3_fma3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv_fma3(dsp::vector3d_t *n, const dsp::point3d_t *pv); + } + ) + + typedef void (* calc_normal3d_p3_t)(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + typedef void (* calc_normal3d_pv_t)(dsp::vector3d_t *n, const dsp::point3d_t *pv); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", normal_p, 5, 1000) + + void call(const char *label, const dsp::point3d_t *pv, calc_normal3d_p3_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + PTEST_LOOP(label, + const dsp::point3d_t *p = pv; + for (size_t i=0; i<(POINTS_COUNT - 2); ++i, ++p) + func(&dst, &p[0], &p[1], &p[2]); + ); + } + + void call(const char *label, const dsp::point3d_t *pv, calc_normal3d_pv_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + PTEST_LOOP(label, + for (size_t i=0; i<(POINTS_COUNT - 2); ++i) + func(&dst, &pv[i]); + ); + } + + PTEST_MAIN + { + const size_t buf_size = POINTS_COUNT; + uint8_t *data = NULL; + dsp::point3d_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + for (size_t i=0; i < POINTS_COUNT; ++i) + dsp::init_point_xyz(&src[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::calc_normal3d_p3); + IF_ARCH_X86(CALL(sse::calc_normal3d_p3)); + IF_ARCH_X86(CALL(avx::calc_normal3d_p3)); + IF_ARCH_X86(CALL(avx::calc_normal3d_p3_fma3)); + PTEST_SEPARATOR; + + CALL(generic::calc_normal3d_pv); + IF_ARCH_X86(CALL(sse::calc_normal3d_pv)); + IF_ARCH_X86(CALL(avx::calc_normal3d_pv)); + IF_ARCH_X86(CALL(avx::calc_normal3d_pv_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/normal_v.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/normal_v.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/normal_v.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/normal_v.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define VECTORS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + } + + IF_ARCH_X86( + namespace sse + { + void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + } + + namespace avx + { + void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + + void calc_normal3d_v2_fma3(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv_fma3(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + } + ) + + typedef void (* calc_normal3d_v2_t)(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + typedef void (* calc_normal3d_vv_t)(dsp::vector3d_t *n, const dsp::vector3d_t *vv); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", normal_v, 5, 1000) + + void call(const char *label, const dsp::vector3d_t *vv, calc_normal3d_v2_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + PTEST_LOOP(label, + const dsp::vector3d_t *v = vv; + for (size_t i=0; i<(VECTORS_COUNT - 1); ++i, ++v) + func(&dst, &v[0], &v[1]); + ); + } + + void call(const char *label, const dsp::vector3d_t *pv, calc_normal3d_vv_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + PTEST_LOOP(label, + for (size_t i=0; i<(VECTORS_COUNT - 1); ++i) + func(&dst, &pv[i]); + ); + } + + PTEST_MAIN + { + const size_t buf_size = VECTORS_COUNT; + uint8_t *data = NULL; + dsp::vector3d_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + for (size_t i=0; i < VECTORS_COUNT; ++i) + dsp::init_vector_dxyz(&src[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::calc_normal3d_v2); + IF_ARCH_X86(CALL(sse::calc_normal3d_v2)); + IF_ARCH_X86(CALL(avx::calc_normal3d_v2)); + IF_ARCH_X86(CALL(avx::calc_normal3d_v2_fma3)); + PTEST_SEPARATOR; + + CALL(generic::calc_normal3d_vv); + IF_ARCH_X86(CALL(sse::calc_normal3d_vv)); + IF_ARCH_X86(CALL(avx::calc_normal3d_vv)); + IF_ARCH_X86(CALL(avx::calc_normal3d_vv_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + + + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/plane_p.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/plane_p.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/plane_p.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/plane_p.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define POINTS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + float calc_plane_p3(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_plane_pv(dsp::vector3d_t *v, const dsp::point3d_t *pv); + } + + IF_ARCH_X86( + namespace sse + { + float calc_plane_p3(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_plane_pv(dsp::vector3d_t *v, const dsp::point3d_t *pv); + } + + namespace avx + { + float calc_plane_p3(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_plane_pv(dsp::vector3d_t *v, const dsp::point3d_t *pv); + + float calc_plane_p3_fma3(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_plane_pv_fma3(dsp::vector3d_t *v, const dsp::point3d_t *pv); + } + ) + + typedef float (* calc_plane_p3_t)(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + typedef float (* calc_plane_pv_t)(dsp::vector3d_t *v, const dsp::point3d_t *pv); +} + + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", plane_p, 5, 1000) + + void call(const char *label, const dsp::point3d_t *pv, calc_plane_p3_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + PTEST_LOOP(label, + const dsp::point3d_t *p = pv; + for (size_t i=0; i<(POINTS_COUNT - 2); ++i, ++p) + { + func(&dst, &p[0], &p[1], &p[2]); + } + ); + } + + void call(const char *label, const dsp::point3d_t *pv, calc_plane_pv_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + PTEST_LOOP(label, + for (size_t i=0; i<(POINTS_COUNT - 2); ++i) + func(&dst, &pv[i]); + ); + } + + PTEST_MAIN + { + const size_t buf_size = POINTS_COUNT; + uint8_t *data = NULL; + dsp::point3d_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + for (size_t i=0; i < POINTS_COUNT; ++i) + dsp::init_point_xyz(&src[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::calc_plane_p3); + IF_ARCH_X86(CALL(sse::calc_plane_p3)); + IF_ARCH_X86(CALL(avx::calc_plane_p3)); + IF_ARCH_X86(CALL(avx::calc_plane_p3_fma3)); + PTEST_SEPARATOR; + + CALL(generic::calc_plane_pv); + IF_ARCH_X86(CALL(sse::calc_plane_pv)); + IF_ARCH_X86(CALL(avx::calc_plane_pv)); + IF_ARCH_X86(CALL(avx::calc_plane_pv_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/plane_vp.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/plane_vp.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/plane_vp.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/plane_vp.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define CALLS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + float calc_plane_v1p2(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + } + + IF_ARCH_X86( + namespace sse + { + float calc_plane_v1p2(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + } + + namespace avx + { + float calc_plane_v1p2(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + float calc_plane_v1p2_fma3(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + } + ) + + typedef float (* calc_plane_v1p2_t)(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); +} + + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", plane_vp, 5, 1000) + + typedef struct vplane_t + { + dsp::vector3d_t v; + dsp::point3d_t p1; + dsp::point3d_t p2; + } vplane_t; + + void call(const char *label, const vplane_t *pv, calc_plane_v1p2_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t dst; + + PTEST_LOOP(label, + const vplane_t *p = pv; + for (size_t i=0; iv, &p->p1, &p->p2); + } + ); + } + + PTEST_MAIN + { + const size_t buf_size = CALLS_COUNT; + uint8_t *data = NULL; + vplane_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + for (size_t i=0; i < CALLS_COUNT; ++i) + { + vplane_t *p = &src[i]; + dsp::init_vector_dxyz(&p->v, randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + dsp::init_point_xyz(&p->p1, randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + dsp::init_point_xyz(&p->p2, randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + } + + #define CALL(func) \ + call(#func, src, func); + + CALL(generic::calc_plane_v1p2); + IF_ARCH_X86(CALL(sse::calc_plane_v1p2)); + IF_ARCH_X86(CALL(avx::calc_plane_v1p2)); + IF_ARCH_X86(CALL(avx::calc_plane_v1p2_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + + + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/raw_triangle.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/raw_triangle.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/3d/raw_triangle.cpp 2025-03-01 12:42:56.812648266 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/3d/raw_triangle.cpp 2025-08-26 18:15:43.758002980 +0000 @@ -38,7 +38,7 @@ namespace lsp } IF_ARCH_X86( - namespace sse + namespace sse2 { void cull_triangle_raw(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); void split_triangle_raw(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); @@ -47,6 +47,14 @@ namespace lsp namespace sse3 { void cull_triangle_raw(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + void cull_triangle_raw_ssse3(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + void split_triangle_raw(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + void split_triangle_raw_ssse3(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + } + + namespace avx + { + void cull_triangle_raw(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); void split_triangle_raw(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); } ) @@ -75,7 +83,7 @@ PTEST_BEGIN("dsp.3d", raw_triangle, 5, 1 const dsp::raw_triangle_t *t = vt; size_t nin = 0; for (size_t j=0; j + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +#define POINTS_COUNT 0x10000 + +namespace lsp +{ + namespace generic + { + void calc_split_point_p2v1(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + } + + IF_ARCH_X86( + namespace sse + { + void calc_split_point_p2v1(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + } + + namespace sse3 + { + void calc_split_point_p2v1(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + } + + namespace avx + { + void calc_split_point_p2v1(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + + void calc_split_point_p2v1_fma3(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1_fma3(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + } + ) + + typedef void (* calc_split_point_p2v1_t)(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + typedef void (* calc_split_point_pvv1_t)(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.3d", split_point, 5, 1000) + + void call(const char *label, const dsp::point3d_t *pv, const dsp::vector3d_t *pl, calc_split_point_p2v1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::point3d_t dst; + PTEST_LOOP(label, + const dsp::point3d_t *p = pv; + for (size_t i=0; i<(POINTS_COUNT - 1); ++i, ++p) + func(&dst, &p[0], &p[1], pl); + ); + } + + void call(const char *label, const dsp::point3d_t *pv, const dsp::vector3d_t *pl, calc_split_point_pvv1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + printf("Testing %s...\n", label); + + dsp::point3d_t dst; + PTEST_LOOP(label, + for (size_t i=0; i<(POINTS_COUNT - 1); ++i) + func(&dst, &pv[i], pl); + ); + } + + PTEST_MAIN + { + const size_t buf_size = POINTS_COUNT; + uint8_t *data = NULL; + dsp::point3d_t *src = alloc_aligned(data, buf_size, 64); + lsp_finally { + free_aligned(data); + }; + + // Initialize data + dsp::vector3d_t pl; + pl.dx = 0.5f; + pl.dy = 0.5f; + pl.dz = 0.5f; + pl.dw = -1.0f; + + for (size_t i=0; i < POINTS_COUNT; ++i) + dsp::init_point_xyz(&src[i], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + + #define CALL(func) \ + call(#func, src, &pl, func); + + CALL(generic::calc_split_point_p2v1); + IF_ARCH_X86(CALL(sse::calc_split_point_p2v1)); + IF_ARCH_X86(CALL(sse3::calc_split_point_p2v1)); + IF_ARCH_X86(CALL(avx::calc_split_point_p2v1)); + IF_ARCH_X86(CALL(avx::calc_split_point_p2v1_fma3)); + PTEST_SEPARATOR; + + CALL(generic::calc_split_point_pvv1); + IF_ARCH_X86(CALL(sse::calc_split_point_pvv1)); + IF_ARCH_X86(CALL(sse3::calc_split_point_pvv1)); + IF_ARCH_X86(CALL(avx::calc_split_point_pvv1)); + IF_ARCH_X86(CALL(avx::calc_split_point_pvv1_fma3)); + PTEST_SEPARATOR; + } +PTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf1.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void cosf1(float *dst, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void cosf1(float *dst, size_t count); + } + + namespace avx2 + { + void cosf1(float *dst, size_t count); + void cosf1_fma3(float *dst, size_t count); + } + + namespace avx512 + { + void cosf1(float *dst, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void cosf1(float *dst, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void cosf1(float *dst, size_t count); + } + ) + + typedef void (* cosf1_t)(float *dst, size_t count); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", cosf1, 5, 1000) + + void call(const char *label, float *dst, const float *src, size_t count, cosf1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + PTEST_LOOP(buf, + dsp::copy(dst, src, count); + func(dst, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size * 3, 64); + float *src = &dst[buf_size]; + float *backup = &src[buf_size]; + + for (size_t i=0; i < buf_size*3; ++i) + dst[i] = randf(-100.0f * M_PI, 100.0f * M_PI); + dsp::copy(backup, dst, buf_size); + + #define CALL(func) \ + dsp::copy(dst, backup, buf_size); \ + call(#func, dst, src, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::cosf1); + IF_ARCH_X86(CALL(sse2::cosf1)); + IF_ARCH_X86(CALL(avx2::cosf1)); + IF_ARCH_X86(CALL(avx2::cosf1_fma3)); + IF_ARCH_X86(CALL(avx512::cosf1)); + IF_ARCH_ARM(CALL(neon_d32::cosf1)); + IF_ARCH_AARCH64(CALL(asimd::cosf1)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf2.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf2.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void cosf2(float *dst, const float *src, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void cosf2(float *dst, const float *src, size_t count); + } + + namespace avx2 + { + void cosf2(float *dst, const float *src, size_t count); + void cosf2_fma3(float *dst, const float *src, size_t count); + } + + namespace avx512 + { + void cosf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void cosf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void cosf2(float *dst, const float *src, size_t count); + } + ) + + typedef void (* cosf2_t)(float *dst, const float *src, size_t count); +} + + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", cosf2, 5, 1000) + + void call(const char *label, float *dst, const float *src, size_t count, cosf2_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + PTEST_LOOP(buf, + func(dst, src, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size * 3, 64); + float *src = &dst[buf_size]; + float *backup = &src[buf_size]; + + for (size_t i=0; i < buf_size*3; ++i) + dst[i] = randf(-100.0f * M_PI, 100.0f * M_PI); + dsp::copy(backup, dst, buf_size); + + #define CALL(func) \ + dsp::copy(dst, backup, buf_size); \ + call(#func, dst, src, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::cosf2); + IF_ARCH_X86(CALL(sse2::cosf2)); + IF_ARCH_X86(CALL(avx2::cosf2)); + IF_ARCH_X86(CALL(avx2::cosf2_fma3)); + IF_ARCH_X86(CALL(avx512::cosf2)); + IF_ARCH_ARM(CALL(neon_d32::cosf2)); + IF_ARCH_AARCH64(CALL(asimd::cosf2)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf_kp1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf_kp1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf_kp1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/cosf_kp1.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + + namespace avx2 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + void cosf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_X86_64( + namespace avx2 + { + void x64_cosf_kp1(float *dst, float k, float p, size_t count); + void x64_cosf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void x64_cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + typedef void (* cosf_kp1_t)(float *dst, float k, float p, size_t count); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", cosf_kp1, 5, 1000) + + void call(const char *label, float *dst, size_t count, cosf_kp1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + PTEST_LOOP(buf, + func(dst, 0.5f, 0.5f, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size, 64); + + #define CALL(func) \ + call(#func, dst, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::cosf_kp1); + IF_ARCH_X86(CALL(sse2::cosf_kp1)); + IF_ARCH_X86(CALL(avx2::cosf_kp1)); + IF_ARCH_X86(CALL(avx2::cosf_kp1_fma3)); + IF_ARCH_X86_64(CALL(avx2::x64_cosf_kp1)); + IF_ARCH_X86_64(CALL(avx2::x64_cosf_kp1_fma3)); + IF_ARCH_X86(CALL(avx512::cosf_kp1)); + IF_ARCH_X86_64(CALL(avx512::x64_cosf_kp1)); + IF_ARCH_ARM(CALL(neon_d32::cosf_kp1)); + IF_ARCH_AARCH64(CALL(asimd::cosf_kp1)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/lanczos1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/lanczos1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/lanczos1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/lanczos1.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 17 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + + namespace avx2 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + void lanczos1_fma3(float *dst, float k, float p, float t, float a, size_t count); + } + + namespace avx512 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + IF_ARCH_X86_64( + namespace avx2 + { + void x64_lanczos1(float *dst, float k, float p, float t, float a, size_t count); + void x64_lanczos1_fma3(float *dst, float k, float p, float t, float a, size_t count); + } + + namespace avx512 + { + void x64_lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + typedef void (* lanczos1_t)(float *dst, float k, float p, float t, float a, size_t count); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", lanczos1, 5, 1000) + + void call(const char *label, float *dst, size_t count, lanczos1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + const size_t length = count; + const size_t lobes = 8.0f; + const size_t center = length >> 1; + const float shift = 0.0f; + const float k = M_PI * float(lobes) / float(center); // Number of samples per lobe + const float p = (float(center) - shift) * k; + const float t = float(center) * k; + const float a = 1.0f / float(lobes); + + PTEST_LOOP(buf, + func(dst, k, p, t, a, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size, 64); + + #define CALL(func) \ + call(#func, dst, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::lanczos1); + IF_ARCH_X86(CALL(sse2::lanczos1)); + IF_ARCH_X86(CALL(avx2::lanczos1)); + IF_ARCH_X86(CALL(avx2::lanczos1_fma3)); + IF_ARCH_X86_64(CALL(avx2::x64_lanczos1)); + IF_ARCH_X86_64(CALL(avx2::x64_lanczos1_fma3)); + IF_ARCH_X86(CALL(avx512::lanczos1)); + IF_ARCH_X86_64(CALL(avx512::x64_lanczos1)); + IF_ARCH_ARM(CALL(neon_d32::lanczos1)); + IF_ARCH_AARCH64(CALL(asimd::lanczos1)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf1.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 11 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void sinf1(float *dst, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void sinf1(float *dst, size_t count); + } + + namespace avx2 + { + void sinf1(float *dst, size_t count); + void sinf1_fma3(float *dst, size_t count); + } + + namespace avx512 + { + void sinf1(float *dst, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void sinf1(float *dst, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void sinf1(float *dst, size_t count); + } + ) + + typedef void (* sinf1_t)(float *dst, size_t count); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", sinf1, 5, 1000) + + void call(const char *label, float *dst, const float *src, size_t count, sinf1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + PTEST_LOOP(buf, + dsp::copy(dst, src, count); + func(dst, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size * 3, 64); + float *src = &dst[buf_size]; + float *backup = &src[buf_size]; + + for (size_t i=0; i < buf_size*3; ++i) + dst[i] = randf(-100.0f * M_PI, 100.0f * M_PI); + dsp::copy(backup, dst, buf_size); + + #define CALL(func) \ + dsp::copy(dst, backup, buf_size); \ + call(#func, dst, src, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::sinf1); + IF_ARCH_X86(CALL(sse2::sinf1)); + IF_ARCH_X86(CALL(avx2::sinf1)); + IF_ARCH_X86(CALL(avx2::sinf1_fma3)); + IF_ARCH_X86(CALL(avx512::sinf1)); + IF_ARCH_ARM(CALL(neon_d32::sinf1)); + IF_ARCH_AARCH64(CALL(asimd::sinf1)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf2.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf2.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 11 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void sinf2(float *dst, const float *src, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void sinf2(float *dst, const float *src, size_t count); + } + + namespace avx2 + { + void sinf2(float *dst, const float *src, size_t count); + void sinf2_fma3(float *dst, const float *src, size_t count); + } + + namespace avx512 + { + void sinf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void sinf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void sinf2(float *dst, const float *src, size_t count); + } + ) + + typedef void (* sinf2_t)(float *dst, const float *src, size_t count); +} + + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", sinf2, 5, 1000) + + void call(const char *label, float *dst, const float *src, size_t count, sinf2_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + PTEST_LOOP(buf, + func(dst, src, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size * 3, 64); + float *src = &dst[buf_size]; + float *backup = &src[buf_size]; + + for (size_t i=0; i < buf_size*3; ++i) + dst[i] = randf(-100.0f * M_PI, 100.0f * M_PI); + dsp::copy(backup, dst, buf_size); + + #define CALL(func) \ + dsp::copy(dst, backup, buf_size); \ + call(#func, dst, src, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::sinf2); + IF_ARCH_X86(CALL(sse2::sinf2)); + IF_ARCH_X86(CALL(avx2::sinf2)); + IF_ARCH_X86(CALL(avx2::sinf2_fma3)); + IF_ARCH_X86(CALL(avx512::sinf2)); + IF_ARCH_ARM(CALL(neon_d32::sinf2)); + IF_ARCH_AARCH64(CALL(asimd::sinf2)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf_kp1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf_kp1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf_kp1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/ptest/pmath/sinf_kp1.cpp 2025-08-26 18:15:43.762002942 +0000 @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 12 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + + +#include +#include +#include +#include +#include +#include + +#define MIN_RANK 8 +#define MAX_RANK 16 + +namespace lsp +{ + namespace generic + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + + namespace avx2 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + void sinf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_X86_64( + namespace avx2 + { + void x64_sinf_kp1(float *dst, float k, float p, size_t count); + void x64_sinf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void x64_sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + typedef void (* sinf_kp1_t)(float *dst, float k, float p, size_t count); +} + +//----------------------------------------------------------------------------- +// Performance test +PTEST_BEGIN("dsp.pmath", sinf_kp1, 5, 1000) + + void call(const char *label, float *dst, size_t count, sinf_kp1_t func) + { + if (!PTEST_SUPPORTED(func)) + return; + + char buf[80]; + snprintf(buf, sizeof(buf), "%s x %d", label, int(count)); + printf("Testing %s numbers...\n", buf); + + PTEST_LOOP(buf, + func(dst, 0.5f, 0.5f, count); + ); + } + + PTEST_MAIN + { + size_t buf_size = 1 << MAX_RANK; + uint8_t *data = NULL; + float *dst = alloc_aligned(data, buf_size, 64); + + #define CALL(func) \ + call(#func, dst, count, func); + + for (size_t i=MIN_RANK; i <= MAX_RANK; ++i) + { + size_t count = 1 << i; + + CALL(generic::sinf_kp1); + IF_ARCH_X86(CALL(sse2::sinf_kp1)); + IF_ARCH_X86(CALL(avx2::sinf_kp1)); + IF_ARCH_X86(CALL(avx2::sinf_kp1_fma3)); + IF_ARCH_X86_64(CALL(avx2::x64_sinf_kp1)); + IF_ARCH_X86_64(CALL(avx2::x64_sinf_kp1_fma3)); + IF_ARCH_X86(CALL(avx512::sinf_kp1)); + IF_ARCH_X86_64(CALL(avx512::x64_sinf_kp1)); + IF_ARCH_ARM(CALL(neon_d32::sinf_kp1)); + IF_ARCH_AARCH64(CALL(asimd::sinf_kp1)); + PTEST_SEPARATOR; + } + + free_aligned(data); + } +PTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/angle.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/angle.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/angle.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/angle.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -/* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov - * - * This file is part of lsp-dsp-lib - * Created on: 31 мар. 2020 г. - * - * lsp-dsp-lib is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * lsp-dsp-lib 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with lsp-dsp-lib. If not, see . - */ - -#include -#include -#include -#include -#include - -namespace lsp -{ - namespace generic - { - float calc_angle3d_v2(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); - float calc_angle3d_vv(const dsp::vector3d_t *v); - } - - IF_ARCH_X86( - namespace sse - { - float calc_angle3d_v2(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); - float calc_angle3d_vv(const dsp::vector3d_t *v); - } - ) - - typedef float (* calc_angle3d_v2_t)(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); - typedef float (* calc_angle3d_vv_t)(const dsp::vector3d_t *v); -} - -UTEST_BEGIN("dsp.3d", angle) - - void call(const char *label, - calc_angle3d_v2_t calc_angle3d_v2, - calc_angle3d_vv_t calc_angle3d_vv - ) - { - for (float phi=0.0f; phi + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); + } + + IF_ARCH_X86( + namespace sse + { + float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); + } + + namespace avx + { + float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); + + float check_point3d_on_triangle_p3p_fma3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + float check_point3d_on_triangle_pvp_fma3(const dsp::point3d_t *pv, const dsp::point3d_t *p); + } + ) + + typedef float (* check_point3d_on_triangle_p3p_t)(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); + typedef float (* check_point3d_on_triangle_pvp_t)(const dsp::point3d_t *pv, const dsp::point3d_t *p); +} + + +UTEST_BEGIN("dsp.3d", check_point_on_triangle) + + void test_point( + size_t k, size_t i, size_t j, + const dsp::point3d_t *t, + check_point3d_on_triangle_p3p_t check_p3p, + check_point3d_on_triangle_pvp_t check_pvp, + const dsp::point3d_t *p, + float sign) + { + // Check p3p + float result = check_p3p(&t[0], &t[1], &t[2], p); + if (((sign < 0.0f) && (result >= 0.0f)) || + ((sign > 0.0f) && (result <= 0.0f)) || + ((sign == 0.0f) && (result != 0.0f))) + { + for (size_t i=0; i<3; ++i) + printf("t[%d] = {%f, %f, %f, %f}\n", int(i), t[i].x, t[i].y, t[i].z, t[i].w); + printf("p = {%f, %f, %f, %f}\n", p->x, p->y, p->z, p->w); + UTEST_ASSERT_MSG(false, + "k=%d, i=%d, j=%d: failed check_point3d_on_triangle_p3p check, result=%f, expected=%f", + int(k), int(i), int(j), + result, sign); + } + + // Check pvp + result = check_pvp(t, p); + if (((sign < 0.0f) && (result >= 0.0f)) || + ((sign > 0.0f) && (result <= 0.0f)) || + ((sign == 0.0f) && (result != 0.0f))) + { + for (size_t i=0; i<3; ++i) + printf("t[%d] = {%f, %f, %f, %f}\n", int(i), t[i].x, t[i].y, t[i].z, t[i].w); + printf("p = {%f, %f, %f, %f}\n", p->x, p->y, p->z, p->w); + UTEST_ASSERT_MSG(false, + "k=%d, i=%d, j=%d: failed check_point3d_on_triangle_pvp check, result=%f, expected=%f", + int(k), int(i), int(j), + result, sign); + } + } + + #define TEST_POINT(x, y, z, s) \ + if (j == 0) \ + dsp::init_point_xyz(&p, x, y, z); \ + else if (j == 1) \ + dsp::init_point_xyz(&p, y, z, x); \ + else \ + dsp::init_point_xyz(&p, z, x, y); \ + test_point(k, i, j, t, check_p3p, check_pvp, &p, s); + + void call( + const char *label, + check_point3d_on_triangle_p3p_t check_p3p, + check_point3d_on_triangle_pvp_t check_pvp) + { + if ((!UTEST_SUPPORTED(check_p3p)) || (!UTEST_SUPPORTED(check_pvp))) + return; + + printf("Testing %s...\n", label); + + // Init points + dsp::point3d_t t[3], p; + dsp::init_point_xyz(&t[0], 1.0f, 1.0f, 1.0f); + dsp::init_point_xyz(&t[1], 3.0f, 1.0f, 1.0f); + dsp::init_point_xyz(&t[2], 2.0f, 3.0f, 1.0f); + + static const float delta = 1e-4f; + + for (size_t k = 0; k < 2; ++k) + { + for (size_t i=0; i<3; ++i) + { + for (size_t j=0; j<3; ++j) + { + // Test points inside of triangle + TEST_POINT(2.0f, 2.0f, 1.0f, 1.0f); + TEST_POINT(2.0f, 2.75f, 1.0f, 1.0f); + TEST_POINT(2.0f, 1.25f, 1.0f, 1.0f); + TEST_POINT(1.25f, 1.25f, 1.0f, 1.0f); + TEST_POINT(2.75f, 1.25f, 1.0f, 1.0f); + // Test points inside of triangle with small offsets + TEST_POINT(2.0f, 2.0f, 1.0f + delta, 1.0f); + TEST_POINT(2.0f, 2.75f, 1.0f + delta, 1.0f); + TEST_POINT(2.0f, 1.25f, 1.0f + delta, 1.0f); + TEST_POINT(1.25f, 1.25f, 1.0f + delta, 1.0f); + TEST_POINT(2.75f, 1.25f, 1.0f + delta, 1.0f); + TEST_POINT(2.0f, 2.0f, 1.0f - delta, 1.0f); + TEST_POINT(2.0f, 2.75f, 1.0f - delta, 1.0f); + TEST_POINT(2.0f, 1.25f, 1.0f - delta, 1.0f); + TEST_POINT(1.25f, 1.25f, 1.0f - delta, 1.0f); + TEST_POINT(2.75f, 1.25f, 1.0f - delta, 1.0f); + // Test points nearby vertices + TEST_POINT(1.0f + delta, 1.0f + delta, 1.0f, 1.0f); + TEST_POINT(3.0f - delta, 1.0f + delta, 1.0f, 1.0f); + TEST_POINT(2.0f, 3.0f - delta, 1.0f, 1.0f); + // Test points nearby edges + TEST_POINT(1.5f + delta, 2.0f, 1.0f, 1.0f); + TEST_POINT(2.5f - delta, 2.0f, 1.0f, 1.0f); + TEST_POINT(2.0f, 1.0f + delta, 1.0f, 1.0f); + // Test points lying on vertices + TEST_POINT(1.0f, 1.0f, 1.0f, 0.0f); + TEST_POINT(3.0f, 1.0f, 1.0f, 0.0f); + TEST_POINT(2.0f, 3.0f, 1.0f, 0.0f); + // Test points lying on edges of triangle + TEST_POINT(1.5f, 2.0f, 1.0f, 0.0f); + TEST_POINT(2.5f, 2.0f, 1.0f, 0.0f); + TEST_POINT(2.0f, 1.0f, 1.0f, 0.0f); + // Test points lying on edges continuations of triangle + TEST_POINT(0.5f, 0.0f, 1.0f, -1.0f); + TEST_POINT(0.5f, 1.0f, 1.0f, -1.0f); + TEST_POINT(4.0f, -1.0f, 1.0f, -1.0f); + TEST_POINT(4.0f, 1.0f, 1.0f, -1.0f); + TEST_POINT(1.0f, 5.0f, 1.0f, -1.0f); + TEST_POINT(2.5f, 4.0f, 1.0f, -1.0f); + + // Rotate point coordinates + for (size_t j=0; j<3; ++j) + { + const float c = t[j].x; + t[j].x = t[j].y; + t[j].y = t[j].z; + t[j].z = c; + } + } + + // Rotate triangle edges + p = t[0]; + t[0] = t[1]; + t[1] = t[2]; + t[2] = p; + } + + // Flip order of vertices + p = t[0]; + t[0] = t[1]; + t[1] = p; + } + } + + UTEST_MAIN + { + IF_ARCH_X86(call( + "generic::check_point3d_on_triangle", + generic::check_point3d_on_triangle_p3p, + generic::check_point3d_on_triangle_pvp)); + + IF_ARCH_X86(call( + "sse::check_point3d_on_triangle", + sse::check_point3d_on_triangle_p3p, + sse::check_point3d_on_triangle_pvp)); + + IF_ARCH_X86(call( + "avx::check_point3d_on_triangle", + avx::check_point3d_on_triangle_p3p, + avx::check_point3d_on_triangle_pvp)); + + IF_ARCH_X86(call( + "avx_fma3::check_point3d_on_triangle", + avx::check_point3d_on_triangle_p3p_fma3, + avx::check_point3d_on_triangle_pvp_fma3)); + } +UTEST_END; + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x2.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x2.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 17 нояб. 2020 г. @@ -39,11 +39,23 @@ namespace lsp size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); } + namespace sse2 + { + size_t colocation_x2_v1p2(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + } + namespace sse3 { size_t colocation_x2_v1p2(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); } + + namespace avx + { + size_t colocation_x2_v1p2(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + size_t colocation_x2_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + } ) typedef size_t (* colocation_x2_v1p2_t)(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1); @@ -183,9 +195,13 @@ UTEST_BEGIN("dsp.3d", colocation_x2) test(#func, func) IF_ARCH_X86(CALL(sse::colocation_x2_v1p2)); + IF_ARCH_X86(CALL(sse2::colocation_x2_v1p2)); IF_ARCH_X86(CALL(sse3::colocation_x2_v1p2)); + IF_ARCH_X86(CALL(avx::colocation_x2_v1p2)); IF_ARCH_X86(CALL(sse::colocation_x2_v1pv)); + IF_ARCH_X86(CALL(sse2::colocation_x2_v1pv)); IF_ARCH_X86(CALL(sse3::colocation_x2_v1pv)); + IF_ARCH_X86(CALL(avx::colocation_x2_v1pv)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x3.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x3.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x3.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/colocation_x3.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 17 нояб. 2020 г. @@ -43,6 +43,14 @@ namespace lsp size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); } + namespace sse2 + { + size_t colocation_x3_v1p3(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + size_t colocation_x3_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + size_t colocation_x3_v3p1(const dsp::vector3d_t *v0, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::point3d_t *p); + size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); + } + namespace sse3 { size_t colocation_x3_v1p3(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); @@ -50,6 +58,14 @@ namespace lsp size_t colocation_x3_v3p1(const dsp::vector3d_t *v0, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::point3d_t *p); size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); } + + namespace avx + { + size_t colocation_x3_v1p3(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + size_t colocation_x3_v1pv(const dsp::vector3d_t *pl, const dsp::point3d_t *pv); + size_t colocation_x3_v3p1(const dsp::vector3d_t *v0, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::point3d_t *p); + size_t colocation_x3_vvp1(const dsp::vector3d_t *vv, const dsp::point3d_t *p); + } ) typedef size_t (* colocation_x3_v1p3_t)(const dsp::vector3d_t *pl, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); @@ -294,15 +310,23 @@ UTEST_BEGIN("dsp.3d", colocation_x3) test ## id(#func, func) IF_ARCH_X86(CALL(1, sse::colocation_x3_v1p3)); + IF_ARCH_X86(CALL(1, sse2::colocation_x3_v1p3)); IF_ARCH_X86(CALL(1, sse3::colocation_x3_v1p3)); + IF_ARCH_X86(CALL(1, avx::colocation_x3_v1p3)); IF_ARCH_X86(CALL(2, sse::colocation_x3_v1pv)); + IF_ARCH_X86(CALL(2, sse2::colocation_x3_v1pv)); IF_ARCH_X86(CALL(2, sse3::colocation_x3_v1pv)); + IF_ARCH_X86(CALL(2, avx::colocation_x3_v1pv)); IF_ARCH_X86(CALL(3, sse::colocation_x3_v3p1)); + IF_ARCH_X86(CALL(3, sse2::colocation_x3_v3p1)); IF_ARCH_X86(CALL(3, sse3::colocation_x3_v3p1)); + IF_ARCH_X86(CALL(3, avx::colocation_x3_v3p1)); IF_ARCH_X86(CALL(4, sse::colocation_x3_vvp1)); + IF_ARCH_X86(CALL(4, sse2::colocation_x3_vvp1)); IF_ARCH_X86(CALL(4, sse3::colocation_x3_vvp1)); + IF_ARCH_X86(CALL(4, avx::colocation_x3_vvp1)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/cull_triangle.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/cull_triangle.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/cull_triangle.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/cull_triangle.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -31,7 +31,7 @@ namespace lsp } IF_ARCH_X86( - namespace sse + namespace sse2 { void cull_triangle_raw(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); } @@ -39,6 +39,12 @@ namespace lsp namespace sse3 { void cull_triangle_raw(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + void cull_triangle_raw_ssse3(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + } + + namespace avx + { + void cull_triangle_raw(dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); } ) @@ -175,9 +181,14 @@ UTEST_BEGIN("dsp.3d", cull_triangle) UTEST_MAIN { - test_func("generic::cull_triangle_raw", generic::cull_triangle_raw); - IF_ARCH_X86(test_func("sse::cull_triangle_raw", sse::cull_triangle_raw)); - IF_ARCH_X86(test_func("sse3::cull_triangle_raw", sse3::cull_triangle_raw)); + #define CALL(func) \ + test_func(#func, func); + + CALL(generic::cull_triangle_raw); + IF_ARCH_X86(CALL(sse2::cull_triangle_raw)); + IF_ARCH_X86(CALL(sse3::cull_triangle_raw)); + IF_ARCH_X86(CALL(sse3::cull_triangle_raw_ssse3)); + IF_ARCH_X86(CALL(avx::cull_triangle_raw)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/edge.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/edge.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/edge.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/edge.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -37,6 +37,12 @@ namespace lsp size_t longest_edge3d_p3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); size_t longest_edge3d_pv(const dsp::point3d_t *p); } + + namespace avx + { + size_t longest_edge3d_p3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + size_t longest_edge3d_pv(const dsp::point3d_t *p); + } ) typedef size_t (* longest_edge3d_p3_t)(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); @@ -62,6 +68,20 @@ UTEST_BEGIN("dsp.3d", edge) UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[0], &lp[1], &lp[2]) == 1, "longest_edge3d_p3 failed"); UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[1], &lp[2], &lp[0]) == 0, "longest_edge3d_p3 failed"); UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[2], &lp[0], &lp[1]) == 2, "longest_edge3d_p3 failed"); + + dsp::init_point_xyz(&lp[0], 0.0f, 0.0f, 0.0f); + dsp::init_point_xyz(&lp[1], 1.0f, 0.0f, 0.0f); + dsp::init_point_xyz(&lp[2], 0.5f, 1.0f, 0.0f); + + UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[0], &lp[1], &lp[2]) == 1, "longest_edge3d_p3 failed"); + UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[1], &lp[2], &lp[0]) == 0, "longest_edge3d_p3 failed"); + UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[2], &lp[0], &lp[1]) == 0, "longest_edge3d_p3 failed"); + + UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[0], &lp[2], &lp[1]) == 0, "longest_edge3d_p3 failed"); + UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[1], &lp[0], &lp[2]) == 1, "longest_edge3d_p3 failed"); + UTEST_ASSERT_MSG(longest_edge3d_p3(&lp[2], &lp[1], &lp[0]) == 0, "longest_edge3d_p3 failed"); + + UTEST_ASSERT_MSG(longest_edge3d_pv(lp) == 1, "longest_edge3d_pv failed"); } UTEST_MAIN @@ -76,6 +96,12 @@ UTEST_BEGIN("dsp.3d", edge) sse::longest_edge3d_pv ) ); + IF_ARCH_X86( + call("avx::longest_edge", + avx::longest_edge3d_p3, + avx::longest_edge3d_pv + ) + ); } UTEST_END diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/matrix.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/matrix.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/matrix.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/matrix.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -43,9 +43,6 @@ namespace lsp void init_matrix3d_rotate_z(dsp::matrix3d_t *m, float angle); void init_matrix3d_rotate_xyz(dsp::matrix3d_t *m, float x, float y, float z, float angle); - void calc_matrix3d_transform_p1v1(dsp::matrix3d_t *m, const dsp::point3d_t *p, const dsp::vector3d_t *v); - void calc_matrix3d_transform_r1(dsp::matrix3d_t *m, const dsp::ray3d_t *r); - void apply_matrix3d_mv2(dsp::vector3d_t *r, const dsp::vector3d_t *v, const dsp::matrix3d_t *m); void apply_matrix3d_mv1(dsp::vector3d_t *r, const dsp::matrix3d_t *m); void apply_matrix3d_mp2(dsp::point3d_t *r, const dsp::point3d_t *p, const dsp::matrix3d_t *m); @@ -78,6 +75,44 @@ namespace lsp void apply_matrix3d_mm2(dsp::matrix3d_t *r, const dsp::matrix3d_t *s, const dsp::matrix3d_t *m); void apply_matrix3d_mm1(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); } + + namespace sse2 + { + void transpose_matrix3d1(dsp::matrix3d_t *r); + void transpose_matrix3d2(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + } + + namespace avx + { + void init_matrix3d(dsp::matrix3d_t *dst, const dsp::matrix3d_t *src); + void init_matrix3d_zero(dsp::matrix3d_t *m); + void init_matrix3d_one(dsp::matrix3d_t *m); + void init_matrix3d_identity(dsp::matrix3d_t *m); + void transpose_matrix3d1(dsp::matrix3d_t *r); + void transpose_matrix3d2(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + + void init_matrix3d_translate(dsp::matrix3d_t *m, float dx, float dy, float dz); + void init_matrix3d_scale(dsp::matrix3d_t *m, float sx, float sy, float sz); + void init_matrix3d_rotate_x(dsp::matrix3d_t *m, float angle); + void init_matrix3d_rotate_y(dsp::matrix3d_t *m, float angle); + void init_matrix3d_rotate_z(dsp::matrix3d_t *m, float angle); +// void init_matrix3d_rotate_xyz(dsp::matrix3d_t *m, float x, float y, float z, float angle); + + void apply_matrix3d_mp2(dsp::point3d_t *r, const dsp::point3d_t *p, const dsp::matrix3d_t *m); + void apply_matrix3d_mp2_fma3(dsp::point3d_t *r, const dsp::point3d_t *p, const dsp::matrix3d_t *m); + void apply_matrix3d_mp1(dsp::point3d_t *r, const dsp::matrix3d_t *m); + void apply_matrix3d_mp1_fma3(dsp::point3d_t *r, const dsp::matrix3d_t *m); + + void apply_matrix3d_mm2(dsp::matrix3d_t *r, const dsp::matrix3d_t *s, const dsp::matrix3d_t *m); + void apply_matrix3d_mm2_fma3(dsp::matrix3d_t *r, const dsp::matrix3d_t *s, const dsp::matrix3d_t *m); + void apply_matrix3d_mm1(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + void apply_matrix3d_mm1_fma3(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); + + void apply_matrix3d_mv2(dsp::vector3d_t *r, const dsp::vector3d_t *v, const dsp::matrix3d_t *m); + void apply_matrix3d_mv2_fma3(dsp::vector3d_t *r, const dsp::vector3d_t *v, const dsp::matrix3d_t *m); + void apply_matrix3d_mv1(dsp::vector3d_t *r, const dsp::matrix3d_t *m); + void apply_matrix3d_mv1_fma3(dsp::vector3d_t *r, const dsp::matrix3d_t *m); + } ) typedef void (* init_matrix3d_t)(dsp::matrix3d_t *dst, const dsp::matrix3d_t *src); @@ -98,50 +133,14 @@ namespace lsp typedef void (* apply_matrix3d_mm1_t)(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); typedef void (* transpose_matrix3d1_t)(dsp::matrix3d_t *r); typedef void (* transpose_matrix3d2_t)(dsp::matrix3d_t *r, const dsp::matrix3d_t *m); - - typedef void (* calc_matrix3d_transform_p1v1)(dsp::matrix3d_t *m, const dsp::point3d_t *p, const dsp::vector3d_t *v); - typedef void (* calc_matrix3d_transform_r1)(dsp::matrix3d_t *m, const dsp::ray3d_t *r); } UTEST_BEGIN("dsp.3d", matrix) - void calc_matrix3d_transform( - const char *label, - calc_matrix3d_transform_p1v1 transform_p1v1, - calc_matrix3d_transform_r1 transform_r1 - ) + static void fill_matrix(dsp::matrix3d_t & m) { - printf("Testing %s\n", label); - - if ((!UTEST_SUPPORTED(transform_p1v1)) || - (!UTEST_SUPPORTED(transform_r1)) - ) - return; - - dsp::ray3d_t r; - dsp::init_point_xyz(&r.z, 1.0f, 2.0f, 3.0f); - dsp::init_vector_dxyz(&r.v, 0.5f, 0.6f, 0.7f); - - dsp::point3d_t p, dp, check; - dsp::init_point_xyz(&p, 0.0f, 0.0f, 2.0f); - dsp::init_point_xyz(&check, 2.0f, 3.2f, 4.4f); - - dsp::matrix3d_t m; - - transform_p1v1(&m, &r.z, &r.v); - dsp::apply_matrix3d_mp2(&dp, &p, &m); - UTEST_ASSERT_MSG(point3d_ck(&dp, &check), "point = {%f, %f, %f}, expected= {%f, %f, %f}\n", - dp.x, dp.y, dp.z, - check.x, check.y, check.z - ); - - - transform_r1(&m, &r); - dsp::apply_matrix3d_mp2(&dp, &p, &m); - UTEST_ASSERT_MSG(point3d_ck(&dp, &check), "point = {%f, %f, %f}, expected= {%f, %f, %f}\n", - dp.x, dp.y, dp.z, - check.x, check.y, check.z - ); + for (size_t i=0; i<16; ++i) + m.m[i] = (i + 1) * 0.01f; } void init_data( @@ -166,6 +165,10 @@ UTEST_BEGIN("dsp.3d", matrix) printf("Testing %s\n", label); dsp::matrix3d_t m1, m2, m3; + fill_matrix(m1); + fill_matrix(m2); + fill_matrix(m3); + generic::init_matrix3d_zero(&m1); init_matrix3d_zero(&m2); UTEST_ASSERT_MSG(matrix3d_ck(&m1, &m2), "init_matrix3d_zero failed"); @@ -230,6 +233,22 @@ UTEST_BEGIN("dsp.3d", matrix) dsp::matrix3d_t i1, t1, s1, rx1, ry1, rz1, rxyz1; dsp::matrix3d_t i2, t2, s2, rx2, ry2, rz2, rxyz2; + fill_matrix(i1); + fill_matrix(t1); + fill_matrix(s1); + fill_matrix(rx1); + fill_matrix(ry1); + fill_matrix(rz1); + fill_matrix(rxyz1); + + fill_matrix(i2); + fill_matrix(t2); + fill_matrix(s2); + fill_matrix(rx2); + fill_matrix(ry2); + fill_matrix(rz2); + fill_matrix(rxyz2); + generic::init_matrix3d_identity(&i1); init_matrix3d_identity(&i2); UTEST_ASSERT_MSG(matrix3d_ck(&i1, &i2), "init_matrix3d_identity failed"); @@ -289,6 +308,10 @@ UTEST_BEGIN("dsp.3d", matrix) apply_matrix3d_mp2_t apply_matrix3d_mp2 ) { + if ((!UTEST_SUPPORTED(apply_matrix3d_mp1)) || + (!UTEST_SUPPORTED(apply_matrix3d_mp2))) + return; + dsp::matrix3d_t m; dsp::point3d_t p1, p2, p3, p4, pc; @@ -398,6 +421,12 @@ UTEST_BEGIN("dsp.3d", matrix) apply_matrix3d_mv2_t apply_matrix3d_mv2 ) { + if ((!UTEST_SUPPORTED(apply_matrix3d_mv1)) || + (!UTEST_SUPPORTED(apply_matrix3d_mv2))) + return; + + printf("Testing %s\n", label); + dsp::matrix3d_t m; dsp::vector3d_t v1, v2, v3, v4, vc; @@ -485,12 +514,42 @@ UTEST_BEGIN("dsp.3d", matrix) UTEST_MAIN { - IF_ARCH_X86(init_data("sse init_matrix", - sse::init_matrix3d, sse::init_matrix3d_zero, sse::init_matrix3d_one, sse::init_matrix3d_identity, - sse::transpose_matrix3d1, sse::transpose_matrix3d2 + IF_ARCH_X86( + init_data( + "sse init_matrix", + sse::init_matrix3d, + sse::init_matrix3d_zero, + sse::init_matrix3d_one, + sse::init_matrix3d_identity, + sse::transpose_matrix3d1, + sse::transpose_matrix3d2 )); - IF_ARCH_X86(transform("sse init_matrix_transform", + IF_ARCH_X86( + init_data( + "sse2 init_matrix", + sse::init_matrix3d, + sse::init_matrix3d_zero, + sse::init_matrix3d_one, + sse::init_matrix3d_identity, + sse2::transpose_matrix3d1, + sse2::transpose_matrix3d2 + )); + + IF_ARCH_X86( + init_data( + "avx init_matrix", + avx::init_matrix3d, + avx::init_matrix3d_zero, + avx::init_matrix3d_one, + avx::init_matrix3d_identity, + avx::transpose_matrix3d1, + avx::transpose_matrix3d2 + )); + + IF_ARCH_X86( + transform( + "sse init_matrix_transform", sse::init_matrix3d_identity, sse::init_matrix3d_translate, sse::init_matrix3d_scale, @@ -502,19 +561,74 @@ UTEST_BEGIN("dsp.3d", matrix) sse::apply_matrix3d_mm2 )); - IF_ARCH_X86(modify_point("sse modify_point", + IF_ARCH_X86( + transform( + "avx init_matrix_transform", + avx::init_matrix3d_identity, + avx::init_matrix3d_translate, + avx::init_matrix3d_scale, + avx::init_matrix3d_rotate_x, + avx::init_matrix3d_rotate_y, + avx::init_matrix3d_rotate_z, + generic::init_matrix3d_rotate_xyz, // avoid currently due to FMA implementation + avx::apply_matrix3d_mm1, + avx::apply_matrix3d_mm2 + )); + + IF_ARCH_X86( + transform( + "avx_fma3 init_matrix_transform", + avx::init_matrix3d_identity, + avx::init_matrix3d_translate, + avx::init_matrix3d_scale, + avx::init_matrix3d_rotate_x, + avx::init_matrix3d_rotate_y, + avx::init_matrix3d_rotate_z, + generic::init_matrix3d_rotate_xyz, // avoid currently due to FMA implementation + avx::apply_matrix3d_mm1_fma3, + avx::apply_matrix3d_mm2_fma3 + )); + + IF_ARCH_X86( + modify_point( + "sse modify_point", sse::apply_matrix3d_mp1, sse::apply_matrix3d_mp2 )); - IF_ARCH_X86(modify_vector("generic modify_vector", + IF_ARCH_X86( + modify_point( + "avx modify_point", + avx::apply_matrix3d_mp1, + avx::apply_matrix3d_mp2 + )); + + IF_ARCH_X86( + modify_point( + "avx_fma3 modify_point", + avx::apply_matrix3d_mp1_fma3, + avx::apply_matrix3d_mp2_fma3 + )); + + IF_ARCH_X86( + modify_vector( + "sse modify_vector", sse::apply_matrix3d_mv1, sse::apply_matrix3d_mv2 )); - calc_matrix3d_transform("calc_matrix3d_transform", - generic::calc_matrix3d_transform_p1v1, - generic::calc_matrix3d_transform_r1 - ); + IF_ARCH_X86( + modify_vector( + "avx modify_vector", + avx::apply_matrix3d_mv1, + avx::apply_matrix3d_mv2 + )); + + IF_ARCH_X86( + modify_vector( + "avx_fma3 modify_vector", + avx::apply_matrix3d_mv1_fma3, + avx::apply_matrix3d_mv2_fma3 + )); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/normal.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/normal.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/normal.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/normal.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,192 +0,0 @@ -/* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov - * - * This file is part of lsp-dsp-lib - * Created on: 31 мар. 2020 г. - * - * lsp-dsp-lib is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * lsp-dsp-lib 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with lsp-dsp-lib. If not, see . - */ - -#include -#include -#include -#include -#include - -namespace lsp -{ - namespace generic - { - void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); - void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); - void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); - void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); - } - - IF_ARCH_X86( - namespace sse - { - void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); - void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); - void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); - void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); - } - ) - - typedef void (* calc_normal3d_v2_t)(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); - typedef void (* calc_normal3d_vv_t)(dsp::vector3d_t *n, const dsp::vector3d_t *vv); - typedef void (* calc_normal3d_p3_t)(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); - typedef void (* calc_normal3d_pv_t)(dsp::vector3d_t *n, const dsp::point3d_t *pv); -} - -UTEST_BEGIN("dsp.3d", normal) - - void call(const char *label, calc_normal3d_v2_t fn) - { - if (!UTEST_SUPPORTED(fn)) - return; - - printf("Testing %s...\n", label); - - dsp::vector3d_t sv[2], n[2]; - - for (size_t i=0; i<0x200; ++i) - { - // Intialize vectors - dsp::init_vector_dxyz(&sv[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - dsp::init_vector_dxyz(&sv[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - - // Compute the value - generic::calc_normal3d_v2(&n[0], &sv[0], &sv[1]); - fn(&n[1], &sv[0], &sv[1]); - - if (!vector3d_ack(&n[0], &n[1])) - { - dump_vector("sv[0]", &sv[0]); - dump_vector("sv[1]", &sv[1]); - dump_vector("n[0]", &n[0]); - dump_vector("n[1]", &n[1]); - UTEST_FAIL_MSG("result of %s differs", label); - } - } - } - - void call(const char *label, calc_normal3d_vv_t fn) - { - if (!UTEST_SUPPORTED(fn)) - return; - - printf("Testing %s...\n", label); - - dsp::vector3d_t sv[2], n[2]; - - for (size_t i=0; i<0x200; ++i) - { - // Intialize vectors - dsp::init_vector_dxyz(&sv[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - dsp::init_vector_dxyz(&sv[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - - // Compute the value - generic::calc_normal3d_vv(&n[0], sv); - fn(&n[1], sv); - - if (!vector3d_ack(&n[0], &n[1])) - { - dump_vector("sv[0]", &sv[0]); - dump_vector("sv[1]", &sv[1]); - dump_vector("n[0]", &n[0]); - dump_vector("n[1]", &n[1]); - UTEST_FAIL_MSG("result of %s differs", label); - } - } - } - - void call(const char *label, calc_normal3d_p3_t fn) - { - if (!UTEST_SUPPORTED(fn)) - return; - - printf("Testing %s...\n", label); - - dsp::point3d_t p[3]; - dsp::vector3d_t n[2]; - - for (size_t i=0; i<0x200; ++i) - { - // Intialize vectors - dsp::init_point_xyz(&p[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - dsp::init_point_xyz(&p[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - dsp::init_point_xyz(&p[2], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - - // Compute the value - generic::calc_normal3d_p3(&n[0], &p[0], &p[1], &p[2]); - fn(&n[1], &p[0], &p[1], &p[2]); - - if (!vector3d_ack(&n[0], &n[1])) - { - dump_point("p[0]", &p[0]); - dump_point("p[1]", &p[1]); - dump_point("p[2]", &p[2]); - dump_vector("n[0]", &n[0]); - dump_vector("n[1]", &n[1]); - UTEST_FAIL_MSG("result of %s differs", label); - } - } - } - - void call(const char *label, calc_normal3d_pv_t fn) - { - if (!UTEST_SUPPORTED(fn)) - return; - - printf("Testing %s...\n", label); - - dsp::point3d_t p[3]; - dsp::vector3d_t n[2]; - - for (size_t i=0; i<0x200; ++i) - { - // Intialize vectors - dsp::init_point_xyz(&p[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - dsp::init_point_xyz(&p[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - dsp::init_point_xyz(&p[2], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); - - // Compute the value - generic::calc_normal3d_pv(&n[0], p); - fn(&n[1], p); - - if (!vector3d_ack(&n[0], &n[1])) - { - dump_point("p[0]", &p[0]); - dump_point("p[1]", &p[1]); - dump_point("p[2]", &p[2]); - dump_vector("n[0]", &n[0]); - dump_vector("n[1]", &n[1]); - UTEST_FAIL_MSG("result of %s differs", label); - } - } - } - - UTEST_MAIN - { - IF_ARCH_X86(call("sse::calc_normal3d_v2", sse::calc_normal3d_v2)); - IF_ARCH_X86(call("sse::calc_normal3d_vv", sse::calc_normal3d_vv)); - IF_ARCH_X86(call("sse::calc_normal3d_p3", sse::calc_normal3d_p3)); - IF_ARCH_X86(call("sse::calc_normal3d_pv", sse::calc_normal3d_pv)); - } - -UTEST_END - - diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/normal_p.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/normal_p.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/normal_p.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/normal_p.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 31 мар. 2020 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); + } + + IF_ARCH_X86( + namespace sse + { + void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); + } + + namespace avx + { + void calc_normal3d_p3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv(dsp::vector3d_t *n, const dsp::point3d_t *pv); + + void calc_normal3d_p3_fma3(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + void calc_normal3d_pv_fma3(dsp::vector3d_t *n, const dsp::point3d_t *pv); + } + ) + + typedef void (* calc_normal3d_p3_t)(dsp::vector3d_t *n, const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3); + typedef void (* calc_normal3d_pv_t)(dsp::vector3d_t *n, const dsp::point3d_t *pv); +} + +UTEST_BEGIN("dsp.3d", normal_p) + + void call(const char *label, calc_normal3d_p3_t fn) + { + if (!UTEST_SUPPORTED(fn)) + return; + + printf("Testing %s...\n", label); + + dsp::point3d_t p[3]; + dsp::vector3d_t n[2]; + + for (size_t i=0; i<0x200; ++i) + { + // Intialize vectors + dsp::init_point_xyz(&p[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + if (i != 0) + { + dsp::init_point_xyz(&p[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + dsp::init_point_xyz(&p[2], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + } + else + { + dsp::init_point(&p[1], &p[0]); + dsp::init_point(&p[2], &p[0]); + } + + // Compute the value + generic::calc_normal3d_p3(&n[0], &p[0], &p[1], &p[2]); + fn(&n[1], &p[0], &p[1], &p[2]); + + if (!vector3d_ack(&n[0], &n[1])) + { + dump_point("p[0]", &p[0]); + dump_point("p[1]", &p[1]); + dump_point("p[2]", &p[2]); + dump_vector("n[0]", &n[0]); + dump_vector("n[1]", &n[1]); + UTEST_FAIL_MSG("result of %s differs", label); + } + } + } + + void call(const char *label, calc_normal3d_pv_t fn) + { + if (!UTEST_SUPPORTED(fn)) + return; + + printf("Testing %s...\n", label); + + dsp::point3d_t p[3]; + dsp::vector3d_t n[2]; + + for (size_t i=0; i<0x200; ++i) + { + // Intialize vectors + dsp::init_point_xyz(&p[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + if (i != 0) + { + dsp::init_point_xyz(&p[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + dsp::init_point_xyz(&p[2], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + } + else + { + dsp::init_point(&p[1], &p[0]); + dsp::init_point(&p[2], &p[0]); + } + + // Compute the value + generic::calc_normal3d_pv(&n[0], p); + fn(&n[1], p); + + if (!vector3d_ack(&n[0], &n[1])) + { + dump_point("p[0]", &p[0]); + dump_point("p[1]", &p[1]); + dump_point("p[2]", &p[2]); + dump_vector("n[0]", &n[0]); + dump_vector("n[1]", &n[1]); + UTEST_FAIL_MSG("result of %s differs", label); + } + } + } + + UTEST_MAIN + { + #define CALL(func) \ + call(#func, func) + + IF_ARCH_X86(CALL(sse::calc_normal3d_p3)); + IF_ARCH_X86(CALL(sse::calc_normal3d_pv)); + + IF_ARCH_X86(CALL(avx::calc_normal3d_p3)); + IF_ARCH_X86(CALL(avx::calc_normal3d_pv)); + + IF_ARCH_X86(CALL(avx::calc_normal3d_p3_fma3)); + IF_ARCH_X86(CALL(avx::calc_normal3d_pv_fma3)); + } + +UTEST_END + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/normal_v.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/normal_v.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/normal_v.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/normal_v.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -0,0 +1,156 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 24 авг. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + } + + IF_ARCH_X86( + namespace sse + { + void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + } + + namespace avx + { + void calc_normal3d_v2(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + + void calc_normal3d_v2_fma3(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + void calc_normal3d_vv_fma3(dsp::vector3d_t *n, const dsp::vector3d_t *vv); + } + ) + + typedef void (* calc_normal3d_v2_t)(dsp::vector3d_t *n, const dsp::vector3d_t *v1, const dsp::vector3d_t *v2); + typedef void (* calc_normal3d_vv_t)(dsp::vector3d_t *n, const dsp::vector3d_t *vv); +} + +UTEST_BEGIN("dsp.3d", normal_v) + + void call(const char *label, calc_normal3d_v2_t fn) + { + if (!UTEST_SUPPORTED(fn)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t sv[2], n[2]; + + for (size_t i=0; i<0x200; ++i) + { + // Intialize vectors + if (i != 0) + { + dsp::init_vector_dxyz(&sv[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + dsp::init_vector_dxyz(&sv[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + } + else + { + dsp::init_vector_dxyz(&sv[0], 0.0f, 0.0f, 0.0f); + dsp::init_vector_dxyz(&sv[1], 0.0f, 0.0f, 0.0f); + } + + // Compute the value + generic::calc_normal3d_v2(&n[0], &sv[0], &sv[1]); + fn(&n[1], &sv[0], &sv[1]); + + if (!vector3d_ack(&n[0], &n[1])) + { + dump_vector("sv[0]", &sv[0]); + dump_vector("sv[1]", &sv[1]); + dump_vector("n[0]", &n[0]); + dump_vector("n[1]", &n[1]); + UTEST_FAIL_MSG("result of %s differs", label); + } + } + } + + void call(const char *label, calc_normal3d_vv_t fn) + { + if (!UTEST_SUPPORTED(fn)) + return; + + printf("Testing %s...\n", label); + + dsp::vector3d_t sv[2], n[2]; + + for (size_t i=0; i<0x200; ++i) + { + // Intialize vectors + if (i != 0) + { + dsp::init_vector_dxyz(&sv[0], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + dsp::init_vector_dxyz(&sv[1], randf(-10.0f, 10.0f), randf(-10.0f, 10.0f), randf(-10.0f, 10.0f)); + } + else + { + dsp::init_vector_dxyz(&sv[0], 0.0f, 0.0f, 0.0f); + dsp::init_vector_dxyz(&sv[1], 0.0f, 0.0f, 0.0f); + } + + // Compute the value + generic::calc_normal3d_vv(&n[0], sv); + fn(&n[1], sv); + + if (!vector3d_ack(&n[0], &n[1])) + { + dump_vector("sv[0]", &sv[0]); + dump_vector("sv[1]", &sv[1]); + dump_vector("n[0]", &n[0]); + dump_vector("n[1]", &n[1]); + UTEST_FAIL_MSG("result of %s differs", label); + } + } + } + + + UTEST_MAIN + { + #define CALL(func) \ + call(#func, func) + + IF_ARCH_X86(CALL(sse::calc_normal3d_v2)); + IF_ARCH_X86(CALL(sse::calc_normal3d_vv)); + + IF_ARCH_X86(CALL(avx::calc_normal3d_v2)); + IF_ARCH_X86(CALL(avx::calc_normal3d_vv)); + + IF_ARCH_X86(CALL(avx::calc_normal3d_v2_fma3)); + IF_ARCH_X86(CALL(avx::calc_normal3d_vv_fma3)); + } + +UTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/plane.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/plane.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/plane.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/plane.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -42,6 +42,17 @@ namespace lsp float calc_plane_pv(dsp::vector3d_t *v, const dsp::point3d_t *pv); float calc_plane_v1p2(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); } + + namespace avx + { + float calc_plane_p3(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_plane_pv(dsp::vector3d_t *v, const dsp::point3d_t *pv); + float calc_plane_v1p2(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + + float calc_plane_p3_fma3(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); + float calc_plane_pv_fma3(dsp::vector3d_t *v, const dsp::point3d_t *pv); + float calc_plane_v1p2_fma3(dsp::vector3d_t *v, const dsp::vector3d_t *v0, const dsp::point3d_t *p0, const dsp::point3d_t *p1); + } ) typedef float (* calc_plane_p3_t)(dsp::vector3d_t *v, const dsp::point3d_t *p0, const dsp::point3d_t *p1, const dsp::point3d_t *p2); @@ -165,9 +176,20 @@ UTEST_BEGIN("dsp.3d", plane) UTEST_MAIN { - IF_ARCH_X86(call("sse::calc_plane_p3", sse::calc_plane_p3)); - IF_ARCH_X86(call("sse::calc_plane_pv", sse::calc_plane_pv)); - IF_ARCH_X86(call("sse::calc_plane_v1p2", sse::calc_plane_v1p2)); + #define CALL(func) \ + call(#func, func) + + IF_ARCH_X86(CALL(sse::calc_plane_p3)); + IF_ARCH_X86(CALL(sse::calc_plane_pv)); + IF_ARCH_X86(CALL(sse::calc_plane_v1p2)); + + IF_ARCH_X86(CALL(avx::calc_plane_p3)); + IF_ARCH_X86(CALL(avx::calc_plane_pv)); + IF_ARCH_X86(CALL(avx::calc_plane_v1p2)); + + IF_ARCH_X86(CALL(avx::calc_plane_p3_fma3)); + IF_ARCH_X86(CALL(avx::calc_plane_pv_fma3)); + IF_ARCH_X86(CALL(avx::calc_plane_v1p2_fma3)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/point.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/point.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/point.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/point.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -40,6 +40,13 @@ namespace lsp void init_point(dsp::point3d_t *p, const dsp::point3d_t *s); void normalize_point(dsp::point3d_t *p); } + + namespace avx + { + void init_point_xyz(dsp::point3d_t *p, float x, float y, float z); + void init_point(dsp::point3d_t *p, const dsp::point3d_t *s); + void normalize_point(dsp::point3d_t *p); + } ) typedef void (* init_point_xyz_t)(dsp::point3d_t *p, float x, float y, float z); @@ -49,6 +56,14 @@ namespace lsp UTEST_BEGIN("dsp.3d", point) + static void fill_point(dsp::point3d_t *p) + { + p->x = 0.1f; + p->y = 0.2f; + p->z = 0.3f; + p->w = 0.4f; + } + void call( const char *label, init_point_xyz_t init_xyz, @@ -61,26 +76,31 @@ UTEST_BEGIN("dsp.3d", point) printf("Testing %s\n", label); - dsp::point3d_t p1, p2, p3; + dsp::point3d_t p1, p2, p3, p4; + fill_point(&p1); + fill_point(&p2); + fill_point(&p3); + fill_point(&p4); - generic::init_point_xyz(&p1, 1.0f, 2.0f, 3.0f); - init_xyz(&p2, 1.0f, 2.0f, 3.0f); + generic::init_point_xyz(&p1, 2.0f, 3.0f, 4.0f); + init_xyz(&p2, 2.0f, 3.0f, 4.0f); UTEST_ASSERT_MSG(point3d_sck(&p1, &p2), "Failed init_point_xyz"); - generic::init_point(&p2, &p1); - init(&p3, &p1); - UTEST_ASSERT_MSG(point3d_sck(&p1, &p2), "Failed generic init_point"); - UTEST_ASSERT_MSG(point3d_sck(&p1, &p3), "Failed optimized init_point"); + generic::init_point(&p3, &p1); + init(&p4, &p1); + UTEST_ASSERT_MSG(point3d_sck(&p1, &p3), "Failed generic init_point"); + UTEST_ASSERT_MSG(point3d_sck(&p1, &p4), "Failed optimized init_point"); - generic::normalize_point(&p2); - norm(&p3); + generic::normalize_point(&p3); + norm(&p4); - UTEST_ASSERT_MSG(point3d_sck(&p2, &p3), "Failed normalize point"); + UTEST_ASSERT_MSG(point3d_sck(&p3, &p4), "Failed normalize point"); } UTEST_MAIN { - IF_ARCH_X86(call("sse_point", sse::init_point_xyz, sse::init_point, sse::normalize_point)); + IF_ARCH_X86(call("sse::point", sse::init_point_xyz, sse::init_point, sse::normalize_point)); + IF_ARCH_X86(call("avx::point", avx::init_point_xyz, avx::init_point, avx::normalize_point)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/split_point.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/split_point.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/split_point.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/split_point.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -45,6 +45,15 @@ namespace lsp void calc_split_point_p2v1(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); void calc_split_point_pvv1(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); } + + namespace avx + { + void calc_split_point_p2v1(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + + void calc_split_point_p2v1_fma3(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); + void calc_split_point_pvv1_fma3(dsp::point3d_t *sp, const dsp::point3d_t *lv, const dsp::vector3d_t *pl); + } ) typedef void (* calc_split_point_p2v1_t)(dsp::point3d_t *sp, const dsp::point3d_t *l0, const dsp::point3d_t *l1, const dsp::vector3d_t *pl); @@ -169,11 +178,20 @@ UTEST_BEGIN("dsp.3d", split_point) UTEST_MAIN { - IF_ARCH_X86(call("sse::calc_split_point_p2v1", sse::calc_split_point_p2v1)); - IF_ARCH_X86(call("sse::calc_split_point_pvv1", sse::calc_split_point_pvv1)); + #define CALL(func) \ + call(#func, func) + + IF_ARCH_X86(CALL(sse::calc_split_point_p2v1)); + IF_ARCH_X86(CALL(sse::calc_split_point_pvv1)); + + IF_ARCH_X86(CALL(sse3::calc_split_point_p2v1)); + IF_ARCH_X86(CALL(sse3::calc_split_point_pvv1)); + + IF_ARCH_X86(CALL(avx::calc_split_point_p2v1)); + IF_ARCH_X86(CALL(avx::calc_split_point_pvv1)); - IF_ARCH_X86(call("sse3::calc_split_point_p2v1", sse3::calc_split_point_p2v1)); - IF_ARCH_X86(call("sse3::calc_split_point_pvv1", sse3::calc_split_point_pvv1)); + IF_ARCH_X86(CALL(avx::calc_split_point_p2v1_fma3)); + IF_ARCH_X86(CALL(avx::calc_split_point_pvv1_fma3)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/split_triangle.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/split_triangle.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/split_triangle.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/split_triangle.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -32,7 +32,7 @@ namespace lsp } IF_ARCH_X86( - namespace sse + namespace sse2 { void split_triangle_raw(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); } @@ -40,6 +40,12 @@ namespace lsp namespace sse3 { void split_triangle_raw(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + void split_triangle_raw_ssse3(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); + } + + namespace avx + { + void split_triangle_raw(dsp::raw_triangle_t *out, size_t *n_out, dsp::raw_triangle_t *in, size_t *n_in, const dsp::vector3d_t *pl, const dsp::raw_triangle_t *pv); } ) @@ -177,9 +183,14 @@ UTEST_BEGIN("dsp.3d", split_triangle) UTEST_MAIN { - test_func("generic::split_triangle_raw", generic::split_triangle_raw); - IF_ARCH_X86(test_func("sse::split_triangle_raw", sse::split_triangle_raw)); - IF_ARCH_X86(test_func("sse3::split_triangle_raw", sse3::split_triangle_raw)); + #define CALL(func) \ + test_func(#func, func); + + CALL(generic::split_triangle_raw); + IF_ARCH_X86(CALL(sse2::split_triangle_raw)); + IF_ARCH_X86(CALL(sse3::split_triangle_raw)); + IF_ARCH_X86(CALL(sse3::split_triangle_raw_ssse3)); + IF_ARCH_X86(CALL(avx::split_triangle_raw)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/triangle.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/triangle.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/triangle.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/triangle.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,150 +0,0 @@ -/* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov - * - * This file is part of lsp-dsp-lib - * Created on: 31 мар. 2020 г. - * - * lsp-dsp-lib is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * lsp-dsp-lib 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with lsp-dsp-lib. If not, see . - */ - -#include -#include -#include - -namespace lsp -{ - namespace generic - { - float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); - float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); - float check_point3d_on_triangle_tp(const dsp::triangle3d_t *t, const dsp::point3d_t *p); - } - - IF_ARCH_X86( - namespace sse - { - float check_point3d_on_triangle_p3p(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); - float check_point3d_on_triangle_pvp(const dsp::point3d_t *pv, const dsp::point3d_t *p); - float check_point3d_on_triangle_tp(const dsp::triangle3d_t *t, const dsp::point3d_t *p); - } - ) - - typedef float (* check_point3d_on_triangle_p3p_t)(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::point3d_t *p); - typedef float (* check_point3d_on_triangle_pvp_t)(const dsp::point3d_t *pv, const dsp::point3d_t *p); - typedef float (* check_point3d_on_triangle_tp_t)(const dsp::triangle3d_t *t, const dsp::point3d_t *p); -} - -UTEST_BEGIN("dsp.3d", triangle) - - void call(const char *label, - check_point3d_on_triangle_p3p_t check_point3d_on_triangle_p3p, - check_point3d_on_triangle_pvp_t check_point3d_on_triangle_pvp, - check_point3d_on_triangle_tp_t check_point3d_on_triangle_tp - ) - { - if ((!UTEST_SUPPORTED(check_point3d_on_triangle_p3p)) || - (!UTEST_SUPPORTED(check_point3d_on_triangle_pvp)) || - (!UTEST_SUPPORTED(check_point3d_on_triangle_tp))) - return; - - printf("Testing %s...\n", label); - - dsp::triangle3d_t t; - dsp::point3d_t cp[12]; - dsp::point3d_t ip[10]; - float ck; - - // Special check - dsp::init_triangle3d_xyz(&t, 2.0f, -1.0f, 0.0f, 0.0f, 2.0f, 0.0f, -2.0f, 4.0f, 0.0f); - dsp::init_point_xyz(&cp[0], -0.5f, 0.5f, 0.0f); - ck = generic::check_point3d_on_triangle_tp(&t, &cp[0]); - printf("ck=%f\n", ck); - - dsp::init_triangle3d_xyz(&t, -8.0f, -2.0f, 0.0f, -2.0f, -4.0f, 0.0f, 0.0f, -2.0f, 0.0f); - dsp::init_point_xyz(&cp[0], 6.0f, 4.0f, 0.0f); - ck = generic::check_point3d_on_triangle_tp(&t, &cp[0]); - printf("ck=%f\n", ck); - - // Main check - dsp::init_triangle3d_xyz(&t, -2.0f, -1.0f, 0.0f, 2.0f, -1.0f, 0.0f, 0.0f, 1.0f, 0.0f); - - dsp::init_point_xyz(&cp[0], -0.5f, 0.5f, 0.0f); - dsp::init_point_xyz(&cp[1], 0.5f, 0.5f, 0.0f); - dsp::init_point_xyz(&cp[2], 1.5f, -0.5f, 0.0f); - dsp::init_point_xyz(&cp[3], -1.5f, -0.5f, 0.0f); - dsp::init_point_xyz(&cp[4], 0.75f, -1.0f, 0.0f); - dsp::init_point_xyz(&cp[5], -0.75f, -1.0f, 0.0f); - dsp::init_point_xyz(&cp[6], 0.0f, 0.0f, 0.0f); - dsp::init_point_xyz(&cp[7], -0.5f, -0.5f, 0.0f); - dsp::init_point_xyz(&cp[8], 0.5f, -0.5f, 0.0f); - dsp::init_point(&cp[9], &t.p[0]); - dsp::init_point(&cp[10], &t.p[1]); - dsp::init_point(&cp[11], &t.p[2]); - - for (size_t i=0; i<12; ++i) - { - ck = check_point3d_on_triangle_tp(&t, &cp[i]); - UTEST_ASSERT_MSG(ck >= 0.0f, "check_point3d_on_triangle_tp(%d) failed", int(i)); - - ck = check_point3d_on_triangle_pvp(t.p, &cp[i]); - UTEST_ASSERT_MSG(ck >= 0.0f, "check_point3d_on_triangle_pvp(%d) failed", int(i)); - - ck = check_point3d_on_triangle_p3p(&t.p[0], &t.p[1], &t.p[2], &cp[i]); - UTEST_ASSERT_MSG(ck >= 0.0f, "check_point3d_on_triangle_p3p(%d) failed", int(i)); - } - - dsp::init_point_xyz(&ip[0], 0.0f, 1.5f, 0.0f); - dsp::init_point_xyz(&ip[1], 0.0f, -1.5f, 0.0f); - dsp::init_point_xyz(&ip[2], -1.0f, 1.0f, 0.0f); - dsp::init_point_xyz(&ip[3], 1.0f, 1.0f, 0.0f); - dsp::init_point_xyz(&ip[4], 2.5f, -1.5f, 0.0f); - dsp::init_point_xyz(&ip[5], -2.5f, -1.5f, 0.0f); - dsp::init_point_xyz(&ip[6], -0.5f, 1.5f, 0.0f); - dsp::init_point_xyz(&ip[7], 0.5f, 1.5f, 0.0f); - dsp::init_point_xyz(&ip[8], 2.5f, -1.0f, 0.0f); - dsp::init_point_xyz(&ip[9], -2.5f, -1.0f, 0.0f); - - for (size_t i=0; i<10; ++i) - { - ck = check_point3d_on_triangle_tp(&t, &ip[i]); - UTEST_ASSERT_MSG(ck < 0.0f, "check_point3d_on_triangle_tp(%d) failed", int(i)); - - ck = check_point3d_on_triangle_pvp(t.p, &ip[i]); - UTEST_ASSERT_MSG(ck < 0.0f, "check_point3d_on_triangle_pvp(%d) failed", int(i)); - - ck = check_point3d_on_triangle_p3p(&t.p[0], &t.p[1], &t.p[2], &ip[i]); - UTEST_ASSERT_MSG(ck < 0.0f, "check_point3d_on_triangle_p3p(%d) failed", int(i)); - } - } - - UTEST_MAIN - { - call("generic::ck_triangle", - generic::check_point3d_on_triangle_p3p, - generic::check_point3d_on_triangle_pvp, - generic::check_point3d_on_triangle_tp - ); - - IF_ARCH_X86( - call("sse::ck_triangle", - sse::check_point3d_on_triangle_p3p, - sse::check_point3d_on_triangle_pvp, - sse::check_point3d_on_triangle_tp - ); - ) - } - -UTEST_END - diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/triplet.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/triplet.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/triplet.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/triplet.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -32,8 +32,6 @@ namespace lsp float check_triplet3d_v2n(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::vector3d_t *n); float check_triplet3d_vvn(const dsp::vector3d_t *v, const dsp::vector3d_t *n); float check_triplet3d_vv(const dsp::vector3d_t *v); - float check_triplet3d_t(const dsp::triangle3d_t *t); - float check_triplet3d_tn(const dsp::triangle3d_t *t, const dsp::vector3d_t *n); } IF_ARCH_X86( @@ -44,8 +42,21 @@ namespace lsp float check_triplet3d_v2n(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::vector3d_t *n); float check_triplet3d_vvn(const dsp::vector3d_t *v, const dsp::vector3d_t *n); float check_triplet3d_vv(const dsp::vector3d_t *v); - float check_triplet3d_t(const dsp::triangle3d_t *t); - float check_triplet3d_tn(const dsp::triangle3d_t *t, const dsp::vector3d_t *n); + } + + namespace avx + { + float check_triplet3d_p3n(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::vector3d_t *n); + float check_triplet3d_pvn(const dsp::point3d_t *pv, const dsp::vector3d_t *n); + float check_triplet3d_v2n(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::vector3d_t *n); + float check_triplet3d_vvn(const dsp::vector3d_t *v, const dsp::vector3d_t *n); + float check_triplet3d_vv(const dsp::vector3d_t *v); + + float check_triplet3d_p3n_fma3(const dsp::point3d_t *p1, const dsp::point3d_t *p2, const dsp::point3d_t *p3, const dsp::vector3d_t *n); + float check_triplet3d_pvn_fma3(const dsp::point3d_t *pv, const dsp::vector3d_t *n); + float check_triplet3d_v2n_fma3(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::vector3d_t *n); + float check_triplet3d_vvn_fma3(const dsp::vector3d_t *v, const dsp::vector3d_t *n); + float check_triplet3d_vv_fma3(const dsp::vector3d_t *v); } ) @@ -54,8 +65,6 @@ namespace lsp typedef float (* check_triplet3d_v2n_t)(const dsp::vector3d_t *v1, const dsp::vector3d_t *v2, const dsp::vector3d_t *n); typedef float (* check_triplet3d_vvn_t)(const dsp::vector3d_t *v, const dsp::vector3d_t *n); typedef float (* check_triplet3d_vv_t)(const dsp::vector3d_t *v); - typedef float (* check_triplet3d_t_t)(const dsp::triangle3d_t *t); - typedef float (* check_triplet3d_tn_t)(const dsp::triangle3d_t *t, const dsp::vector3d_t *n); } UTEST_BEGIN("dsp.3d", triplet) @@ -66,27 +75,36 @@ UTEST_BEGIN("dsp.3d", triplet) check_triplet3d_pvn_t check_triplet3d_pvn, check_triplet3d_v2n_t check_triplet3d_v2n, check_triplet3d_vvn_t check_triplet3d_vvn, - check_triplet3d_vv_t check_triplet3d_vv, - check_triplet3d_t_t check_triplet3d_t, - check_triplet3d_tn_t check_triplet3d_tn + check_triplet3d_vv_t check_triplet3d_vv ) { if ((!UTEST_SUPPORTED(check_triplet3d_p3n)) || (!UTEST_SUPPORTED(check_triplet3d_pvn)) || (!UTEST_SUPPORTED(check_triplet3d_v2n)) || (!UTEST_SUPPORTED(check_triplet3d_vvn)) || - (!UTEST_SUPPORTED(check_triplet3d_vv)) || - (!UTEST_SUPPORTED(check_triplet3d_t)) || - (!UTEST_SUPPORTED(check_triplet3d_tn)) + (!UTEST_SUPPORTED(check_triplet3d_vv)) ) return; printf("Launching %s implementation\n", label); - dsp::triangle3d_t t[3]; - dsp::calc_triangle3d_xyz(&t[0], 1.0f, 1.0f, 1.0f, 2.0f, 2.0f, 1.0f, -3.0f, 3.0f, 1.0f); - dsp::calc_triangle3d_xyz(&t[1], 1.0f, 2.0f, 2.0f, 1.0f, 1.0f, 1.0f, 1.0f, 3.0f, -3.0f); - dsp::calc_triangle3d_xyz(&t[2], 1.0f, 1.0f, 2.0f, 2.0f, 1.0f, 2.0f, 3.0f, 1.0f, -3.0f); + typedef struct triangle3d_t + { + dsp::point3d_t p[3]; + } triangle3d_t; + + triangle3d_t t[3]; + dsp::init_point_xyz(&t[0].p[0], 1.0f, 1.0f, 1.0f); + dsp::init_point_xyz(&t[0].p[1], 2.0f, 2.0f, 1.0f); + dsp::init_point_xyz(&t[0].p[2], -3.0f, 3.0f, 1.0f); + + dsp::init_point_xyz(&t[1].p[0], 1.0f, 2.0f, 2.0f); + dsp::init_point_xyz(&t[1].p[1], 1.0f, 1.0f, 1.0f); + dsp::init_point_xyz(&t[1].p[2], 1.0f, 3.0f, -3.0f); + + dsp::init_point_xyz(&t[2].p[0], 1.0f, 1.0f, 2.0f); + dsp::init_point_xyz(&t[2].p[1], 2.0f, 1.0f, 2.0f); + dsp::init_point_xyz(&t[2].p[2], 3.0f, 1.0f, -3.0f); dsp::vector3d_t n1, n2; dsp::init_vector_dxyz(&n1, 1.0f, 1.0f, 1.0f); @@ -96,10 +114,6 @@ UTEST_BEGIN("dsp.3d", triplet) { printf("Checking triangle %d\n", int(i)); - UTEST_ASSERT(check_triplet3d_t(&t[i]) >= 0.0f); - UTEST_ASSERT(check_triplet3d_tn(&t[i], &n1) >= 0.0f); - UTEST_ASSERT(check_triplet3d_tn(&t[i], &n2) <= 0.0f); - UTEST_ASSERT(check_triplet3d_p3n(&t[i].p[0], &t[i].p[1], &t[i].p[2], &n1) >= 0.0f); UTEST_ASSERT(check_triplet3d_p3n(&t[i].p[0], &t[i].p[1], &t[i].p[2], &n2) <= 0.0f); UTEST_ASSERT(check_triplet3d_pvn(&t[i].p[0], &n1) >= 0.0f); @@ -128,25 +142,37 @@ UTEST_BEGIN("dsp.3d", triplet) UTEST_MAIN { - call("generic_ck_triplet", - generic::check_triplet3d_p3n, - generic::check_triplet3d_pvn, - generic::check_triplet3d_v2n, - generic::check_triplet3d_vvn, - generic::check_triplet3d_vv, - generic::check_triplet3d_t, - generic::check_triplet3d_tn - ); - - IF_ARCH_X86(call("sse_ck_triplet", - sse::check_triplet3d_p3n, - sse::check_triplet3d_pvn, - sse::check_triplet3d_v2n, - sse::check_triplet3d_vvn, - sse::check_triplet3d_vv, - sse::check_triplet3d_t, - sse::check_triplet3d_tn - )); + call( + "generic::ck_triplet", + generic::check_triplet3d_p3n, + generic::check_triplet3d_pvn, + generic::check_triplet3d_v2n, + generic::check_triplet3d_vvn, + generic::check_triplet3d_vv); + + IF_ARCH_X86(call( + "sse::ck_triplet", + sse::check_triplet3d_p3n, + sse::check_triplet3d_pvn, + sse::check_triplet3d_v2n, + sse::check_triplet3d_vvn, + sse::check_triplet3d_vv)); + + IF_ARCH_X86(call( + "avx::ck_triplet", + avx::check_triplet3d_p3n, + avx::check_triplet3d_pvn, + avx::check_triplet3d_v2n, + avx::check_triplet3d_vvn, + avx::check_triplet3d_vv)); + + IF_ARCH_X86(call( + "avx_fma3::ck_triplet", + avx::check_triplet3d_p3n_fma3, + avx::check_triplet3d_pvn_fma3, + avx::check_triplet3d_v2n_fma3, + avx::check_triplet3d_vvn_fma3, + avx::check_triplet3d_vv_fma3)); } UTEST_END diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/vector.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/vector.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/3d/vector.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/3d/vector.cpp 2025-08-26 18:15:43.766002903 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -31,6 +31,7 @@ namespace lsp void init_vector_dxyz(dsp::vector3d_t *v, float dx, float dy, float dz); void init_vector(dsp::vector3d_t *p, const dsp::vector3d_t *s); void normalize_vector(dsp::vector3d_t *v); + void normalize_vector2(dsp::vector3d_t *v, const dsp::vector3d_t *sv); } IF_ARCH_X86( @@ -39,48 +40,78 @@ namespace lsp void init_vector_dxyz(dsp::vector3d_t *v, float dx, float dy, float dz); void init_vector(dsp::vector3d_t *p, const dsp::vector3d_t *s); void normalize_vector(dsp::vector3d_t *v); + void normalize_vector2(dsp::vector3d_t *v, const dsp::vector3d_t *sv); + } + + namespace avx + { + void init_vector_dxyz(dsp::vector3d_t *v, float dx, float dy, float dz); + void init_vector(dsp::vector3d_t *p, const dsp::vector3d_t *s); + void normalize_vector(dsp::vector3d_t *v); + void normalize_vector2(dsp::vector3d_t *v, const dsp::vector3d_t *sv); } ) typedef void (* init_vector_dxyz_t)(dsp::vector3d_t *v, float dx, float dy, float dz); typedef void (* init_vector_t)(dsp::vector3d_t *p, const dsp::vector3d_t *s); typedef void (* normalize_vector_t)(dsp::vector3d_t *v); + typedef void (* normalize_vector2_t)(dsp::vector3d_t *v, const dsp::vector3d_t *sv); } UTEST_BEGIN("dsp.3d", vector) + static void fill_vector(dsp::vector3d_t *v) + { + v->dx = 0.1f; + v->dy = 0.2f; + v->dz = 0.3f; + v->dw = 0.4f; + } + void call( const char *label, init_vector_dxyz_t init_dxyz, init_vector_t init, - normalize_vector_t norm + normalize_vector_t norm, + normalize_vector2_t norm2 ) { - if ((!UTEST_SUPPORTED(init_dxyz)) || (!UTEST_SUPPORTED(init)) || (!UTEST_SUPPORTED(norm))) + if ((!UTEST_SUPPORTED(init_dxyz)) || (!UTEST_SUPPORTED(init)) || (!UTEST_SUPPORTED(norm)) || (!UTEST_SUPPORTED(norm2))) return; printf("Testing %s\n", label); - dsp::vector3d_t v1, v2, v3; + dsp::vector3d_t v1, v2, v3, v4, v5, v6; - generic::init_vector_dxyz(&v1, 1.0f, 2.0f, 3.0f); - init_dxyz(&v2, 1.0f, 2.0f, 3.0f); - UTEST_ASSERT_MSG(vector3d_sck(&v1, &v2), "Failed init_vector_dxyz"); - - generic::init_vector(&v2, &v1); - init(&v3, &v1); - UTEST_ASSERT_MSG(vector3d_sck(&v1, &v2), "Failed generic init_vector"); - UTEST_ASSERT_MSG(vector3d_sck(&v1, &v3), "Failed optimized init_vector"); + fill_vector(&v1); + fill_vector(&v2); + fill_vector(&v3); + fill_vector(&v4); + fill_vector(&v5); + fill_vector(&v6); - generic::normalize_vector(&v2); - norm(&v3); + generic::init_vector_dxyz(&v1, 2.0f, 3.0f, 4.0f); + init_dxyz(&v2, 2.0f, 3.0f, 4.0f); + UTEST_ASSERT_MSG(vector3d_sck(&v1, &v2), "Failed init_vector_dxyz"); - UTEST_ASSERT_MSG(vector3d_sck(&v2, &v3), "Failed normalize vector"); + generic::init_vector(&v3, &v1); + init(&v4, &v1); + UTEST_ASSERT_MSG(vector3d_sck(&v1, &v3), "Failed generic init_vector"); + UTEST_ASSERT_MSG(vector3d_sck(&v1, &v4), "Failed optimized init_vector"); + + generic::normalize_vector2(&v5, &v1); + norm2(&v6, &v1); + UTEST_ASSERT_MSG(vector3d_sck(&v5, &v6), "Failed normalize vector 2"); + + generic::normalize_vector(&v3); + norm(&v4); + UTEST_ASSERT_MSG(vector3d_sck(&v3, &v4), "Failed normalize vector"); } UTEST_MAIN { - IF_ARCH_X86(call("sse_vector", sse::init_vector_dxyz, sse::init_vector, sse::normalize_vector)); + IF_ARCH_X86(call("sse_vector", sse::init_vector_dxyz, sse::init_vector, sse::normalize_vector, sse::normalize_vector2)); + IF_ARCH_X86(call("avx_vector", avx::init_vector_dxyz, avx::init_vector, avx::normalize_vector, avx::normalize_vector2)); } UTEST_END; diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2.cpp 2025-03-01 12:42:56.816648243 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -110,7 +110,7 @@ UTEST_BEGIN("dsp.msmatrix", conv2) UTEST_ASSERT_MSG(dst2B.valid(), "Destination buffer 2B corrupted"); // Compare buffers - if ((!dst1A.equals_relative(dst2A, 1e-4)) || (!dst1B.equals_relative(dst2B, 1e-4))) + if ((!dst1A.equals_adaptive(dst2A, 1e-5)) || (!dst1B.equals_adaptive(dst2B, 1e-5))) { srcA.dump("srcA "); srcB.dump("srcA "); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2x1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2x1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2x1.cpp 2025-03-01 12:42:56.820648218 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/msmatrix/conv2x1.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-lib * Created on: 31 мар. 2020 г. @@ -118,7 +118,7 @@ UTEST_BEGIN("dsp.msmatrix", conv2x1) UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); // Compare buffers - if (!dst1.equals_relative(dst2, 1e-4)) + if (!dst1.equals_adaptive(dst2, 1e-5)) { srcA.dump("srcA"); srcB.dump("srcB"); diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/cosf1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/cosf1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/cosf1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/cosf1.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void cosf1(float *dst, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void cosf1(float *dst, size_t count); + } + + namespace avx2 + { + void cosf1(float *dst, size_t count); + void cosf1_fma3(float *dst, size_t count); + } + + namespace avx512 + { + void cosf1(float *dst, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void cosf1(float *dst, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void cosf1(float *dst, size_t count); + } + ) + + typedef void (* cosf1_t)(float *dst, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", cosf1) + + void call(const char *label, size_t align, cosf1_t func1, cosf1_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x01; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + src.randomize(-100.0f * M_PI, 100.0f * M_PI); + + FloatBuffer dst1(src); + FloatBuffer dst2(src); + + // Call functions + func1(dst1, count); + func2(dst2, count); + + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-4)) + { + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + UTEST_FAIL_MSG("Output of functions for test '%s' differs", label); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::cosf1, sse2::cosf1, 16)); + IF_ARCH_X86(CALL(generic::cosf1, avx2::cosf1, 32)); + IF_ARCH_X86(CALL(generic::cosf1, avx2::cosf1_fma3, 32)); + IF_ARCH_X86(CALL(generic::cosf1, avx512::cosf1, 64)); + IF_ARCH_ARM(CALL(generic::cosf1, neon_d32::cosf1, 16)); + IF_ARCH_AARCH64(CALL(generic::cosf1, asimd::cosf1, 16)); + } +UTEST_END + + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/cosf2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/cosf2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/cosf2.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/cosf2.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void cosf2(float *dst, const float *src, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void cosf2(float *dst, const float *src, size_t count); + } + + namespace avx2 + { + void cosf2(float *dst, const float *src, size_t count); + void cosf2_fma3(float *dst, const float *src, size_t count); + } + + namespace avx512 + { + void cosf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void cosf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void cosf2(float *dst, const float *src, size_t count); + } + ) + + typedef void (* cosf2_t)(float *dst, const float *src, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", cosf2) + + void call(const char *label, size_t align, cosf2_t func1, cosf2_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x03; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + src.randomize(-100.0f * M_PI, 100.0f * M_PI); + FloatBuffer dst1(count, align, mask & 0x02); + FloatBuffer dst2(dst1); + + // Call functions + func1(dst1, src, count); + func2(dst2, src, count); + + UTEST_ASSERT_MSG(src.valid(), "Source buffer corrupted"); + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-4)) + { + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + UTEST_FAIL_MSG("Output of functions for test '%s' differs", label); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::cosf2, sse2::cosf2, 16)); + IF_ARCH_X86(CALL(generic::cosf2, avx2::cosf2, 32)); + IF_ARCH_X86(CALL(generic::cosf2, avx2::cosf2_fma3, 32)); + IF_ARCH_X86(CALL(generic::cosf2, avx512::cosf2, 64)); + IF_ARCH_ARM(CALL(generic::cosf2, neon_d32::cosf2, 16)); + IF_ARCH_AARCH64(CALL(generic::cosf2, asimd::cosf2, 16)); + } +UTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/cosf_kp1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/cosf_kp1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/cosf_kp1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/cosf_kp1.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 14 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + + namespace avx2 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + void cosf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_X86_64( + namespace avx2 + { + void x64_cosf_kp1(float *dst, float k, float p, size_t count); + void x64_cosf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void x64_cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void cosf_kp1(float *dst, float k, float p, size_t count); + } + ) + + typedef void (* cosf_kp1_t)(float *dst, float k, float p, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", cosf_kp1) + + void call(const char *label, size_t align, cosf_kp1_t func1, cosf_kp1_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x01; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + src.randomize(-100.0f * M_PI, 100.0f * M_PI); + const float k = randf(-0.1f, 0.1f); + const float p = randf(-20.0f * M_PI, 20.0f * M_PI); + + FloatBuffer dst1(count, align, mask & 0x01); + FloatBuffer dst2(dst1); + + // Call functions + func1(dst1, k, p, count); + func2(dst2, k, p, count); + + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-4)) + { + printf("k = %f, p = %f\n", k, p); + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + const size_t index = dst1.last_diff(); + UTEST_FAIL_MSG("Output of functions for test '%s' differs at index %d: src=%f, dst1=%f, dst2=%f", + label, int(index), src[index], dst1[index], dst2[index]); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::cosf_kp1, sse2::cosf_kp1, 16)); + IF_ARCH_X86(CALL(generic::cosf_kp1, avx2::cosf_kp1, 32)); + IF_ARCH_X86(CALL(generic::cosf_kp1, avx2::cosf_kp1_fma3, 32)); + IF_ARCH_X86_64(CALL(generic::cosf_kp1, avx2::x64_cosf_kp1, 32)); + IF_ARCH_X86_64(CALL(generic::cosf_kp1, avx2::x64_cosf_kp1_fma3, 32)); + IF_ARCH_X86(CALL(generic::cosf_kp1, avx512::cosf_kp1, 64)); + IF_ARCH_X86_64(CALL(generic::cosf_kp1, avx512::x64_cosf_kp1, 64)); + IF_ARCH_ARM(CALL(generic::cosf_kp1, neon_d32::cosf_kp1, 16)); + IF_ARCH_AARCH64(CALL(generic::cosf_kp1, asimd::cosf_kp1, 16)); + } +UTEST_END + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/lanczos1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/lanczos1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/lanczos1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/lanczos1.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,156 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 17 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + + namespace avx2 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + void lanczos1_fma3(float *dst, float k, float p, float t, float a, size_t count); + } + + namespace avx512 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + IF_ARCH_X86_64( + namespace avx2 + { + void x64_lanczos1(float *dst, float k, float p, float t, float a, size_t count); + void x64_lanczos1_fma3(float *dst, float k, float p, float t, float a, size_t count); + } + + namespace avx512 + { + void x64_lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void lanczos1(float *dst, float k, float p, float t, float a, size_t count); + } + ) + + typedef void (* lanczos1_t)(float *dst, float k, float p, float t, float a, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", lanczos1) + + void call(const char *label, size_t align, lanczos1_t func1, lanczos1_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x01; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + + const size_t length = count; + const size_t lobes = randf(4.0f, 8.0f); + const size_t center = length >> 1; + const float shift = randf(0.5f, 1.0f); + const float k = M_PI * float(lobes) / float(center); // Number of samples per lobe + const float p = (float(center) - shift) * k; + const float t = float(center) * k; + const float a = 1.0f / float(lobes); + + FloatBuffer dst1(count, align, mask & 0x01); + FloatBuffer dst2(dst1); + + // Call functions + func1(dst1, k, p, t, a, count); + func2(dst2, k, p, t, a, count); + + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-3)) + { + printf("length=%d, lobes = %d, center = %d, shift = %f\n", int(length), int(lobes), int(center), shift); + printf("k = %f, p = %f, t=%f, a=%f\n", k, p, t, a); + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + const size_t index = dst1.last_diff(); + UTEST_FAIL_MSG("Output of functions for test '%s' differs at index %d: src=%f, dst1=%f, dst2=%f", + label, int(index), src[index], dst1[index], dst2[index]); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::lanczos1, sse2::lanczos1, 16)); + IF_ARCH_X86(CALL(generic::lanczos1, avx2::lanczos1, 32)); + IF_ARCH_X86(CALL(generic::lanczos1, avx2::lanczos1_fma3, 32)); + IF_ARCH_X86_64(CALL(generic::lanczos1, avx2::x64_lanczos1, 32)); + IF_ARCH_X86_64(CALL(generic::lanczos1, avx2::x64_lanczos1_fma3, 32)); + IF_ARCH_X86(CALL(generic::lanczos1, avx512::lanczos1, 64)); + IF_ARCH_X86_64(CALL(generic::lanczos1, avx512::x64_lanczos1, 64)); + IF_ARCH_ARM(CALL(generic::lanczos1, neon_d32::lanczos1, 16)); + IF_ARCH_AARCH64(CALL(generic::lanczos1, asimd::lanczos1, 16)); + } +UTEST_END + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/sinf1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/sinf1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/sinf1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/sinf1.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 11 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void sinf1(float *dst, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void sinf1(float *dst, size_t count); + } + + namespace avx2 + { + void sinf1(float *dst, size_t count); + void sinf1_fma3(float *dst, size_t count); + } + + namespace avx512 + { + void sinf1(float *dst, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void sinf1(float *dst, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void sinf1(float *dst, size_t count); + } + ) + + typedef void (* sinf1_t)(float *dst, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", sinf1) + + void call(const char *label, size_t align, sinf1_t func1, sinf1_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x01; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + src.randomize(-100.0f * M_PI, 100.0f * M_PI); + + FloatBuffer dst1(src); + FloatBuffer dst2(src); + + // Call functions + func1(dst1, count); + func2(dst2, count); + + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-4)) + { + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + UTEST_FAIL_MSG("Output of functions for test '%s' differs", label); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::sinf1, sse2::sinf1, 16)); + IF_ARCH_X86(CALL(generic::sinf1, avx2::sinf1, 32)); + IF_ARCH_X86(CALL(generic::sinf1, avx2::sinf1_fma3, 32)); + IF_ARCH_X86(CALL(generic::sinf1, avx512::sinf1, 64)); + IF_ARCH_ARM(CALL(generic::sinf1, neon_d32::sinf1, 16)); + IF_ARCH_AARCH64(CALL(generic::sinf1, asimd::sinf1, 16)); + } +UTEST_END + + + + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/sinf2.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/sinf2.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/sinf2.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/sinf2.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 11 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void sinf2(float *dst, const float *src, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void sinf2(float *dst, const float *src, size_t count); + } + + namespace avx2 + { + void sinf2(float *dst, const float *src, size_t count); + void sinf2_fma3(float *dst, const float *src, size_t count); + } + + namespace avx512 + { + void sinf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void sinf2(float *dst, const float *src, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void sinf2(float *dst, const float *src, size_t count); + } + ) + + typedef void (* sinf2_t)(float *dst, const float *src, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", sinf2) + + void call(const char *label, size_t align, sinf2_t func1, sinf2_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x03; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + src.randomize(-100.0f * M_PI, 100.0f * M_PI); + FloatBuffer dst1(count, align, mask & 0x02); + FloatBuffer dst2(dst1); + + // Call functions + func1(dst1, src, count); + func2(dst2, src, count); + + UTEST_ASSERT_MSG(src.valid(), "Source buffer corrupted"); + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-4)) + { + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + UTEST_FAIL_MSG("Output of functions for test '%s' differs", label); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::sinf2, sse2::sinf2, 16)); + IF_ARCH_X86(CALL(generic::sinf2, avx2::sinf2, 32)); + IF_ARCH_X86(CALL(generic::sinf2, avx2::sinf2_fma3, 32)); + IF_ARCH_X86(CALL(generic::sinf2, avx512::sinf2, 64)); + IF_ARCH_ARM(CALL(generic::sinf2, neon_d32::sinf2, 16)); + IF_ARCH_AARCH64(CALL(generic::sinf2, asimd::sinf2, 16)); + } +UTEST_END + + diff -pruN 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/sinf_kp1.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/sinf_kp1.cpp --- 1.2.21-5/modules/lsp-dsp-lib/src/test/utest/pmath/sinf_kp1.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-lib/src/test/utest/pmath/sinf_kp1.cpp 2025-08-26 18:15:43.774002825 +0000 @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-lib + * Created on: 12 апр. 2025 г. + * + * lsp-dsp-lib is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-lib 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-lib. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace generic + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + + IF_ARCH_X86( + namespace sse2 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + + namespace avx2 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + void sinf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_X86_64( + namespace avx2 + { + void x64_sinf_kp1(float *dst, float k, float p, size_t count); + void x64_sinf_kp1_fma3(float *dst, float k, float p, size_t count); + } + + namespace avx512 + { + void x64_sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_ARM( + namespace neon_d32 + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + IF_ARCH_AARCH64( + namespace asimd + { + void sinf_kp1(float *dst, float k, float p, size_t count); + } + ) + + typedef void (* sinf_kp1_t)(float *dst, float k, float p, size_t count); +} + +//----------------------------------------------------------------------------- +// Unit test +UTEST_BEGIN("dsp.pmath", sinf_kp1) + + void call(const char *label, size_t align, sinf_kp1_t func1, sinf_kp1_t func2) + { + if (!UTEST_SUPPORTED(func1)) + return; + if (!UTEST_SUPPORTED(func2)) + return; + + UTEST_FOREACH(count, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 19, 24, 25, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 64, 65, 100, 999, 0xfff) + { + for (size_t mask=0; mask <= 0x01; ++mask) + { + printf("Testing %s on input buffer of %d numbers, mask=0x%x...\n", label, int(count), int(mask)); + + FloatBuffer src(count, align, mask & 0x01); + src.randomize(-100.0f * M_PI, 100.0f * M_PI); + const float k = randf(-0.1f, 0.1f); + const float p = randf(-20.0f * M_PI, 20.0f * M_PI); + + FloatBuffer dst1(count, align, mask & 0x01); + FloatBuffer dst2(dst1); + + // Call functions + func1(dst1, k, p, count); + func2(dst2, k, p, count); + + UTEST_ASSERT_MSG(dst1.valid(), "Destination buffer 1 corrupted"); + UTEST_ASSERT_MSG(dst2.valid(), "Destination buffer 2 corrupted"); + + // Compare buffers + if (!dst1.equals_adaptive(dst2, 1e-4)) + { + printf("k = %f, p = %f\n", k, p); + src.dump("src "); + dst1.dump("dst1"); + dst2.dump("dst2"); + const size_t index = dst1.last_diff(); + UTEST_FAIL_MSG("Output of functions for test '%s' differs at index %d: src=%f, dst1=%f, dst2=%f", + label, int(index), src[index], dst1[index], dst2[index]); + } + } + } + } + + UTEST_MAIN + { + #define CALL(generic, func, align) \ + call(#func, align, generic, func) + + IF_ARCH_X86(CALL(generic::sinf_kp1, sse2::sinf_kp1, 16)); + IF_ARCH_X86(CALL(generic::sinf_kp1, avx2::sinf_kp1, 32)); + IF_ARCH_X86(CALL(generic::sinf_kp1, avx2::sinf_kp1_fma3, 32)); + IF_ARCH_X86_64(CALL(generic::sinf_kp1, avx2::x64_sinf_kp1, 32)); + IF_ARCH_X86_64(CALL(generic::sinf_kp1, avx2::x64_sinf_kp1_fma3, 32)); + IF_ARCH_X86(CALL(generic::sinf_kp1, avx512::sinf_kp1, 64)); + IF_ARCH_X86_64(CALL(generic::sinf_kp1, avx512::x64_sinf_kp1, 64)); + IF_ARCH_ARM(CALL(generic::sinf_kp1, neon_d32::sinf_kp1, 16)); + IF_ARCH_AARCH64(CALL(generic::sinf_kp1, asimd::sinf_kp1, 16)); + } +UTEST_END + + + + + diff -pruN 1.2.21-5/modules/lsp-dsp-units/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-dsp-units/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-dsp-units/.github/workflows/build.yml 2025-03-01 12:43:00.940623487 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/.github/workflows/build.yml 2025-08-26 18:15:52.637916798 +0000 @@ -97,7 +97,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ libsndfile-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale libsndfile-devel - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 @@ -119,7 +119,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ libstdc++-devel clang libsndfile-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale glibc-gconv-modules-extra libstdc++-devel clang libsndfile-devel - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 CC=clang CXX=clang++ @@ -188,3 +188,25 @@ jobs: - name: Run unit tests shell: msys2 {0} run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test.exe utest --verbose --jobs 1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config TEST=1 STRICT=1 DEBUG=1 ASAN=1 + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 + - name: Run unit tests + run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 + - name: Run unit tests with memcheck + run: | + for test in $(.build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --list --suppress); do \ + echo "***** MEMCHECK $test *****"; \ + .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 --nofork --debug $test; \ + done diff -pruN 1.2.21-5/modules/lsp-dsp-units/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-dsp-units/CHANGELOG --- 1.2.21-5/modules/lsp-dsp-units/CHANGELOG 2025-03-01 12:43:00.944623464 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/CHANGELOG 2025-08-26 18:15:52.637916798 +0000 @@ -2,6 +2,22 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.30 === +* Added MM_PEAK algorithm to MeterGraph and ScaledMeterGraph. +* Spectrum analyzer now allows to read linear-scaled frequencies and indices. +* Implemented ADSREnvelope class for ADSR envelope computation. +* Added MacOS CI builds. +* Updated module versions in dependencies. + +=== 1.0.29 === +* Optimized complex resampling algorithm for dspu::Sample. +* Implemented functions for quick computing of sine, cosine, logarithm and exponent + with precision loss. +* Implemented linear, constant power, exponential and exponential with precision loss + interpolation functions. +* Updated build scripts. +* Updated module versions in dependencies. + === 1.0.28 === * Added 'listen' playback mode for the sampler in dspu::Sampler. * Added support of build for MacOS. diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/3d/Scene3D.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/3d/Scene3D.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/3d/Scene3D.h 2025-03-01 12:43:00.944623464 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/3d/Scene3D.h 2025-08-26 18:15:52.641916759 +0000 @@ -58,7 +58,6 @@ namespace lsp status_t do_clone(Scene3D *s); status_t load_internal(io::IInStream *is, size_t flags, const char *charset); - status_t load_internal(io::IInSequence *is, size_t flags); public: /** Default constructor @@ -133,14 +132,6 @@ namespace lsp */ status_t load(io::IInStream *is, size_t flags = WRAP_NONE, const char *charset = NULL); - /** - * Load scene from input sequence - * @param is input sequence - * @param flags wrapping flags - * @return status of operation - */ - status_t load(io::IInSequence *is, size_t flags = WRAP_NONE); - public: /** * Do some post-processing after loading scene from file diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/const.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/const.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/const.h 2025-03-01 12:43:00.948623439 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/const.h 2025-08-26 18:15:52.641916759 +0000 @@ -53,9 +53,17 @@ #define GAIN_AMP_P_2_DB 1.25896 /* +2 dB */ #define GAIN_AMP_P_1_DB 1.12202 /* +1 dB */ #define GAIN_AMP_0_DB 1.0 /* 0 dB */ +#define GAIN_AMP_M_1_DB 0.89125 /* -1 dB */ +#define GAIN_AMP_M_2_DB 0.79433 /* -2 dB */ #define GAIN_AMP_M_3_DB 0.707946 /* -3 dB */ +#define GAIN_AMP_M_4_DB 0.63096 /* -4 dB */ +#define GAIN_AMP_M_5_DB 0.56234 /* -5 dB */ #define GAIN_AMP_M_6_DB 0.50118 /* -6 dB */ +#define GAIN_AMP_M_7_DB 0.44668 /* -7 dB */ +#define GAIN_AMP_M_8_DB 0.39811 /* -8 dB */ #define GAIN_AMP_M_9_DB 0.354813 /* -9 dB */ +#define GAIN_AMP_M_10_DB 0.31623 /* -10 dB */ +#define GAIN_AMP_M_11_DB 0.28184 /* -11 dB */ #define GAIN_AMP_M_12_DB 0.25119 /* -12 dB */ #define GAIN_AMP_M_18_DB 0.12589 /* -18 dB */ #define GAIN_AMP_M_24_DB 0.06310 /* -24 dB */ diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/interpolation.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/interpolation.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/interpolation.h 2025-03-01 12:43:00.952623416 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/interpolation.h 2025-08-26 18:15:52.645916720 +0000 @@ -62,6 +62,51 @@ namespace lsp LSP_DSP_UNITS_PUBLIC void hermite_cubic(float *p, float x0, float y0, float k0, float x1, float y1, float k1); + /** Perform quadro Hermite interpolation. + * + * The resulting polynom equation is the following: + * y(x) = p[0]*x^4 + p[1]*x^3 + p[2]*x^2 + p[3]*x + p[4] + * + * @param p destination (4 floats) to store the final hermite polynom + * @param x0 x-coordinate of first point used for interpolation + * @param y0 y-coordinate of first point used for interpolation + * @param k0 the tangent angle of the line at first point + * @param x1 x-coordinate of second point used for interpolation + * @param y1 y-coordinate of second point used for interpolation + * @param k1 the tangent angle of the line at second point + * @param x2 x-coordinate of third point used for interpolation + * @param y2 y-coordinate of third point used for interpolation + */ + LSP_DSP_UNITS_PUBLIC + void hermite_quadro( + float *p, + float x0, float y0, float k0, + float x1, float y1, float k1, + float x2, float y2); + + /** Perform penta Hermite interpolation. + * + * The resulting polynom equation is the following: + * y(x) = p[0]*x^5 + p[1]*x^4 + p[2]*x^3 + p[3]*x^2 + p[4]*x + p[5] + * + * @param p destination (4 floats) to store the final hermite polynom + * @param x0 x-coordinate of first point used for interpolation + * @param y0 y-coordinate of first point used for interpolation + * @param k0 the tangent angle of the line at first point + * @param x1 x-coordinate of second point used for interpolation + * @param y1 y-coordinate of second point used for interpolation + * @param k1 the tangent angle of the line at second point + * @param x2 x-coordinate of third point used for interpolation + * @param y2 y-coordinate of third point used for interpolation + * @param k2 the tangent angle of the line at third point + */ + LSP_DSP_UNITS_PUBLIC + void hermite_penta( + float *p, + float x0, float y0, float k0, + float x1, float y1, float k1, + float x2, float y2, float k2); + /** Perform exponent interpolation * * @param p destination (3 floats) to store the formula: y(x) = p[0] + p[1] * exp(p[2] * x) diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/quickmath.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/quickmath.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/quickmath.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/misc/quickmath.h 2025-08-26 18:15:52.645916720 +0000 @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugins-phaser + * Created on: 24 мар. 2025 г. + * + * lsp-dsp-units is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-units 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-units. If not, see . + */ + +#ifndef LSP_PLUG_IN_DSP_UNITS_MISC_QUICKMATH_H_ +#define LSP_PLUG_IN_DSP_UNITS_MISC_QUICKMATH_H_ + +#include + +#include +#include + +namespace lsp +{ + namespace dspu + { + static constexpr float QMATH_LOG2TOLN = 1.0f / M_LOG2E; + static constexpr float QMATH_PI_DIV_2 = M_PI * 0.5f; + static constexpr float QMATH_LNTOLOG2 = M_LOG2E; + static constexpr float QMATH_LN2 = M_LN2; + + /** + * Quick computation of sine value with precision loss + * @param x the argument, for precise computation it should be within range [-M_PI/2, M_PI/2] + * @return sine value + */ + inline float quick_sinf(float x) + { + const float x2 = x*x; + return x * (1.0f + x2*(-0.166666666667f + x2*(0.00833333333333f + x2 * -0.000198412698413f))); + } + + /** + * Quick computation of cosine value with precision loss + * @param x the argument, for precise computation it should be within range [0, M_PI] + * @return cosine value + */ + inline float quick_cosf(float x) + { + return quick_sinf(QMATH_PI_DIV_2 - x); + } + + /** + * Quick logarithm computation with precision loss + * @param x the argument + * @return logarithm value + */ + inline float quick_logf(float x) + { + // Using taylor series of arctanh function that can express the logarithm value as: + // ln(x) = 2 * arctanh((x-1)/(x+1)) + union { float f; uint32_t i; } u; + + // Get mantissa and reset it for the input argument + u.f = x; + const int f = (u.i >> 23) - 127; // f = mant(x) + u.i = (u.i & 0x007fffff) | 0x3f800000; + + // Prepare for calculations + const float X = u.f; + const float y = (X - 1.0f)/(X + 1.0f); + const float y2 = y*y; + + return 2.0f*y * (1.0f + y2*(0.333333333333f + y2*(0.2f + y2*(0.142857142857f)))) + f * QMATH_LOG2TOLN; + } + + /** + * Quick exponent function computation with precision loss + * @param x the argument + * @return exponent value + */ + inline float quick_expf(float x) + { + const float xp = fabsf(x) * QMATH_LNTOLOG2; + const int n = xp; + const float r = (xp - float(n)) * QMATH_LN2; + + union { float f; uint32_t i; } u; + u.i = (n + 127) << 23; // u.f = 2 ^ r + + const float p = u.f * + (1.0f + r * (1.0f + r * (0.5f + r * (0.166666666667f + r * 0.0416666666667f)))); + + return (x < 0.0f) ? 1.0f / p : p; + } + + /** + * Linear interpolation between two floating-point values + * @param a the value at k = 0.0f + * @param b the value at k = 1.0f + * @param k the interpolation coefficient in range [0.0f, 1.0f] + * @return the interpolated value + */ + inline float lerp(float a, float b, float k) + { + return a + (b - a) * k; + } + + /** + * Linear interpolation between two integer values + * @param a the value at k = 0.0f + * @param b the value at k = 1.0f + * @param k the interpolation coefficient in range [0.0f, 1.0f] + * @return the interpolated value + */ + inline int32_t ilerp(int32_t a, int32_t b, float k) + { + return a + (b - a) * k; + } + + /** + * Constant power (quadratic) interpolation between two floating-point values + * @param a the value at k = 0.0f + * @param b the value at k = 1.0f + * @param k the interpolation coefficient in range [0.0f, 1.0f] + * @return the interpolated value + */ + inline float qlerp(float a, float b, float k) + { + return a * sqrtf(1.0f - k) + b * sqrtf(k); + } + + /** + * Exponential interpolation between two logarithmic floating-point values + * @param a the value at k=0.0f + * @param b the value at k=1.0f + * @param k the interpolation coefficient in range [0.0f, 1.0f] + * @return the interpolated value + */ + inline float elerp(float a, float b, float k) + { + return a * expf(logf(b / a) * k); + } + + /** + * Exponential interpolation between two logarithmic floating-point values using quick logarithm + * and exponent functions + * + * @param a the value at k=0.0f + * @param b the value at k=1.0f + * @param k the interpolation coefficient in range [0.0f, 1.0f] + * @return the interpolated value + */ + inline float quick_elerp(float a, float b, float k) + { + return a * quick_expf(quick_logf(b / a) * k); + } + + } /* namespace dspu */ +} /* namespace lsp */ + + +#endif /* LSP_PLUG_IN_DSP_UNITS_MISC_QUICKMATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/ADSREnvelope.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/ADSREnvelope.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/ADSREnvelope.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/ADSREnvelope.h 2025-08-26 18:15:52.649916682 +0000 @@ -0,0 +1,280 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-units + * Created on: 10 июн. 2025 г. + * + * lsp-dsp-units is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-units 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-units. If not, see . + */ + +#ifndef LSP_PLUG_IN_DSP_UNITS_UTIL_ADSRENVELOPE_H_ +#define LSP_PLUG_IN_DSP_UNITS_UTIL_ADSRENVELOPE_H_ + +#include +#include +#include + +namespace lsp +{ + namespace dspu + { + /** + * ADSR envelope calculator. + * Supports additional Hold and Break points working as AHDBSSR + * (Attack, Hold, Decay, Break, Slope, Sustain, Release) curve + */ + class ADSREnvelope + { + public: + enum function_t + { + ADSR_NONE, + ADSR_LINE, + ADSR_LINE2, + ADSR_CUBIC, + ADSR_QUADRO, + ADSR_EXP, + }; + + protected: + enum flags_t + { + F_USE_HOLD = 1 << 0, + F_USE_BREAK = 1 << 1, + F_RECONFIGURE = 1 << 2, + }; + + enum part_t + { + P_ATTACK, + P_DECAY, + P_SLOPE, + P_RELEASE, + + P_TOTAL + }; + + struct gen_none_t + { + float fT; + float fK; + float fB; + }; + + struct gen_line_t + { + float fT2; + float fK1; + float fB1; + float fK2; + float fB2; + }; + + struct gen_hermite_t + { + float fT0; + float fK[5]; + }; + + struct gen_exp_t + { + float fT0; + float fKT; + float fA[2]; + float fB[2]; + }; + + union gen_params_t + { + gen_none_t sNone; + gen_line_t sLine; + gen_hermite_t sHermite; + gen_exp_t sExp; + }; + + typedef float (*generator_t)(float t, const gen_params_t *params); + + struct curve_t + { + float fTime; + float fCurve; + function_t enFunction; + generator_t pGenerator; + gen_params_t sParams; + }; + + protected: + curve_t vCurve[P_TOTAL]; + float fHoldTime; + float fBreakLevel; + float fSustainLevel; + uint32_t nFlags; + + protected: + static float none_generator(float t, const gen_params_t *params); + static float line_generator(float t, const gen_params_t *params); + static float cubic_generator(float t, const gen_params_t *params); + static float quadro_generator(float t, const gen_params_t *params); + static float exp_generator(float t, const gen_params_t *params); + static inline float limit_range(float t, float prev); + static inline void configure_curve(curve_t *curve, float x0, float x1, float y0, float y1); + + protected: + void set_param(float & param, float value); + void set_function(function_t & func, function_t value); + void set_flag(uint32_t flag, bool set); + void set_curve(part_t part, float time, float curve, function_t func); + inline float do_process(float value); + + public: + ADSREnvelope(); + ~ADSREnvelope(); + + ADSREnvelope(const ADSREnvelope &) = delete; + ADSREnvelope(ADSREnvelope &&) = delete; + ADSREnvelope & operator = (const ADSREnvelope &) = delete; + ADSREnvelope & operator = (ADSREnvelope &&) = delete; + + /** + * Construct envelope + */ + void construct(); + + /** + * Destroy envelope + */ + void destroy(); + + public: + inline void set_attack_time(float value) { set_param(vCurve[P_ATTACK].fTime, value); } + inline void set_hold_time(float value) { set_param(fHoldTime, value); } + inline void set_decay_time(float value) { set_param(vCurve[P_DECAY].fTime, value); } + inline void set_slope_time(float value) { set_param(vCurve[P_SLOPE].fTime, value); } + inline void set_relese_time(float value) { set_param(vCurve[P_RELEASE].fTime, value); } + + inline void set_attack_curve(float value) { set_param(vCurve[P_ATTACK].fCurve, value); } + inline void set_decay_curve(float value) { set_param(vCurve[P_DECAY].fCurve, value); } + inline void set_slope_curve(float value) { set_param(vCurve[P_SLOPE].fCurve, value); } + inline void set_release_curve(float value) { set_param(vCurve[P_RELEASE].fCurve, value); } + + inline void set_attack_function(function_t f) { set_function(vCurve[P_ATTACK].enFunction, f); } + inline void set_decay_function(function_t f) { set_function(vCurve[P_DECAY].enFunction, f); } + inline void set_slope_function(function_t f) { set_function(vCurve[P_SLOPE].enFunction, f); } + inline void set_release_function(function_t f) { set_function(vCurve[P_RELEASE].enFunction, f); } + + inline void set_break_level(float value) { set_param(fBreakLevel, value); } + inline void set_sustain_level(float value) { set_param(fSustainLevel, value); } + + inline void set_hold_enabled(bool enabled) { set_flag(F_USE_HOLD, enabled); } + inline void set_break_enabled(bool enabled) { set_flag(F_USE_BREAK, enabled); } + + inline void set_attack(float time, float curve, function_t func) { set_curve(P_ATTACK, time, curve, func); } + void set_hold(float time, bool enabled); + inline void set_decay(float time, float curve, function_t func) { set_curve(P_DECAY, time, curve, func); } + void set_break(float level, bool enabled); + inline void set_slope(float time, float curve, function_t func) { set_curve(P_SLOPE, time, curve, func); } + inline void set_release(float time, float curve, function_t func) { set_curve(P_RELEASE, time, curve, func); } + + inline float attack_time() const { return vCurve[P_ATTACK].fTime; } + inline float hold_time() const { return fHoldTime; } + inline float decay_time() const { return vCurve[P_DECAY].fTime; } + inline float slope_time() const { return vCurve[P_SLOPE].fTime; } + inline float release_time() const { return vCurve[P_RELEASE].fTime; } + + inline float attack_curve() const { return vCurve[P_ATTACK].fCurve; } + inline float decay_curve() const { return vCurve[P_DECAY].fCurve; } + inline float slope_curve() const { return vCurve[P_SLOPE].fCurve; } + inline float release_curve() const { return vCurve[P_RELEASE].fCurve; } + + inline function_t attack_function() const { return vCurve[P_ATTACK].enFunction; } + inline function_t decay_function() const { return vCurve[P_DECAY].enFunction; } + inline function_t slope_function() const { return vCurve[P_SLOPE].enFunction; } + inline function_t release_function() const { return vCurve[P_RELEASE].enFunction; } + + inline float break_level() const { return fBreakLevel; } + inline float sustain_level() const { return fSustainLevel; } + + inline float hold_enabled() const { return nFlags & F_USE_HOLD; } + inline float break_enabled() const { return nFlags & F_USE_BREAK; } + + public: + /** + * Update settings if needed + */ + void update_settings(); + + /** + * Compute ADSR point for specified value + * @param value normalized time point [0..1] + * @return computed ADSR value or 0 if outside the [0..1] range + */ + float process(float value); + + /** + * Compute ADSR points for specified values + * @param dst destination buffer to store result + * @param src source values to process + * @param count number of values to process + */ + void process(float *dst, const float *src, size_t count); + + /** + * Compute amd apply ADSR points for specified values and apply to target buffer + * @param dst destination buffer to apply result + * @param src source values to process + * @param count number of values to process + */ + void process_mul(float *dst, const float *src, size_t count); + + /** + * Generate part of the ADSR curve and store to buffer + * @param dst pointer to store generated values + * @param start the time of first point + * @param step the actual time step + * @param count number of points to generate + */ + void generate(float *dst, float start, float step, size_t count); + + /** + * Generate and apply curve to the buffer + * @param dst destination buffer to modify + * @param start the time of first point + * @param step the actual time step + * @param count number of points to apply + */ + void generate_mul(float *dst, float start, float step, size_t count); + + /** + * Apply curve to the buffer + * @param dst destination buffer to store result + * @param src source buffer to read + * @param start the time of first point + * @param step the actual time step + * @param count number of points to apply + */ + void generate_mul(float *dst, const float *src, float start, float step, size_t count); + + /** + * Dump the state + * @param v state dumper + */ + void dump(IStateDumper *v) const; + }; + + } /* namespace dspu */ +} /* namespace lsp */ + + +#endif /* LSP_PLUG_IN_DSP_UNITS_UTIL_ADSRENVELOPE_H_ */ diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/Analyzer.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/Analyzer.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/Analyzer.h 2025-03-01 12:43:00.952623416 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/Analyzer.h 2025-08-26 18:15:52.649916682 +0000 @@ -327,8 +327,9 @@ namespace lsp * @param start start frequency * @param stop stop frequency * @param count number of elements + * @param linear use linear scale */ - void get_frequencies(float *frq, uint32_t *idx, float start, float stop, size_t count); + void get_frequencies(float *frq, uint32_t *idx, float start, float stop, size_t count, bool linear = false); /** Read the frequencies of the analyzer * diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/MeterGraph.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/MeterGraph.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/MeterGraph.h 2025-03-01 12:43:00.952623416 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/MeterGraph.h 2025-08-26 18:15:52.649916682 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-units * Created on: 20 мая 2016 г. @@ -32,10 +32,34 @@ namespace lsp { enum meter_method_t { + /** + * Absolute maximum: max(fabsf(data[0..x])) + */ MM_ABS_MAXIMUM, + + /** + * Absolute minimum: min(fabsf(data[0..x])) + */ MM_ABS_MINIMUM, + + /** + * Sign-dependent minimum: (fabsf(pos) >= fabsf(neg)) ? pos : neg + * where pos = fabsf(max(data[0..x], 0.0)) + * and neg = fabsf(min(data[0..x], 0.0)) + */ MM_SIGN_MAXIMUM, + + /** + * Sign-dependent minimum: (fabsf(pos) < fabsf(neg)) ? pos : neg + * where pos = fabsf(max(data[0..x], 0.0)) + * and neg = fabsf(min(data[0..x], 0.0)) + */ MM_SIGN_MINIMUM, + + /** + * Peak value: data[0] + */ + MM_PEAK, }; class LSP_DSP_UNITS_PUBLIC MeterGraph diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/RingBuffer.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/RingBuffer.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/RingBuffer.h 2025-03-01 12:43:00.952623416 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/RingBuffer.h 2025-08-26 18:15:52.649916682 +0000 @@ -114,6 +114,14 @@ namespace lsp float get(size_t offset); /** + * Get the interpolated sample at the tail of the buffer specified by the offset. + * The value is computed using linear interpolation + * @param offset offset + * @return data the sample at the tail of the buffer + */ + float lerp_get(float offset); + + /** * Get offset of the head relative to the position * @return position of the head relative to the beginning of the buffer */ diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/SpectralProcessor.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/SpectralProcessor.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/SpectralProcessor.h 2025-03-01 12:43:00.952623416 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/util/SpectralProcessor.h 2025-08-26 18:15:52.649916682 +0000 @@ -147,6 +147,11 @@ namespace lsp * @param count number of samples to process */ void process(float *dst, const float *src, size_t count); + + /** + * Reset state: cleanup internal buffers + */ + void reset(); /** * Dump the state diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/version.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/version.h --- 1.2.21-5/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/version.h 2025-03-01 12:43:00.952623416 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/lsp-plug.in/dsp-units/version.h 2025-08-26 18:15:52.649916682 +0000 @@ -25,7 +25,7 @@ // Define version of headers #define LSP_DSP_UNITS_MAJOR 1 #define LSP_DSP_UNITS_MINOR 0 -#define LSP_DSP_UNITS_MICRO 28 +#define LSP_DSP_UNITS_MICRO 30 #if defined(LSP_DSP_UNITS_PUBLISHER) #define LSP_DSP_UNITS_PUBLIC LSP_EXPORT_MODIFIER diff -pruN 1.2.21-5/modules/lsp-dsp-units/include/private/3d/scene/obj.h 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/private/3d/scene/obj.h --- 1.2.21-5/modules/lsp-dsp-units/include/private/3d/scene/obj.h 2025-03-01 12:43:00.956623392 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/include/private/3d/scene/obj.h 2025-08-26 18:15:52.649916682 +0000 @@ -24,7 +24,10 @@ #include #include +#include +#include #include +#include #include #include #include @@ -275,16 +278,39 @@ namespace lsp status_t load_scene_from_obj(dspu::Scene3D *scene, io::IInStream *is, const char *charset) { - obj::PushParser pp; - ObjSceneHandler handler(scene); - return pp.parse_data(&handler, is, WRAP_NONE, charset); - } + // Load to memory + io::OutMemoryStream oms; + const wssize_t count = is->sink(&oms); + if (count < 0) + return status_t(-count); - status_t load_scene_from_obj(dspu::Scene3D *scene, io::IInSequence *is) - { - obj::PushParser pp; + status_t res = STATUS_OK; ObjSceneHandler handler(scene); - return pp.parse_data(&handler, is, WRAP_NONE); + + // Try to load compressed object file first + { + io::InMemoryStream ims; + ims.wrap(oms.data(), oms.size()); + + obj::Decompressor dp; + if ((res = dp.parse_data(&handler, &ims)) == STATUS_OK) + return res; + if ((res != STATUS_BAD_FORMAT) && + (res != STATUS_UNSUPPORTED_FORMAT)) + return res; + } + + // Try to load non-compressed object file + { + io::InMemoryStream ims; + ims.wrap(oms.data(), oms.size()); + + obj::PushParser pp; + if ((res = pp.parse_data(&handler, &ims, WRAP_NONE, charset)) == STATUS_OK) + return res; + } + + return res; } } /* namespace dspu */ diff -pruN 1.2.21-5/modules/lsp-dsp-units/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-dsp-units/make/tools.mk --- 1.2.21-5/modules/lsp-dsp-units/make/tools.mk 2025-03-01 12:43:00.956623392 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/make/tools.mk 2025-08-26 18:15:52.649916682 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-dsp-units/modules.mk 1.2.23-0ubuntu1/modules/lsp-dsp-units/modules.mk --- 1.2.21-5/modules/lsp-dsp-units/modules.mk 2025-03-01 12:43:00.956623392 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/modules.mk 2025-08-26 18:15:52.649916682 +0000 @@ -20,31 +20,31 @@ #------------------------------------------------------------------------------ # Variables that describe source code dependencies -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git diff -pruN 1.2.21-5/modules/lsp-dsp-units/project.mk 1.2.23-0ubuntu1/modules/lsp-dsp-units/project.mk --- 1.2.21-5/modules/lsp-dsp-units/project.mk 2025-03-01 12:43:00.956623392 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/project.mk 2025-08-26 18:15:52.649916682 +0000 @@ -23,5 +23,5 @@ ARTIFACT_ID = LSP_DSP_UN ARTIFACT_NAME = lsp-dsp-units ARTIFACT_DESC = High-level classes for performing DSP ARTIFACT_HEADERS = lsp-plug.in -ARTIFACT_VERSION = 1.0.28 +ARTIFACT_VERSION = 1.0.30 diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/3d/Scene3D.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/3d/Scene3D.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/3d/Scene3D.cpp 2025-03-01 12:43:00.996623152 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/3d/Scene3D.cpp 2025-08-26 18:15:52.709916099 +0000 @@ -495,32 +495,12 @@ namespace lsp return res; } - status_t Scene3D::load(io::IInSequence *is, size_t flags) - { - status_t res; - Scene3D tmp; - if ((res = tmp.load_internal(is, flags)) == STATUS_OK) - tmp.swap(this); - return res; - } - status_t Scene3D::load_internal(io::IInStream *is, size_t flags, const char *charset) { status_t res = load_scene_from_obj(this, is, charset); if (flags & WRAP_CLOSE) res = update_status(res, is->close()); if (flags & WRAP_DELETE) - delete is; - - return res; - } - - status_t Scene3D::load_internal(io::IInSequence *is, size_t flags) - { - status_t res = load_scene_from_obj(this, is); - if (flags & WRAP_CLOSE) - res = update_status(res, is->close()); - if (flags & WRAP_DELETE) delete is; return res; diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/misc/interpolation.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/misc/interpolation.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/misc/interpolation.cpp 2025-03-01 12:43:00.996623152 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/misc/interpolation.cpp 2025-08-26 18:15:52.713916061 +0000 @@ -28,6 +28,77 @@ namespace lsp { namespace interpolation { + //----------------------------------------------------------------- + // Matrix-related operations + static void swap_rows(double *a, double *b, size_t count) + { + for (size_t i=0; i= 1e-20f) + { + swap_rows(srow, drow, cols - i); + break; + } + } + } + + // Subtract all other rows + for (size_t j=i+1; j 0; ) + c[i] = solve_row(&m[i*cols + i], &c[i], vars - i); + } + + //----------------------------------------------------------------- + LSP_DSP_UNITS_PUBLIC void hermite_quadratic(float *p, float x0, float y0, float k0, float x1, float k1) { @@ -60,6 +131,96 @@ namespace lsp } LSP_DSP_UNITS_PUBLIC + void hermite_quadro( + float *p, + float x0, float y0, float k0, + float x1, float y1, float k1, + float x2, float y2) + { + double m[5 * 6]; + + double X[3] = { x0, x1, x2 }; + double Y[3] = { y0, y1, y2 }; + double K[2] = { k0, k1 }; + + for (size_t i=0; i<3; ++i) + { + const double x = X[i]; + double *r0 = &m[i * 6]; + + r0[5] = -Y[i]; // y + r0[4] = 1.0; // 1 + r0[3] = x; // x + r0[2] = x*x; // x^2 + r0[1] = x*r0[2]; // x^3 + r0[0] = r0[2]*r0[2]; // x^4 + + if (i < 2) + { + double *r1 = &m[(i + 3)*6]; + + r1[5] = -K[i]; // k + r1[4] = 0.0; // 0 + r1[3] = 1.0; // 1 + r1[2] = 2.0 * x; // 2*x^1 + r1[1] = 3.0 * r0[2]; // 3*x^2 + r1[0] = 4.0 * r0[1]; // 4*x^3 + } + } + + // Compute polynom parameters and output result + double c[5]; + solve_matrix(c, m, 5); + + for (size_t i=0; i<5; ++i) + p[i] = c[i]; + } + + LSP_DSP_UNITS_PUBLIC + void hermite_penta( + float *p, + float x0, float y0, float k0, + float x1, float y1, float k1, + float x2, float y2, float k2) + { + double X[3] = { x0, x1, x2 }; + double Y[3] = { y0, y1, y2 }; + double K[3] = { k0, k1, k2 }; + + double m[6 * 7]; + + for (size_t i=0; i<3; ++i) + { + const double x = X[i]; + + double *r0 = &m[i * 7]; + r0[6] = -Y[i]; // y + r0[5] = 1.0; // 1 + r0[4] = x; // x + r0[3] = x*x; // x^2 + r0[2] = x*r0[3]; // x^3 + r0[1] = r0[3]*r0[3]; // x^4 + r0[0] = r0[2]*r0[3]; // x^5 + + double *r1 = &m[(i + 3)*7]; + r1[6] = -K[i]; // k + r1[5] = 0.0; // 0 + r1[4] = 1.0; // 1 + r1[3] = 2.0 * x; // 2*x^1 + r1[2] = 3.0 * r0[3]; // 3*x^2 + r1[1] = 4.0 * r0[2]; // 4*x^3 + r1[0] = 5.0 * r0[1]; // 5*x^4 + } + + // Compute polynom parameters and output result + double c[6]; + solve_matrix(c, m, 6); + + for (size_t i=0; i<6; ++i) + p[i] = c[i]; + } + + LSP_DSP_UNITS_PUBLIC void exponent(float *p, float x0, float y0, float x1, float y1, float k) { double e = exp(k*(x0 - x1)); diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/misc/lfo.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/misc/lfo.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/misc/lfo.cpp 2025-03-01 12:43:00.996623152 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/misc/lfo.cpp 2025-08-26 18:15:52.713916061 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-units * Created on: 10 июн. 2023 г. @@ -21,6 +21,7 @@ #include #include +#include namespace lsp { @@ -28,36 +29,9 @@ namespace lsp { namespace lfo { - static constexpr float REV_LN100 = 0.5f / M_LN10; - static constexpr float LOG2TOLN = 1.0f / M_LOG2E; - - static inline float taylor_sinf(float x) - { - // Taylor series sine approximation for better performance - // The argument should be within range -M_PI/2 ... M_PI/2 - const float x2 = x*x; - return x * (1.0f + x2*(-0.166666666667f + x2*(0.00833333333333f + x2 * -0.000198412698413f))); - } - - static inline float taylor_logf(float x) - { - // Using taylor series of arctanh function that can express the logarithm value as: - // ln(x) = 2 * arctanh((x-1)/(x+1)) - union { float f; uint32_t i; } u; - - // Get mantissa and reset it for the input argument - u.f = x; - const int f = (u.i >> 23) - 127; // f = mant(x) - u.i = (u.i & 0x007fffff) | 0x3f800000; - - // Prepare for calculations - const float X = u.f; - const float y = (X - 1.0f)/(X + 1.0f); - const float y2 = y*y; - - return 2.0f*y * (1.0f + y2*(0.333333333333f + y2*(0.2f + y2*(0.142857142857f)))) + f * LOG2TOLN; - } - + static constexpr float LFO_REV_LN100 = 0.5f / M_LN10; + static constexpr float LFO_M_2PI = 2.0f * M_PI; + static constexpr float LFO_M_4PI = 4.0f * M_PI; LSP_DSP_UNITS_PUBLIC float triangular(float phase) @@ -69,8 +43,8 @@ namespace lsp float sine(float phase) { return (phase >=0.5f) ? - 0.5f + 0.5f*taylor_sinf((0.75f - phase) * M_PI * 2.0f) : - 0.5f + 0.5f*taylor_sinf((phase - 0.25f) * M_PI * 2.0f); + 0.5f + 0.5f * quick_sinf((0.75f - phase) * LFO_M_2PI) : + 0.5f + 0.5f * quick_sinf((phase - 0.25f) * LFO_M_2PI); } LSP_DSP_UNITS_PUBLIC @@ -79,13 +53,13 @@ namespace lsp if (phase >= 0.5f) { return (phase >= 0.75f) ? - 0.25f + 0.25f * taylor_sinf((0.875f - phase) * M_PI * 4.0f) : - 0.75f + 0.25f * taylor_sinf((0.625f - phase) * M_PI * 4.0f); + 0.25f + 0.25f * quick_sinf((0.875f - phase) * LFO_M_4PI) : + 0.75f + 0.25f * quick_sinf((0.625f - phase) * LFO_M_4PI); } return (phase >= 0.25f) ? - 0.75f + 0.25f * sinf((phase - 0.375f) * M_PI * 4.0f) : - 0.25f + 0.25f * sinf((phase - 0.125f) * M_PI * 4.0f); + 0.75f + 0.25f * sinf((phase - 0.375f) * LFO_M_4PI) : + 0.25f + 0.25f * sinf((phase - 0.125f) * LFO_M_4PI); } LSP_DSP_UNITS_PUBLIC @@ -128,7 +102,7 @@ namespace lsp { if (phase >= 0.5f) phase = 1.0f - phase; - return taylor_logf(1.0f + 198.0f *phase) * REV_LN100; + return quick_logf(1.0f + 198.0f *phase) * LFO_REV_LN100; } LSP_DSP_UNITS_PUBLIC @@ -136,7 +110,7 @@ namespace lsp { if (phase >= 0.5f) phase = 1.0f - phase; - return 1.0f - logf(100.0f - 198.0f * phase) * REV_LN100; + return 1.0f - quick_logf(100.0f - 198.0f * phase) * LFO_REV_LN100; } LSP_DSP_UNITS_PUBLIC diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/sampling/Sample.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/sampling/Sample.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/sampling/Sample.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/sampling/Sample.cpp 2025-08-26 18:15:52.713916061 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins * Created on: 12 мая 2017 г. @@ -41,7 +41,9 @@ namespace lsp namespace dspu { static constexpr size_t BUFFER_FRAMES = 0x1000; - static constexpr size_t RESAMPLING_PERIODS = 32; + static constexpr float RESAMPLING_KPERIODS = 32.0f; + static constexpr float RESAMPLING_RPERIODS = 1.0f / RESAMPLING_KPERIODS; + static constexpr float RESAMPLING_PI = M_PI; namespace { @@ -1014,11 +1016,10 @@ namespace lsp { // Calculate parameters of transformation ssize_t kf = new_sample_rate / nSampleRate; - float rkf = 1.0f / kf; + const float rkf = RESAMPLING_PI / kf; // Prepare kernel for resampling - ssize_t k_periods = RESAMPLING_PERIODS; // * (kf >> 1); - ssize_t k_base = k_periods * kf; + ssize_t k_base = RESAMPLING_KPERIODS * kf; ssize_t k_center = k_base + 1; ssize_t k_len = (k_center << 1) + 1; ssize_t k_size = align_size(k_len + 1, 4); // Additional sample for time offset @@ -1037,18 +1038,11 @@ namespace lsp s->set_sample_rate(new_sample_rate); // Generate Lanczos kernel - for (ssize_t j=0; j -k_periods) && (t < k_periods)) - { - float t2 = M_PI * t; - k[j] = (t != 0) ? k_periods * sinf(t2) * sinf(t2 / k_periods) / (t2 * t2) : 1.0f; - } - else - k[j] = 0.0f; - } + dsp::lanczos1( + k, + rkf, k_center * rkf, + RESAMPLING_KPERIODS * RESAMPLING_PI, RESAMPLING_RPERIODS, + k_size); // Iterate each channel for (size_t c=0; cset_sample_rate(new_sample_rate); // Iterate each channel - for (size_t c=0; cvBuffer[c * s->nMaxLength]; + // calculate the offset between nearest samples + const ssize_t p = kf * i; + const float dt = float(i)*kf - float(p); + + // Generate Lanczos kernel + dsp::lanczos1( + k, + rkf, (k_center + dt) * rkf, + RESAMPLING_KPERIODS * RESAMPLING_PI, RESAMPLING_RPERIODS, + k_size); - for (ssize_t i=0; i -k_periods) && (t < k_periods)) - { - float t2 = M_PI * t; - k[j] = (t != 0.0f) ? k_periods * sinf(t2) * sinf(t2 / k_periods) / (t2 * t2) : 1.0f; - } - else - k[j] = 0.0f; - } + const float *src = &vBuffer[c * nMaxLength]; + float *dst = &s->vBuffer[c * s->nMaxLength]; + ssize_t xp = p; // Perform convolutions for (size_t j=i; jvBuffer[c * s->nMaxLength]; dsp::move(dst, &dst[k_center], s->nLength - k_center); } @@ -1150,12 +1141,11 @@ namespace lsp ssize_t src_step = nSampleRate / gcd; ssize_t dst_step = new_sample_rate / gcd; float kf = float(dst_step) / float(src_step); - float rkf = float(src_step) / float(dst_step); + const float rkf = (RESAMPLING_PI * float(src_step)) / float(dst_step); // Prepare kernel for resampling - ssize_t k_base = RESAMPLING_PERIODS; - ssize_t k_periods = k_base * rkf; // Number of periods - ssize_t k_center = k_base + 1; + float k_periods = RESAMPLING_KPERIODS * RESAMPLING_PI * rkf; // Number of periods + ssize_t k_center = RESAMPLING_KPERIODS + 1.0f; ssize_t k_len = (k_center << 1) + rkf + 1; // Centered impulse response ssize_t k_size = align_size(k_len + 1, 4); // Additional sample for time offset float *k = static_cast(malloc(sizeof(float) * k_size)); @@ -1173,40 +1163,38 @@ namespace lsp s->set_sample_rate(new_sample_rate); // Iterate each channel - for (size_t c=0; cvBuffer[c * s->nMaxLength]; + // calculate the offset between nearest samples + const ssize_t p = kf * i; + const float dt = float(i)*kf - float(p); // Always positive, in range of [0..1] + + // Generate Lanczos kernel + dsp::lanczos1( + k, + rkf, (k_center + dt) * rkf, + k_periods, RESAMPLING_RPERIODS, + k_size); - for (ssize_t i=0; i -k_periods) && (t < k_periods)) - { - float t2 = M_PI * t; - k[j] = (t != 0.0f) ? k_periods * sinf(t2) * sinf(t2 / k_periods) / (t2 * t2) : 1.0f; - } - else - k[j] = 0.0f; - } + const float *src = &vBuffer[c * nMaxLength]; + float *dst = &s->vBuffer[c * s->nMaxLength]; + ssize_t xp = p; // Perform convolutions for (size_t j=i; jvBuffer[c * s->nMaxLength]; dsp::move(dst, &dst[k_center], s->nLength - k_center); } diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/stat/QuantizedCounter.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/stat/QuantizedCounter.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/stat/QuantizedCounter.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/stat/QuantizedCounter.cpp 2025-08-26 18:15:52.713916061 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-dsp-units * Created on: 13 нояб. 2024 г. @@ -44,6 +44,7 @@ namespace lsp nPeriod = 0; nLevels = 0; nHead = 0; + nCapacity = 0; nCount = 0; nMaxPeriod = 0; nMaxLevels = 0; diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/ADSREnvelope.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/ADSREnvelope.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/ADSREnvelope.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/ADSREnvelope.cpp 2025-08-26 18:15:52.713916061 +0000 @@ -0,0 +1,627 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-dsp-units + * Created on: 11 июн. 2025 г. + * + * lsp-dsp-units is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-dsp-units 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-dsp-units. If not, see . + */ + +#include +#include +#include + +namespace lsp +{ + namespace dspu + { + ADSREnvelope::ADSREnvelope() + { + construct(); + } + + ADSREnvelope::~ADSREnvelope() + { + destroy(); + } + + void ADSREnvelope::construct() + { + for (size_t i=0; ifTime = 0.0f; + cv->fCurve = 0.5f; + cv->enFunction = ADSR_NONE; + cv->pGenerator = none_generator; + cv->sParams.sNone.fK = 0.0f; + cv->sParams.sNone.fB = 0.0f; + } + + fHoldTime = 0.0f; + fBreakLevel = 0.0f; + fSustainLevel = 0.0f; + nFlags = F_RECONFIGURE; + } + + void ADSREnvelope::destroy() + { + } + + + void ADSREnvelope::set_param(float & param, float value) + { + const float normalized = lsp_limit(value, 0.0f, 1.0f); + if (param == normalized) + return; + + param = normalized; + nFlags |= F_RECONFIGURE; + } + + void ADSREnvelope::set_function(function_t & func, function_t value) + { + if (func == value) + return; + + func = value; + nFlags |= F_RECONFIGURE; + } + + void ADSREnvelope::set_flag(uint32_t flag, bool set) + { + bool on = nFlags & flag; + if (set != on) + nFlags = lsp_setflag(nFlags, flag, set) | F_RECONFIGURE; + } + + void ADSREnvelope::set_curve(part_t part, float time, float curve, function_t func) + { + curve_t *cv = &vCurve[part]; + + time = lsp_limit(time, 0.0f, 1.0f); + curve = lsp_limit(curve, 0.0f, 1.0f); + + if ((cv->fTime == time) && (cv->fCurve == curve) && (cv->enFunction == func)) + return; + + cv->fTime = time; + cv->fCurve = curve; + cv->enFunction = func; + nFlags |= F_RECONFIGURE; + } + + void ADSREnvelope::set_hold(float time, bool enabled) + { + set_param(fHoldTime, time); + set_flag(F_USE_HOLD, enabled); + } + + void ADSREnvelope::set_break(float level, bool enabled) + { + set_param(fBreakLevel, level); + set_flag(F_USE_BREAK, enabled); + } + + inline float ADSREnvelope::limit_range(float t, float prev) + { + return lsp_limit(lsp_max(t, prev), 0.0f, 1.0f); + } + + void ADSREnvelope::configure_curve(curve_t *curve, float x0, float x1, float y0, float y1) + { + switch (curve->enFunction) + { + case ADSR_LINE: + { + curve->pGenerator = line_generator; + gen_line_t *g = &curve->sParams.sLine; + + g->fT2 = 0.5f * (x0 + x1); + const float cy = y0 + (y1 - y0) * curve->fCurve; + + g->fK1 = (cy - y0) / (g->fT2 - x0); + g->fB1 = y0 - g->fK1 * x0; + + g->fK2 = (y1 - cy) / (x1 - g->fT2); + g->fB2 = cy - g->fK2 * g->fT2; + break; + } + + case ADSR_LINE2: + { + curve->pGenerator = line_generator; + gen_line_t *g = &curve->sParams.sLine; + + g->fT2 = x1 + (x0 - x1) * curve->fCurve; + const float cy = y0 + (y1 - y0) * curve->fCurve; + + g->fK1 = (cy - y0) / (g->fT2 - x0); + g->fB1 = y0 - g->fK1 * x0; + + g->fK2 = (y1 - cy) / (x1 - g->fT2); + g->fB2 = cy - g->fK2 * g->fT2; + break; + } + + case ADSR_CUBIC: + { + curve->pGenerator = cubic_generator; + gen_hermite_t *g = &curve->sParams.sHermite; + + const float cx = 0.5f * (x0 + x1); + const float cy = y0 + (y1 - y0) * curve->fCurve; + const float k0 = (cy - y0) / (cx - x0); + const float k1 = (y1 - cy) / (x1 - cx); + + g->fT0 = x0; + interpolation::hermite_cubic(g->fK, 0.0f, y0, k0, x1 - x0, y1, k1); + + break; + } + + case ADSR_QUADRO: + { + curve->pGenerator = quadro_generator; + gen_hermite_t *g = &curve->sParams.sHermite; + + const float cx = 0.5f * (x0 + x1); + const float cy = y0 + (y1 - y0) * (0.3f + curve->fCurve * 0.4f); + + g->fT0 = x0; + interpolation::hermite_quadro( + g->fK, + 0.0f, y0, 0.0f, + x1 - x0, y1, 0.0f, + cx - x0, cy); + + break; + } + + case ADSR_EXP: + { + curve->pGenerator = exp_generator; + gen_exp_t *g = &curve->sParams.sExp; + + const float kt = 0.5f - curve->fCurve; + const float ndx = 1.0f/(x1 - x0); + + g->fT0 = x0; + g->fKT = fabsf(kt) * 40.0f; + + const float ny = expf(-g->fKT); + if (kt >= 0.0f) + { + g->fA[0] = y0; + g->fA[1] = (y1 - y0) * ny; + g->fB[0] = ndx; + g->fB[1] = 0.0f; + } + else + { + g->fA[0] = y1; + g->fA[1] = (y0 - y1) * ny; + g->fB[0] = -ndx; + g->fB[1] = 1.0f; + } + + break; + } + + case ADSR_NONE: + default: + { + curve->pGenerator = none_generator; + gen_none_t *g = &curve->sParams.sNone; + + g->fT = x0; + g->fK = (y1 - y0) / (x1 - x0); + g->fB = y0; + break; + } + } + } + + void ADSREnvelope::update_settings() + { + if (!(nFlags & F_RECONFIGURE)) + return; + + // Update time ranges + vCurve[P_ATTACK].fTime = limit_range(vCurve[P_ATTACK].fTime, 0.0f); + if (nFlags & F_USE_HOLD) + { + fHoldTime = limit_range(fHoldTime, vCurve[P_ATTACK].fTime); + vCurve[P_DECAY].fTime = limit_range(vCurve[P_DECAY].fTime, fHoldTime); + } + else + vCurve[P_DECAY].fTime = limit_range(vCurve[P_DECAY].fTime, vCurve[P_ATTACK].fTime); + + if (nFlags & F_USE_BREAK) + { + vCurve[P_SLOPE].fTime = limit_range(vCurve[P_SLOPE].fTime, vCurve[P_DECAY].fTime); + vCurve[P_RELEASE].fTime = limit_range(vCurve[P_RELEASE].fTime, vCurve[P_SLOPE].fTime); + } + else + vCurve[P_RELEASE].fTime = limit_range(vCurve[P_RELEASE].fTime, vCurve[P_DECAY].fTime); + + // Configure curves + configure_curve( + &vCurve[P_ATTACK], + 0.0f, vCurve[P_ATTACK].fTime, + 0.0f, 1.0f); + const float hold = (nFlags & F_USE_HOLD) ? fHoldTime : vCurve[P_ATTACK].fTime; + const float decay = vCurve[P_DECAY].fTime; + if (nFlags & F_USE_BREAK) + { + configure_curve( + &vCurve[P_DECAY], + hold, decay, + 1.0f, fBreakLevel); + configure_curve( + &vCurve[P_SLOPE], + decay, vCurve[P_SLOPE].fTime, + fBreakLevel, fSustainLevel); + } + else + { + configure_curve( + &vCurve[P_DECAY], + hold, decay, + 1.0f, fSustainLevel); + } + + configure_curve( + &vCurve[P_RELEASE], + vCurve[P_RELEASE].fTime, 1.0f, + fSustainLevel, 0.0f); + + nFlags &= ~F_RECONFIGURE; + } + + float ADSREnvelope::do_process(float t) + { + if ((t <= 0.0f) || (t >= 1.0f)) + return 0.0f; + + // Attack + const curve_t *cv = &vCurve[P_ATTACK]; + if (t < cv->fTime) + return cv->pGenerator(t, &cv->sParams); + const float hold = (nFlags & F_USE_HOLD) ? fHoldTime : cv->fTime; + + // Hold + if (t < hold) + return 1.0f; + + // Decay + cv = &vCurve[P_DECAY]; + if (t < cv->fTime) + return cv->pGenerator(t, &cv->sParams); + + // Slope + if (nFlags & F_USE_BREAK) + { + cv = &vCurve[P_SLOPE]; + if (t < cv->fTime) + return cv->pGenerator(t, &cv->sParams); + } + + // Sustain and Release + cv = &vCurve[P_RELEASE]; + return (t < cv->fTime) ? fSustainLevel : cv->pGenerator(t, &cv->sParams); + } + + float ADSREnvelope::process(float value) + { + update_settings(); + return do_process(value); + } + + void ADSREnvelope::process(float *dst, const float *src, size_t count) + { + update_settings(); + + for (size_t i=0; isNone; + return (t - none->fT) * none->fK + none->fB; + } + + float ADSREnvelope::line_generator(float t, const gen_params_t *params) + { + const gen_line_t *line = ¶ms->sLine; + return (t < line->fT2) ? + t * line->fK1 + line->fB1 : + t * line->fK2 + line->fB2; + } + + float ADSREnvelope::cubic_generator(float t, const gen_params_t *params) + { + const gen_hermite_t *c = ¶ms->sHermite; + t -= c->fT0; + return ((c->fK[0] * t + c->fK[1]) * t + c->fK[2])*t + c->fK[3]; + } + + float ADSREnvelope::quadro_generator(float t, const gen_params_t *params) + { + const gen_hermite_t *c = ¶ms->sHermite; + t -= c->fT0; + return (((c->fK[0] * t + c->fK[1]) * t + c->fK[2])*t + c->fK[3])*t + c->fK[4]; + } + + float ADSREnvelope::exp_generator(float t, const gen_params_t *params) + { + const gen_exp_t *c = ¶ms->sExp; + t = (t - c->fT0) * c->fB[0] + c->fB[1]; + return c->fA[0] + c->fA[1] * t * expf(t * c->fKT); + } + + void ADSREnvelope::generate(float *dst, float start, float step, size_t count) + { + update_settings(); + + size_t i = 0; + float t = start; + + // Time before attack + for ( ; (t <= 0.0f) && (i < count); t = start + (++i) * step) + dst[i] = 0.0f; + + // Attack segment + const curve_t *cv = &vCurve[P_ATTACK]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = cv->pGenerator(t, &cv->sParams); + + // Hold segment + if (nFlags & F_USE_HOLD) + { + for ( ; (t < fHoldTime) && (i < count); t = start + (++i) * step) + dst[i] = 1.0f; + } + + // Decay segment + cv = &vCurve[P_DECAY]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = cv->pGenerator(t, &cv->sParams); + + // Slope segment + if (nFlags & F_USE_BREAK) + { + cv = &vCurve[P_SLOPE]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = cv->pGenerator(t, &cv->sParams); + } + + // Sustain segment + cv = &vCurve[P_RELEASE]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = fSustainLevel; + + // Release segment + for ( ; (t < 1.0f) && (i < count); t = start + (++i) * step) + dst[i] = cv->pGenerator(t, &cv->sParams); + + // Time after release + for ( ; (i < count); ++i) + dst[i] = 0.0f; + } + + void ADSREnvelope::generate_mul(float *dst, float start, float step, size_t count) + { + update_settings(); + + size_t i = 0; + float t = start; + + // Time before attack + for ( ; (t <= 0.0f) && (i < count); t = start + (++i) * step) + dst[i] = 0.0f; + + // Attack segment + const curve_t *cv = &vCurve[P_ATTACK]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] *= cv->pGenerator(t, &cv->sParams); + + // Hold segment + if (nFlags & F_USE_HOLD) + { + for ( ; (t < fHoldTime) && (i < count); t = start + (++i) * step) + /* nothing */; + } + + // Decay segment + cv = &vCurve[P_DECAY]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] *= cv->pGenerator(t, &cv->sParams); + + // Slope segment + if (nFlags & F_USE_BREAK) + { + cv = &vCurve[P_SLOPE]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] *= cv->pGenerator(t, &cv->sParams); + } + + // Sustain segment + cv = &vCurve[P_RELEASE]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] *= fSustainLevel; + + // Release segment + for ( ; (t < 1.0f) && (i < count); t = start + (++i) * step) + dst[i] *= cv->pGenerator(t, &cv->sParams); + + // Time after release + for ( ; (i < count); ++i) + dst[i] = 0.0f; + } + + void ADSREnvelope::generate_mul(float *dst, const float *src, float start, float step, size_t count) + { + update_settings(); + + size_t i = 0; + float t = start; + + // Time before attack + for ( ; (t <= 0.0f) && (i < count); t = start + (++i) * step) + dst[i] = 0.0f; + + // Attack segment + const curve_t *cv = &vCurve[P_ATTACK]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = src[i] * cv->pGenerator(t, &cv->sParams); + + // Hold segment + if (nFlags & F_USE_HOLD) + { + for ( ; (t < fHoldTime) && (i < count); t = start + (++i) * step) + dst[i] = src[i]; + } + + // Decay segment + cv = &vCurve[P_DECAY]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = src[i] * cv->pGenerator(t, &cv->sParams); + + // Slope segment + if (nFlags & F_USE_BREAK) + { + cv = &vCurve[P_SLOPE]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = src[i] * cv->pGenerator(t, &cv->sParams); + } + + // Sustain segment + cv = &vCurve[P_RELEASE]; + for ( ; (t < cv->fTime) && (i < count); t = start + (++i) * step) + dst[i] = src[i] * fSustainLevel; + + // Release segment + for ( ; (t < 1.0f) && (i < count); t = start + (++i) * step) + dst[i] = src[i] * cv->pGenerator(t, &cv->sParams); + + // Time after release + for ( ; (i < count); ++i) + dst[i] = 0.0f; + } + + void ADSREnvelope::dump(IStateDumper *v) const + { + v->begin_array("vCurve", vCurve, P_TOTAL); + { + for (size_t i=0; ibegin_object(c, sizeof(curve_t)); + + v->write("fTime", c->fTime); + v->write("fCurve", c->fCurve); + v->write("enFunction", c->enFunction); + v->write("pGenerator", c->pGenerator); + + v->begin_object("sParams", &c->sParams, sizeof(gen_params_t)); + { + switch (c->enFunction) + { + case ADSR_LINE: + case ADSR_LINE2: + { + const gen_line_t *g = &c->sParams.sLine; + v->begin_object("sLine", g, sizeof(gen_line_t)); + { + v->write("fT2", g->fT2); + v->write("fK1", g->fK1); + v->write("fB1", g->fB1); + v->write("fK2", g->fK2); + v->write("fB2", g->fB2); + } + v->end_object(); + break; + } + + case ADSR_CUBIC: + case ADSR_QUADRO: + { + const gen_hermite_t *g = &c->sParams.sHermite; + v->begin_object("sHermite", g, sizeof(gen_hermite_t)); + { + v->write("fT0", g->fT0); + v->writev("fK", g->fK, (c->enFunction == ADSR_CUBIC) ? 4 : 5); + } + v->end_object(); + break; + } + + case ADSR_EXP: + { + const gen_exp_t *g = &c->sParams.sExp; + v->begin_object("sExp", g, sizeof(gen_exp_t)); + { + v->write("fT0", g->fT0); + v->write("fKT", g->fKT); + v->writev("fA", g->fA, 2); + v->writev("fB", g->fB, 2); + } + v->end_object(); + break; + } + + default: + case ADSR_NONE: + { + const gen_none_t *g = &c->sParams.sNone; + v->begin_object("sNone", g, sizeof(gen_none_t)); + { + v->write("fT", g->fT); + v->write("fK", g->fK); + v->write("fB", g->fB); + } + v->end_object(); + break; + } + } + } + + v->end_object(); + } + } + v->end_array(); + + v->write("fHoldTime", fHoldTime); + v->write("fBreakLevel", fBreakLevel); + v->write("fSustainLevel", fSustainLevel); + v->write("nFlags", nFlags); + } + + } /* namespace dspu */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/Analyzer.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/Analyzer.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/Analyzer.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/Analyzer.cpp 2025-08-26 18:15:52.713916061 +0000 @@ -468,24 +468,41 @@ namespace lsp return vChannels[channel].vData[idx] * vEnvelope[idx]; } - void Analyzer::get_frequencies(float *frq, uint32_t *idx, float start, float stop, size_t count) + void Analyzer::get_frequencies(float *frq, uint32_t *idx, float start, float stop, size_t count, bool linear) { - size_t fft_size = 1 << nRank; - size_t fft_csize = (fft_size >> 1) + 1; - float scale = float(fft_size) / float(nSampleRate); + const size_t fft_size = 1 << nRank; + const size_t fft_csize = (fft_size >> 1) + 1; + const float scale = float(fft_size) / float(nSampleRate); - // Initialize list of frequencies - float norm = logf(stop/start) / (count - 1); + // Initialize list of frequencies depending on the scale + if (linear) + { + const float norm = (stop - start) / (count - 1); + for (size_t i=0; i fft_csize) + ix = fft_csize; - for (size_t i=0; i fft_csize) - ix = fft_csize; + const float norm = logf(stop/start) / (count - 1); + + for (size_t i=0; i fft_csize) + ix = fft_csize; - frq[i] = f; - idx[i] = uint32_t(ix); + frq[i] = f; + idx[i] = uint32_t(ix); + } } } diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/MeterGraph.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/MeterGraph.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/MeterGraph.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/MeterGraph.cpp 2025-08-26 18:15:52.717916022 +0000 @@ -87,6 +87,11 @@ namespace lsp fCurrent = sample; break; + case MM_PEAK: + if (nCount == 0) + fCurrent = sample; + break; + default: case MM_ABS_MAXIMUM: sample = fabsf(sample); @@ -100,7 +105,7 @@ namespace lsp { // Append current sample to buffer sBuffer.process(fCurrent); - nCount = 0; + nCount = 0; } } @@ -138,6 +143,13 @@ namespace lsp fCurrent = sample; break; } + case MM_PEAK: + { + if (nCount == 0) + fCurrent = s[0]; + break; + } + default: case MM_ABS_MAXIMUM: { @@ -198,6 +210,12 @@ namespace lsp fCurrent = sample; break; } + case MM_PEAK: + { + if (nCount == 0) + fCurrent = s[0] * gain; + break; + } default: case MM_ABS_MAXIMUM: { diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/RingBuffer.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/RingBuffer.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/RingBuffer.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/RingBuffer.cpp 2025-08-26 18:15:52.717916022 +0000 @@ -20,6 +20,7 @@ */ #include +#include #include #include @@ -117,6 +118,15 @@ namespace lsp return pData[index]; } + float RingBuffer::lerp_get(float offset) + { + const ssize_t off = offset; + const float s1 = get(off); + const float s2 = get(off + 1); + + return lerp(s1, s2, offset - float(off)); + } + size_t RingBuffer::tail_offset(size_t offset) const { return (offset < nCapacity) ? diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/ScaledMeterGraph.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/ScaledMeterGraph.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/ScaledMeterGraph.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/ScaledMeterGraph.cpp 2025-08-26 18:15:52.717916022 +0000 @@ -121,6 +121,11 @@ namespace lsp sampler->fCurrent = sample; break; + case MM_PEAK: + if (sampler->nCount == 0) + sampler->fCurrent = sample; + break; + default: case MM_ABS_MAXIMUM: sample = fabsf(sample); @@ -171,6 +176,12 @@ namespace lsp sampler->fCurrent = sample; break; } + case MM_PEAK: + { + if (sampler->nCount == 0) + sampler->fCurrent = src[offset]; + break; + } default: case MM_ABS_MAXIMUM: { @@ -207,29 +218,35 @@ namespace lsp { case MM_SIGN_MINIMUM: { - const float sample = dsp::sign_min(&src[offset], to_process); + const float sample = dsp::sign_min(&src[offset], to_process) * gain; if ((sampler->nCount == 0) || (fabsf(sampler->fCurrent) > fabsf(sample))) sampler->fCurrent = sample; break; } case MM_SIGN_MAXIMUM: { - const float sample = dsp::sign_max(&src[offset], to_process); + const float sample = dsp::sign_max(&src[offset], to_process) * gain; if ((sampler->nCount == 0) || (fabsf(sampler->fCurrent) < fabsf(sample))) sampler->fCurrent = sample; break; } case MM_ABS_MINIMUM: { - const float sample = dsp::abs_min(&src[offset], to_process); + const float sample = dsp::abs_min(&src[offset], to_process) * gain; if ((sampler->nCount == 0) || (sampler->fCurrent > sample)) sampler->fCurrent = sample; break; } + case MM_PEAK: + { + if (sampler->nCount == 0) + sampler->fCurrent = src[offset] * gain; + break; + } default: case MM_ABS_MAXIMUM: { - const float sample = dsp::abs_max(&src[offset], to_process); + const float sample = dsp::abs_max(&src[offset], to_process) * gain; if ((sampler->nCount == 0) || (sampler->fCurrent < sample)) sampler->fCurrent = sample; break; diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/Sidechain.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/Sidechain.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/Sidechain.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/Sidechain.cpp 2025-08-26 18:15:52.717916022 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins * Created on: 14 сент. 2016 г. @@ -140,7 +140,7 @@ namespace lsp pPreEq->reset(); } - nFlags = 0; + nFlags &= ~(SCF_UPDATE | SCF_CLEAR); } void Sidechain::refresh_processing() diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/main/util/SpectralProcessor.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/SpectralProcessor.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/main/util/SpectralProcessor.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/main/util/SpectralProcessor.cpp 2025-08-26 18:15:52.717916022 +0000 @@ -197,6 +197,12 @@ namespace lsp } } + void SpectralProcessor::reset() + { + size_t buf_size = 1 << nRank; + dsp::fill_zero(pOutBuf, buf_size*2); + } + void SpectralProcessor::dump(IStateDumper *v) const { v->write("nRank", nRank); diff -pruN 1.2.21-5/modules/lsp-dsp-units/src/test/utest/3d/scene_load.cpp 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/test/utest/3d/scene_load.cpp --- 1.2.21-5/modules/lsp-dsp-units/src/test/utest/3d/scene_load.cpp 2025-03-01 12:43:01.000623128 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-dsp-units/src/test/utest/3d/scene_load.cpp 2025-08-26 18:15:52.717916022 +0000 @@ -21,7 +21,7 @@ #include #include -#include +#include UTEST_BEGIN("dspu.3d", scene_load) @@ -49,8 +49,8 @@ UTEST_BEGIN("dspu.3d", scene_load) "vn 0 0 1\n" "f 5//2 6//2 7//2 8//2\n"; - io::InStringSequence is; - UTEST_ASSERT(is.wrap(data, "UTF-8") == STATUS_OK); + io::InMemoryStream is; + is.wrap(data, strlen(data)); UTEST_ASSERT(s.load(&is, WRAP_CLOSE) == STATUS_OK); // Validate scene diff -pruN 1.2.21-5/modules/lsp-lltl-lib/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-lltl-lib/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-lltl-lib/.github/workflows/build.yml 2025-03-01 12:42:54.888659816 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-lltl-lib/.github/workflows/build.yml 2025-08-26 18:15:40.826031437 +0000 @@ -97,7 +97,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 @@ -119,7 +119,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ libstdc++-devel clang + run: zypper --non-interactive --no-gpg-checks in tar gzip git make valgrind gcc gcc-c++ glibc-locale glibc-gconv-modules-extra libstdc++-devel clang - uses: actions/checkout@v3 - name: Configure project run: make config TEST=1 STRICT=1 CC=clang CXX=clang++ @@ -188,3 +188,25 @@ jobs: - name: Run unit tests shell: msys2 {0} run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test.exe utest --verbose --jobs 1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config TEST=1 STRICT=1 DEBUG=1 ASAN=1 + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 + - name: Run unit tests + run: .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 + - name: Run unit tests with memcheck + run: | + for test in $(.build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --list --suppress); do \ + echo "***** MEMCHECK $test *****"; \ + .build/target/${{env.ARTIFACT}}/${{env.ARTIFACT}}-test utest --verbose --jobs 1 --nofork --debug $test; \ + done diff -pruN 1.2.21-5/modules/lsp-lltl-lib/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-lltl-lib/CHANGELOG --- 1.2.21-5/modules/lsp-lltl-lib/CHANGELOG 2025-03-01 12:42:54.888659816 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-lltl-lib/CHANGELOG 2025-08-26 18:15:40.826031437 +0000 @@ -2,6 +2,14 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.26 === +* Added MacOS CI builds. +* Updated module versions in dependencies. + +=== 1.0.25 === +* Updated build scripts. +* Updated module versions in dependencies. + === 1.0.24 === * Added definition of MacOS dependencies in build scripts. * Updated module versions in dependencies. diff -pruN 1.2.21-5/modules/lsp-lltl-lib/include/lsp-plug.in/lltl/version.h 1.2.23-0ubuntu1/modules/lsp-lltl-lib/include/lsp-plug.in/lltl/version.h --- 1.2.21-5/modules/lsp-lltl-lib/include/lsp-plug.in/lltl/version.h 2025-03-01 12:42:54.892659791 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-lltl-lib/include/lsp-plug.in/lltl/version.h 2025-08-26 18:15:40.830031398 +0000 @@ -24,7 +24,7 @@ #define LSP_LLTL_LIB_MAJOR 1 #define LSP_LLTL_LIB_MINOR 0 -#define LSP_LLTL_LIB_MICRO 24 +#define LSP_LLTL_LIB_MICRO 26 #if defined(LSP_LLTL_LIB_PUBLISHER) #define LSP_LLTL_LIB_PUBLIC LSP_EXPORT_MODIFIER diff -pruN 1.2.21-5/modules/lsp-lltl-lib/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-lltl-lib/make/tools.mk --- 1.2.21-5/modules/lsp-lltl-lib/make/tools.mk 2025-03-01 12:42:54.892659791 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-lltl-lib/make/tools.mk 2025-08-26 18:15:40.830031398 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-lltl-lib/modules.mk 1.2.23-0ubuntu1/modules/lsp-lltl-lib/modules.mk --- 1.2.21-5/modules/lsp-lltl-lib/modules.mk 2025-03-01 12:42:54.892659791 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-lltl-lib/modules.mk 2025-08-26 18:15:40.830031398 +0000 @@ -20,13 +20,13 @@ #------------------------------------------------------------------------------ # Variables that describe source code dependencies -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git diff -pruN 1.2.21-5/modules/lsp-lltl-lib/project.mk 1.2.23-0ubuntu1/modules/lsp-lltl-lib/project.mk --- 1.2.21-5/modules/lsp-lltl-lib/project.mk 2025-03-01 12:42:54.892659791 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-lltl-lib/project.mk 2025-08-26 18:15:40.830031398 +0000 @@ -23,4 +23,4 @@ ARTIFACT_ID = LSP_LLTL_L ARTIFACT_NAME = lsp-lltl-lib ARTIFACT_DESC = Low-Level Template Library for C++ ARTIFACT_HEADERS = lsp-plug.in -ARTIFACT_VERSION = 1.0.24 +ARTIFACT_VERSION = 1.0.26 diff -pruN 1.2.21-5/modules/lsp-plugin-fw/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-plugin-fw/CHANGELOG --- 1.2.21-5/modules/lsp-plugin-fw/CHANGELOG 2025-03-01 12:42:57.428644568 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/CHANGELOG 2025-08-26 18:15:48.065961171 +0000 @@ -2,6 +2,29 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.31 === +* Added command line option for JACK that allows to specify client name. +* Implemented preset management in the UI of the plugin. +* Added Steinberg::Linux::IEventHandler support for better integration with + the editorhost from the Steinberg SDK. +* Changed VST3 chunk format incompatible with previous plugin versions. +* Added possibility to automatically play samples when navigating file list. +* Added ctl::Controller class that is a base controller class for UI settings. +* Implemented ctl:link controller that allows to link values together in the UI. +* Implemented ctl::AudioEnvelope controller. +* Implemented pre-compression of OBJ files before adding to built-in resources. +* Updated module versions in dependencies. + +=== 1.0.30 === +* Refactored support of activity property. +* Added possibility to launch standalone plugins in minimized window state. +* Added support of inactive backround color, brightness and backround brightness. +* Fixed broken transport (tempo BPM) synchronization for CLAP plugin format. +* Fixed regression related to creating new global configuration file. +* Added basic Overlay support. +* Added MacOS dependencies. +* Updated module versions in dependencies. + === 1.0.29 === * Added workaround for Renoise host related to latency reporting by VST2 and VST3 plugins on state load. diff -pruN 1.2.21-5/modules/lsp-plugin-fw/dependencies.mk 1.2.23-0ubuntu1/modules/lsp-plugin-fw/dependencies.mk --- 1.2.21-5/modules/lsp-plugin-fw/dependencies.mk 2025-03-01 12:42:57.428644568 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/dependencies.mk 2025-08-26 18:15:48.065961171 +0000 @@ -804,6 +804,167 @@ DEPENDENCIES = \ $(DEPENDENCIES_VST3_UI) #------------------------------------------------------------------------------ +# Windows-specific dependencies +MACOS_DEPENDENCIES_COMMON = \ + LIBICONV + +MACOS_DEPENDENCIES_COMMON_UI = \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBCOCOA \ + LIBCAIRO + +MACOS_DEPENDENCIES_BIN = + +MACOS_DEPENDENCIES_UI_BIN = + +MACOS_TEST_DEPENDENCIES = + +MACOS_TEST_DEPENDENCIES_UI = + +# CLAP dependencies +MACOS_DEPENDENCIES_CLAP = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION + +MACOS_DEPENDENCIES_CLAP_UI = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION + +MACOS_DEPENDENCIES_CLAP_BIN = + +MACOS_DEPENDENCIES_CLAP_UI_BIN = + +# GStreamer dependencies +MACOS_DEPENDENCIES_GST = + +MACOS_DEPENDENCIES_GST_WRAP = + +MACOS_DEPENDENCIES_GST_BIN = + +# Jack dependencies +MACOS_DEPENDENCIES_JACK = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION \ + LIBJACK + +MACOS_DEPENDENCIES_JACK_UI = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION \ + LIBJACK + +MACOS_DEPENDENCIES_JACK_WRAP = + +MACOS_DEPENDENCIES_JACK_BIN = + +MACOS_DEPENDENCIES_JACK_UI_BIN = + +# LADSPA dependencies +MACOS_DEPENDENCIES_LADSPA = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION + +MACOS_DEPENDENCIES_LADSPA_BIN = + +# LV2 dependencies +MACOS_DEPENDENCIES_LV2 = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION \ + LIBCAIRO + +MACOS_DEPENDENCIES_LV2_UI = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBCOCOA \ + LIBCAIRO + +MACOS_DEPENDENCIES_LV2_BIN = + +MACOS_DEPENDENCIES_LV2_UI_BIN = + +# VST2 dependencies +MACOS_DEPENDENCIES_VST2 = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION + +MACOS_DEPENDENCIES_VST2_UI = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION + +MACOS_DEPENDENCIES_VST2_WRAP = + +MACOS_DEPENDENCIES_VST2_BIN = + +MACOS_DEPENDENCIES_VST2_UI_BIN = + +# VST3 dependencies +MACOS_DEPENDENCIES_VST3 = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBCOCOA \ + LIBCAIRO + +MACOS_DEPENDENCIES_VST3_UI = \ + LIBAUDIOTOOLBOX \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBCOCOA \ + LIBCAIRO + +MACOS_DEPENDENCIES_VST3_BIN = + +MACOS_DEPENDENCIES_VST3_UIBIN = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES_COMMON += $(MACOS_DEPENDENCIES_COMMON) + DEPENDENCIES_COMMON_UI += $(MACOS_DEPENDENCIES_COMMON_UI) + DEPENDENCIES_BIN += $(MACOS_DEPENDENCIES_BIN) + DEPENDENCIES_UI_BIN += $(MACOS_DEPENDENCIES_UI_BIN) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) + TEST_DEPENDENCIES_UI += $(MACOS_TEST_DEPENDENCIES_UI) + + DEPENDENCIES_CLAP += $(MACOS_DEPENDENCIES_CLAP) + DEPENDENCIES_CLAP_UI += $(MACOS_DEPENDENCIES_CLAP_UI) + DEPENDENCIES_CLAP_BIN += $(MACOS_DEPENDENCIES_CLAP_BIN) + DEPENDENCIES_CLAP_UI_BIN += $(MACOS_DEPENDENCIES_CLAP_UI_BIN) + + DEPENDENCIES_GST += $(MACOS_DEPENDENCIES_GST) + DEPENDENCIES_GST_WRAP += $(MACOS_DEPENDENCIES_GST_WRAP) + DEPENDENCIES_GST_BIN += $(MACOS_DEPENDENCIES_GST_BIN) + + DEPENDENCIES_JACK += $(MACOS_DEPENDENCIES_JACK) + DEPENDENCIES_JACK_UI += $(MACOS_DEPENDENCIES_JACK_UI) + DEPENDENCIES_JACK_WRAP += $(MACOS_DEPENDENCIES_JACK_WRAP) + DEPENDENCIES_JACK_BIN += $(MACOS_DEPENDENCIES_JACK_BIN) + DEPENDENCIES_JACK_UI_BIN += $(MACOS_DEPENDENCIES_JACK_UI_BIN) + + DEPENDENCIES_LADSPA += $(MACOS_DEPENDENCIES_LADSPA) + DEPENDENCIES_LADSPA_BIN += $(MACOS_DEPENDENCIES_LADSPA_BIN) + + DEPENDENCIES_LV2 += $(MACOS_DEPENDENCIES_LV2) + DEPENDENCIES_LV2_UI += $(MACOS_DEPENDENCIES_LV2_UI) + DEPENDENCIES_LV2_BIN += $(MACOS_DEPENDENCIES_LV2_BIN) + DEPENDENCIES_LV2_UI_BIN += $(MACOS_DEPENDENCIES_LV2_UI_BIN) + + DEPENDENCIES_VST2 += $(MACOS_DEPENDENCIES_VST2) + DEPENDENCIES_VST2_UI += $(MACOS_DEPENDENCIES_VST2_UI) + DEPENDENCIES_VST2_WRAP += $(MACOS_DEPENDENCIES_VST2_WRAP) + DEPENDENCIES_VST2_BIN += $(MACOS_DEPENDENCIES_VST2_BIN) + DEPENDENCIES_VST2_UI_BIN += $(MACOS_DEPENDENCIES_VST2_UI_BIN) + + DEPENDENCIES_VST3 += $(MACOS_DEPENDENCIES_VST3) + DEPENDENCIES_VST3_UI += $(MACOS_DEPENDENCIES_VST3_UI) + DEPENDENCIES_VST3_BIN += $(MACOS_DEPENDENCIES_VST3_BIN) + DEPENDENCIES_VST3_UI_BIN += $(MACOS_DEPENDENCIES_VST3_UI_BIN) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES_PLUGINS) \ @@ -939,5 +1100,37 @@ ALL_DEPENDENCIES = \ $(WINDOWS_DEPENDENCIES_VST3) \ $(WINDOWS_DEPENDENCIES_VST3_UI) \ $(WINDOWS_DEPENDENCIES_VST3_BIN) \ - $(WINDOWS_DEPENDENCIES_VST3_UI_BIN) - + $(WINDOWS_DEPENDENCIES_VST3_UI_BIN) \ + \ + $(MACOS_DEPENDENCIES_COMMON) \ + $(MACOS_DEPENDENCIES_COMMON_UI) \ + $(MACOS_DEPENDENCIES_BIN) \ + $(MACOS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES_UI) \ + $(MACOS_DEPENDENCIES_CLAP) \ + $(MACOS_DEPENDENCIES_CLAP_UI) \ + $(MACOS_DEPENDENCIES_CLAP_BIN) \ + $(MACOS_DEPENDENCIES_CLAP_UI_BIN) \ + $(MACOS_DEPENDENCIES_GST) \ + $(MACOS_DEPENDENCIES_GST_WRAP) \ + $(MACOS_DEPENDENCIES_GST_BIN) \ + $(MACOS_DEPENDENCIES_JACK) \ + $(MACOS_DEPENDENCIES_JACK_UI) \ + $(MACOS_DEPENDENCIES_JACK_WRAP) \ + $(MACOS_DEPENDENCIES_JACK_BIN) \ + $(MACOS_DEPENDENCIES_JACK_UI_BIN) \ + $(MACOS_DEPENDENCIES_LADSPA) \ + $(MACOS_DEPENDENCIES_LADSPA_BIN) \ + $(MACOS_DEPENDENCIES_LV2) \ + $(MACOS_DEPENDENCIES_LV2_UI) \ + $(MACOS_DEPENDENCIES_LV2TTL_GEN) \ + $(MACOS_DEPENDENCIES_LV2_BIN) \ + $(MACOS_DEPENDENCIES_LV2_UI_BIN) \ + $(MACOS_DEPENDENCIES_VST2) \ + $(MACOS_DEPENDENCIES_VST2_UI) \ + $(MACOS_DEPENDENCIES_VST2_BIN) \ + $(MACOS_DEPENDENCIES_VST2_UI_BIN) \ + $(MACOS_DEPENDENCIES_VST3) \ + $(MACOS_DEPENDENCIES_VST3_UI) \ + $(MACOS_DEPENDENCIES_VST3_BIN) \ + $(MACOS_DEPENDENCIES_VST3_UI_BIN) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/core/presets.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/core/presets.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/core/presets.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/core/presets.h 2025-08-26 18:15:48.065961171 +0000 @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2024 Linux Studio Plugins Project + * (C) 2024 Vladimir Sadovnikov + * + * This file is part of lsp-pluginfw + * Created on: 2 апр. 2024 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CORE_PRESETS_H_ +#define LSP_PLUG_IN_PLUG_FW_CORE_PRESETS_H_ + +#include + +#include +#include + +namespace lsp +{ + namespace core + { + static constexpr size_t PRESET_NAME_BYTES = 0x200; + + enum preset_flags_t + { + PRESET_FLAG_NONE = 0, + PRESET_FLAG_USER = 1 << 0, // User-defined preset + PRESET_FLAG_DIRTY = 1 << 1 + }; + + typedef struct preset_state_t + { + uint32_t flags; // Current preset flags + uint32_t tab; // Current preset tab + char name[PRESET_NAME_BYTES]; // UTF-8 name of current preset + } preset_state_t; + + /** + * Scan resources directory for presets + * @param presets target collection to store data + * @param loader resource loader + * @param location directory to look for + * @return status of operation + */ + status_t scan_presets(lltl::darray *presets, resource::ILoader *loader, const char *location); + + /** + * Sort presets + * @param presets presets to sort + * @param ascending sort order + */ + void sort_presets(lltl::darray *presets, bool ascending); + + /** + * Initialize preset state with default values + * @param state preset state + */ + void init_preset_state(preset_state_t *state); + + /** + * Copy preset state + * @param dst destination state to store value + * @param src source state to read value + */ + void copy_preset_state(preset_state_t *dst, const preset_state_t *src); + + } /* namespace core */ +} /* namespace lsp */ + + +#endif /* LSP_PLUG_IN_PLUG_FW_CORE_PRESETS_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Controller.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Controller.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Controller.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Controller.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 24 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_CONTROLLER_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_CONTROLLER_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include + +#include + +namespace lsp +{ + namespace ui + { + class UIContext; + } /* namespace ui */ + + namespace ctl + { + class Expression; + + /** + * Controller + */ + class Controller: public ui::IPortListener + { + public: + static const ctl_class_t metadata; + + protected: + const ctl_class_t *pClass; + ui::IWrapper *pWrapper; + + protected: + static bool set_expr(ctl::Expression *expr, const char *param, const char *name, const char *value); + static bool set_value(bool *v, const char *param, const char *name, const char *value); + static bool set_value(ssize_t *v, const char *param, const char *name, const char *value); + static bool set_value(size_t *v, const char *param, const char *name, const char *value); + static bool set_value(float *v, const char *param, const char *name, const char *value); + static bool set_value(LSPString *v, const char *param, const char *name, const char *value); + + bool bind_port(ui::IPort **port, const char *param, const char *name, const char *value); + bool link_port(ui::IPort **port, const char *id); + + public: + explicit Controller(ui::IWrapper *wrapper); + Controller(const Controller &) = delete; + Controller(Controller &&) = delete; + virtual ~Controller(); + + Controller & operator = (const Controller &) = delete; + Controller & operator = (Controller &&) = delete; + + /** Initialize widget controller + * + */ + virtual status_t init(); + + /** Destroy widget controller + * + */ + virtual void destroy(); + + public: + /** Get pointer to self as pointer to ctl::Widget class + * + * @return pointer to self + */ + inline ctl::Controller *self() { return this; } + + //--------------------------------------------------------------------------------- + // Metadata, casting and type information + public: + /** Get widget controller class + * + * @return actual widget controller class metadata + */ + inline const ctl_class_t *get_class() const { return pClass; } + + /** Check wheter the widget is instance of some class + * + * @param wclass widget class + * @return true if widget is instance of some class + */ + bool instance_of(const ctl_class_t *wclass) const; + inline bool instance_of(const ctl_class_t &wclass) const { return instance_of(&wclass); } + + /** Another way to check if widget is instance of some class + * + * @return true if widget is instance of some class + */ + template + inline bool instance_of() const { return instance_of(&Target::metadata); }; + + /** Cast widget to another type + * + * @return pointer to widget or NULL if cast failed + */ + template + inline Target *cast() { return instance_of(&Target::metadata) ? static_cast(this) : NULL; } + + /** Cast widget to another type + * + * @return pointer to widget or NULL if cast failed + */ + template + inline const Target *cast() const { return instance_of(&Target::metadata) ? static_cast(this) : NULL; } + }; + + template + inline Target *ctl_cast(ctl::Controller *src) + { + return ((src != NULL) && (src->instance_of(&Target::metadata))) ? static_cast(src) : NULL; + } + + template + inline const Target *ctl_cast(const ctl::Controller *src) + { + return ((src != NULL) && (src->instance_of(&Target::metadata))) ? static_cast(src) : NULL; + } + + template + inline Target *ctl_ptrcast(void *src) + { + ctl::Controller *ctl = (src != NULL) ? static_cast(src) : NULL; + return ((ctl != NULL) && (ctl->instance_of(&Target::metadata))) ? static_cast(ctl) : NULL; + } + + template + inline const Target *ctl_ptrcast(const void *src) + { + const ctl::Controller *ctl = (src != NULL) ? static_cast(src) : NULL; + return ((ctl != NULL) && (ctl->instance_of(&Target::metadata))) ? static_cast(ctl) : NULL; + } + + } /* namespace ctl */ +} /* namespace lsp */ + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_CONTROLLER_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/DOMController.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/DOMController.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/DOMController.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/DOMController.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 24 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_DOMCONTROLLER_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_DOMCONTROLLER_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include + +#include + +namespace lsp +{ + namespace ctl + { + /** + * DOM Controller + */ + class DOMController: public Controller + { + public: + static const ctl_class_t metadata; + + public: + explicit DOMController(ui::IWrapper *wrapper); + DOMController(const DOMController &) = delete; + DOMController(DOMController &&) = delete; + virtual ~DOMController() override; + + DOMController & operator = (const DOMController &) = delete; + DOMController & operator = (DOMController &&) = delete; + + public: + /** Set attribute to controller + * + * @param ctx context + * @param name attribute name + * @param value attribute value + */ + virtual void set(ui::UIContext *ctx, const char *name, const char *value); + + /** Begin configuration of controller + * + */ + virtual void begin(ui::UIContext *ctx); + + /** End configuration of controller + * + */ + virtual void end(ui::UIContext *ctx); + }; + + } /* namespace ctl */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_DOMCONTROLLER_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Factory.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Factory.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Factory.h 2025-03-01 12:42:57.428644568 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Factory.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 апр. 2021 г. @@ -72,7 +72,7 @@ namespace lsp * @param name name of the node * @return status of operation, STATUS_NOT_FOUND if there is no supported node for this factory */ - virtual status_t create(Widget **ctl, ui::UIContext *context, const LSPString *name); + virtual status_t create(Controller **ctl, ui::UIContext *context, const LSPString *name); }; #define CTL_FACTORY_IMPL_START(fname) \ @@ -83,7 +83,7 @@ namespace lsp virtual ~fname ## Factory() {} \ \ public: \ - virtual status_t create(Widget **ctl, ui::UIContext *context, const LSPString *name) \ + virtual status_t create(Controller **ctl, ui::UIContext *context, const LSPString *name) \ { #define CTL_FACTORY_IMPL_END(fname) \ @@ -91,7 +91,8 @@ namespace lsp }; \ \ static fname ## Factory fname ## FactoryInstance; /* Variable */ - } -} + + } /* namespace lsp */ +} /* namespace ctl */ #endif /* LSP_PLUG_IN_PLUG_FW_CTL_FACTORY_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PluginWindow.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PluginWindow.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PluginWindow.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PluginWindow.h 2025-08-26 18:15:48.069961132 +0000 @@ -34,10 +34,12 @@ namespace lsp { namespace ctl { + class PresetsWindow; + /** * The plugin's window controller */ - class PluginWindow: public ctl::Window + class PluginWindow: public ctl::Window, public ui::IPresetListener { public: static const ctl_class_t metadata; @@ -106,37 +108,21 @@ namespace lsp tk::MenuItem *wItem; } ui_flag_t; - class ConfigSink: public tk::TextDataSink - { - private: - ui::IWrapper *pWrapper; - - public: - explicit ConfigSink(ui::IWrapper *wrapper); - - public: - void unbind(); - - public: - virtual status_t receive(const LSPString *text, const char *mime); - }; - protected: bool bResizable; ctl::Window *pUserPaths; // User paths controller + ctl::PresetsWindow *pPresetsWindow; // Presets window tk::WidgetContainer *wContent; // The main box containing all widgets tk::Window *wGreeting; // Greeting message window tk::Window *wAbout; // About message window tk::Window *wUserPaths; // User paths configuration tk::Menu *wMenu; // Menu + tk::Menu *wPresets; // Presets menu tk::Menu *wUIScaling; // UI Scaling menu tk::Menu *wBundleScaling; // Bundle Scaling menu tk::Menu *wFontScaling; // UI Scaling menu - tk::Menu *wResetSettings; // Reset settings menu - tk::FileDialog *wExport; // Export settings dialog - tk::FileDialog *wImport; // Import settings dialog tk::MenuItem *wPreferHost; // Prefer host menu item tk::CheckBox *wRelPaths; // Relative path checkbox tk::MenuItem *wInvertVScroll; // Global inversion of mouse vertical scroll @@ -146,11 +132,8 @@ namespace lsp ui::IPort *pPVersion; ui::IPort *pPBypass; - ui::IPort *pPath; - ui::IPort *pFileType; ui::IPort *pR3DBackend; ui::IPort *pLanguage; - ui::IPort *pRelPaths; ui::IPort *pUIScaling; ui::IPort *pUIScalingHost; ui::IPort *pUIBundleScaling; @@ -159,8 +142,6 @@ namespace lsp ui::IPort *pInvertVScroll; ui::IPort *pInvertGraphDotVScroll; - ConfigSink *pConfigSink; // Configuration sink - window_scale_t sWndScale; enum_menu_t sFilterPointThickness; @@ -179,6 +160,8 @@ namespace lsp static status_t slot_greeting_close(tk::Widget *sender, void *ptr, void *data); static status_t slot_about_close(tk::Widget *sender, void *ptr, void *data); static status_t slot_show_main_menu(tk::Widget *sender, void *ptr, void *data); + static status_t slot_show_presets_menu(tk::Widget *sender, void *ptr, void *data); + static status_t slot_select_next_preset(tk::Widget *sender, void *ptr, void *data); static status_t slot_show_ui_scaling_menu(tk::Widget *sender, void *ptr, void *data); static status_t slot_show_bundle_scaling_menu(tk::Widget *sender, void *ptr, void *data); static status_t slot_show_font_scaling_menu(tk::Widget *sender, void *ptr, void *data); @@ -186,21 +169,15 @@ namespace lsp static status_t slot_show_plugin_manual(tk::Widget *sender, void *ptr, void *data); static status_t slot_show_ui_manual(tk::Widget *sender, void *ptr, void *data); static status_t slot_show_about(tk::Widget *sender, void *ptr, void *data); + static status_t slot_show_presets_window(tk::Widget *sender, void *ptr, void *data); static status_t slot_export_settings_to_file(tk::Widget *sender, void *ptr, void *data); static status_t slot_export_settings_to_clipboard(tk::Widget *sender, void *ptr, void *data); static status_t slot_import_settings_from_file(tk::Widget *sender, void *ptr, void *data); static status_t slot_import_settings_from_clipboard(tk::Widget *sender, void *ptr, void *data); static status_t slot_reset_settings(tk::Widget *sender, void *ptr, void *data); - static status_t slot_confirm_reset_settings(tk::Widget *sender, void *ptr, void *data); static status_t slot_debug_dump(tk::Widget *sender, void *ptr, void *data); - static status_t slot_call_export_settings_to_file(tk::Widget *sender, void *ptr, void *data); - static status_t slot_call_import_settings_from_file(tk::Widget *sender, void *ptr, void *data); - - static status_t slot_fetch_path(tk::Widget *sender, void *ptr, void *data); - static status_t slot_commit_path(tk::Widget *sender, void *ptr, void *data); - static status_t slot_select_backend(tk::Widget *sender, void *ptr, void *data); static status_t slot_select_language(tk::Widget *sender, void *ptr, void *data); @@ -228,8 +205,6 @@ namespace lsp static status_t slot_scale_mouse_move(tk::Widget *sender, void *ptr, void *data); static status_t slot_scale_mouse_up(tk::Widget *sender, void *ptr, void *data); - static status_t slot_relative_path_changed(tk::Widget *sender, void *ptr, void *data); - static status_t slot_show_user_paths_dialog(tk::Widget *sender, void *ptr, void *data); static status_t slot_user_paths_submit(tk::Widget *sender, void *ptr, void *data); static status_t slot_user_paths_close(tk::Widget *sender, void *ptr, void *data); @@ -245,9 +220,8 @@ namespace lsp protected: static i18n::IDictionary *get_default_dict(tk::Widget *src); - static tk::FileFilters *create_config_filters(tk::FileDialog *dlg); static ssize_t compare_presets(const resource::resource_t *a, const resource::resource_t *b); - void init_enum_menu(enum_menu_t *menu); + void init_enum_menu(enum_menu_t *menu); status_t add_scaling_menu_item( lltl::parray & list, @@ -258,6 +232,7 @@ namespace lsp void do_destroy(); status_t set_greeting_timer(); status_t show_greeting_window(); + status_t show_presets_window(); status_t show_user_paths_window(); status_t fmt_package_version(LSPString &pkgver); status_t locate_window(); @@ -270,6 +245,7 @@ namespace lsp tk::Menu *create_menu(); tk::Menu *create_enum_menu(enum_menu_t *em, tk::Menu *parent, const char *label); status_t create_dialog_window(ctl::Window **ctl, tk::Window **dst, const char *path); + status_t create_presets_window(); status_t init_r3d_support(tk::Menu *menu); status_t init_i18n_support(tk::Menu *menu); @@ -279,10 +255,8 @@ namespace lsp status_t init_visual_schema_support(tk::Menu *menu); status_t init_ui_behaviour(tk::Menu *menu); status_t add_ui_flag(tk::Menu *menu, const char *port, const char *key); - status_t init_presets(tk::Menu *menu); - status_t scan_presets(const char *location, lltl::darray *presets); + status_t init_presets(tk::Menu *menu, bool add_submenu); status_t create_main_menu(); - status_t create_reset_settings_menu(); void sync_ui_scaling(); bool has_path_ports(); void sync_language_selection(); @@ -300,6 +274,9 @@ namespace lsp void commit_bool_param(tk::Boolean *value, const char *port_id); void bind_trigger(const char *uid, tk::slot_t ev, tk::event_handler_t handler); bool open_manual_file(const char *fmt...); + void sync_preset_name(); + + void set_preset_button_text(const char *text); status_t init_context(ui::UIContext *ctx); @@ -327,8 +304,13 @@ namespace lsp status_t show_plugin_manual(); status_t show_ui_manual(); void host_scaling_changed(); + status_t post_init(); - public: + public: // ui::IPresetListener + virtual void preset_activated(const ui::preset_t *preset) override; + virtual void presets_updated() override; + + public: // ctl::DOMController virtual void begin(ui::UIContext *ctx) override; virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; virtual status_t add(ui::UIContext *ctx, ctl::Widget *child) override; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PresetsWindow.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PresetsWindow.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PresetsWindow.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/PresetsWindow.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 31 мар. 2024 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_PRESETSWINDOW_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_PRESETSWINDOW_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace ctl + { + class PluginWindow; + class SavePresetDialog; + + /** + * The plugin's window controller + */ + class PresetsWindow: public ctl::Window, public ui::IPresetListener + { + public: + static const ctl_class_t metadata; + + protected: + enum button_t + { + BTN_SAVE, + BTN_FAVOURITE, + BTN_DELETE, + + BTN_TOTAL + }; + + typedef struct preset_list_t + { + tk::ListBox *wList; + lltl::parray vPresets; + lltl::parray vItems; + } preset_list_t; + + class ConfigSink: public tk::TextDataSink + { + private: + ui::IWrapper *pWrapper; + + public: + explicit ConfigSink(ui::IWrapper *wrapper); + + public: + void unbind(); + + public: + virtual status_t receive(const LSPString *text, const char *mime); + }; + + protected: + PluginWindow *pPluginWindow; // Plugin window + SavePresetDialog *pSavePresetDlg; // Preset saving dialog + tk::Widget *wLastActor; // Last actor + tk::FileDialog *wExport; // Export settings dialog + tk::FileDialog *wImport; // Import settings dialog + tk::CheckBox *wRelPaths; // Relative path checkbox + tk::Edit *wPresetPattern; // Preset pattern + tk::Button *vButtons[BTN_TOTAL]; // Preset management buttons + tk::MessageBox *wWConfirm; // Confirmation message box + tk::MessageBox *wRstConfirm; // Reset confirmation message box + tk::MessageBox *wRemoveConfirm; // Remove preset confirmation message box + tk::TabControl *wPresetTabs; // Preset category tabs + bool bWasVisible; // Visibility flag + + preset_list_t vPresetsLists[ui::PRESET_TAB_TOTAL]; + ConfigSink *pConfigSink; // Configuration sink + + const ui::preset_t *pNewPreset; // New preset pointer + + ui::IPort *pPath; // Location of user's export/import directory + ui::IPort *pFileType; // Import/export configuration file type selection + ui::IPort *pRelPaths; // Relative paths configuration option + + + protected: + // Slots + static status_t slot_window_close(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_save_submit(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_favourite_submit(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_remove_click(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_select(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_dbl_click(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_tab_selected(tk::Widget *sender, void *ptr, void *data); + + static status_t slot_refresh_preset_list(tk::Widget *sender, void *ptr, void *data); + static status_t slot_reset_settings(tk::Widget *sender, void *ptr, void *data); + static status_t slot_import_settings_from_clipboard(tk::Widget *sender, void *ptr, void *data); + static status_t slot_export_settings_to_clipboard(tk::Widget *sender, void *ptr, void *data); + static status_t slot_submit_import_settings(tk::Widget *sender, void *ptr, void *data); + static status_t slot_submit_export_settings(tk::Widget *sender, void *ptr, void *data); + static status_t slot_create_preset_window_closed(tk::Widget *sender, void *ptr, void *data); + + static status_t slot_fetch_path(tk::Widget *sender, void *ptr, void *data); + static status_t slot_commit_path(tk::Widget *sender, void *ptr, void *data); + + static status_t slot_exec_export_settings_to_file(tk::Widget *sender, void *ptr, void *data); + static status_t slot_exec_import_settings_from_file(tk::Widget *sender, void *ptr, void *data); + static status_t slot_relative_path_changed(tk::Widget *sender, void *ptr, void *data); + static status_t slot_preset_filter_changed(tk::Widget *sender, void *ptr, void *data); + + static status_t slot_accept_preset_selection(tk::Widget *sender, void *ptr, void *data); + static status_t slot_reject_preset_selection(tk::Widget *sender, void *ptr, void *data); + + static status_t slot_accept_reset_state(tk::Widget *sender, void *ptr, void *data); + static status_t slot_reject_reset_state(tk::Widget *sender, void *ptr, void *data); + + static status_t slot_accept_remove_preset(tk::Widget *sender, void *ptr, void *data); + static status_t slot_reject_remove_preset(tk::Widget *sender, void *ptr, void *data); + + protected: + static void destroy_preset_list(preset_list_t *list); + static inline bool need_indication(size_t i); + + protected: + tk::FileFilters *create_config_filters(tk::FileDialog *dlg); + void make_preset_list(preset_list_t *list, const ui::preset_t *presets, size_t count, ui::preset_filter_t filter, bool indicate); + void sync_preset_button_state(); + void sync_preset_button_state(const ui::preset_t *preset); + void sync_preset_lists(); + void sync_preset_tab(); + void do_destroy(); + void select_active_preset(const ui::preset_t *preset); + bool has_path_ports(); + bool request_change_preset_conrifmation(const ui::preset_t *preset); + bool request_reset_state_confirmation(); + bool request_remove_preset_confirmation(); + const ui::preset_t *current_preset(); + status_t create_save_preset_dialog(); + void sync_preset_name(tk::ListBoxItem *item, const ui::preset_t *preset, bool indicate); + + public: + explicit PresetsWindow(ui::IWrapper *src, tk::Window *widget, PluginWindow *pluginWindow); + PresetsWindow(const PresetsWindow &) = delete; + PresetsWindow(PresetsWindow &&) = delete; + virtual ~PresetsWindow() override; + + PresetsWindow & operator = (const PresetsWindow &) = delete; + PresetsWindow & operator = (PresetsWindow &&) = delete; + + virtual status_t init() override; + virtual void destroy() override; + + public: // ui::IPresetListener + virtual void preset_activated(const ui::preset_t *preset) override; + virtual void preset_deactivated(const ui::preset_t *preset) override; + virtual void presets_updated() override; + + public: + status_t post_init(); + status_t show(tk::Widget *actor); + status_t hide(); + bool visible() const; + status_t toggle_visibility(tk::Widget *actor); + status_t show_export_settings_dialog(); + status_t show_import_settings_dialog(); + status_t import_settings_from_clipboard(); + status_t export_settings_to_clipboard(); + status_t reset_settings(); + void select_next_preset(bool forward); + }; + + + } /* namespace ctl */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_PRESETSWINDOW_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Registry.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Registry.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Registry.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Registry.h 2025-08-26 18:15:48.069961132 +0000 @@ -37,30 +37,31 @@ namespace lsp */ class Registry { - private: - Registry & operator = (const Registry &); - Registry(const Registry &); - protected: - lltl::parray vControllers; // List of registered controllers + lltl::parray vControllers; // List of registered controllers protected: - void do_destroy(); + void do_destroy(); public: explicit Registry(); + Registry(const Registry &) = delete; + Registry(Registry &&) = delete; virtual ~Registry(); - virtual void destroy(); + Registry & operator = (const Registry &) = delete; + Registry & operator = (Registry &&) = delete; + + virtual void destroy(); public: - virtual status_t add(ctl::Widget *w); + virtual status_t add(ctl::Controller *ctl); public: - inline size_t size() const { return vControllers.size(); } - inline Widget *get(size_t index) { return vControllers.get(index); } + inline size_t size() const { return vControllers.size(); } + inline Controller *get(size_t index) { return vControllers.get(index); } }; - } -} + } /* namespace ctl */ +} /* namespace lsp */ #endif /* LSP_PLUG_IN_PLUG_FW_CTL_IREGISTRY_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/SavePresetDialog.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/SavePresetDialog.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/SavePresetDialog.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/SavePresetDialog.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 27 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_SAVEPRESETDIALOG_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_SAVEPRESETDIALOG_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace ctl + { + /** + * The dialog for saving preset + */ + class SavePresetDialog: public ctl::Window, public ui::IPresetListener + { + public: + static const ctl_class_t metadata; + + protected: + tk::Edit *wPresetName; // Preset name + tk::MessageBox *wConfirmation; // Confirmation meesage box + tk::MessageBox *wNotification; // Notification message box + tk::CheckBox *wFavourites; // Add to favourites check box + tk::Button *wSaveButton; // Save button + + protected: + // Slots + static status_t slot_preset_name_change(tk::Widget *sender, void *ptr, void *data); + static status_t slot_save_button_submit(tk::Widget *sender, void *ptr, void *data); + static status_t slot_accept_save_preset(tk::Widget *sender, void *ptr, void *data); + static status_t slot_reject_save_preset(tk::Widget *sender, void *ptr, void *data); + static status_t slot_cancel_save_preset(tk::Widget *sender, void *ptr, void *data); + static status_t slot_close_notification(tk::Widget *sender, void *ptr, void *data); + static status_t slot_favourites_click(tk::Widget *sender, void *ptr, void *data); + + protected: + void sync_save_button_state(); + const ui::preset_t *find_user_preset_by_name(const LSPString *name); + bool request_confirmation(const LSPString *name); + void save_preset(const LSPString *name); + bool show_show_save_error(const LSPString *name, status_t code); + + public: + explicit SavePresetDialog(ui::IWrapper *src, tk::Window *widget); + SavePresetDialog(const SavePresetDialog &) = delete; + SavePresetDialog(SavePresetDialog &&) = delete; + virtual ~SavePresetDialog() override; + + SavePresetDialog & operator = (const SavePresetDialog &) = delete; + SavePresetDialog & operator = (SavePresetDialog &&) = delete; + + virtual status_t init() override; + virtual void destroy() override; + + public: + status_t post_init(); + status_t show(tk::Widget *actor, const LSPString *name, bool favourite); + }; + + + } /* namespace ctl */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_SAVEPRESETDIALOG_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Widget.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Widget.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Widget.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Widget.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 10 апр. 2021 г. @@ -46,7 +46,7 @@ namespace lsp /** * Basic widget controller */ - class Widget: public ui::IPortListener, public ui::ISchemaListener + class Widget: public ctl::DOMController, public ui::ISchemaListener { public: static const ctl_class_t metadata; @@ -64,16 +64,18 @@ namespace lsp }; protected: - const ctl_class_t *pClass; - ui::IWrapper *pWrapper; tk::Widget *wWidget; + ctl::Boolean sActivity; ctl::Color sBgColor; + ctl::Color sInactiveBgColor; ctl::Boolean sBgInherit; ctl::Padding sPadding; ctl::Boolean sVisibility; ctl::Float sBrightness; + ctl::Float sInactiveBrightness; ctl::Float sBgBrightness; + ctl::Float sInactiveBgBrightness; ctl::Enum sPointer; PropListener sProperties; // Properties listener @@ -89,25 +91,17 @@ namespace lsp static bool set_text_layout(tk::TextLayout *l, const char *name, const char *value); static bool set_text_layout(tk::TextLayout *l, const char *param, const char *name, const char *value); static bool set_text_fitness(tk::TextFitness *l, const char *param, const char *name, const char *value); - static bool set_expr(ctl::Expression *expr, const char *param, const char *name, const char *value); static bool set_font(tk::Font *f, const char *param, const char *name, const char *value); static bool set_size_range(tk::SizeRange *r, const char *param, const char *name, const char *value); static bool set_param(tk::Boolean *b, const char *param, const char *name, const char *value); static bool set_param(tk::Integer *i, const char *param, const char *name, const char *value); static bool set_param(tk::Float *f, const char *param, const char *name, const char *value); static bool set_param(tk::Enum *en, const char *param, const char *name, const char *value); - static bool set_embedding(tk::Embedding *e, const char *name, const char *value); static bool set_orientation(tk::Orientation *o, const char *name, const char *value); - static bool set_value(bool *v, const char *param, const char *name, const char *value); - static bool set_value(ssize_t *v, const char *param, const char *name, const char *value); - static bool set_value(size_t *v, const char *param, const char *name, const char *value); - static bool set_value(float *v, const char *param, const char *name, const char *value); - static bool set_value(LSPString *v, const char *param, const char *name, const char *value); + static bool set_embedding(tk::Embedding *e, const char *name, const char *value); protected: void do_destroy(); - bool bind_port(ui::IPort **port, const char *param, const char *name, const char *value); - bool link_port(ui::IPort **port, const char *id); virtual void property_changed(tk::Property *prop); @@ -115,135 +109,44 @@ namespace lsp explicit Widget(ui::IWrapper *wrapper, tk::Widget *widget); Widget(const Widget &) = delete; Widget(Widget &&) = delete; - virtual ~Widget(); + virtual ~Widget() override; Widget &operator = (const Widget &) = delete; Widget &operator = (Widget &&) = delete; - /** Initialize widget controller - * - */ - virtual status_t init(); - - /** Destroy widget controller - * + /** + * Initialize widget controller */ - virtual void destroy(); + virtual status_t init() override; - public: - /** Get widget - * - * @return widget + /** + * Destroy widget controller */ - virtual tk::Widget *widget(); + virtual void destroy() override; + public: // ctl::DOMController /** Set attribute to widget controller * * @param ctx context * @param name attribute name * @param value attribute value */ - virtual void set(ui::UIContext *ctx, const char *name, const char *value); + virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; - /** Begin internal part of controller - * + public: + /** + * Get widget + * @return widget */ - virtual void begin(ui::UIContext *ctx); + virtual tk::Widget *widget(); - /** Add child widget - * + /** + * Add child widget * @param child child widget to add */ virtual status_t add(ui::UIContext *ctx, ctl::Widget *child); - - /** End internal part of controller - * - */ - virtual void end(ui::UIContext *ctx); - - /** Notify controller about one of port bindings has changed - * - * @param port port triggered change - * @param flags port modification flags @see notify_flags_t - */ - virtual void notify(ui::IPort *port, size_t flags); - - /** - * This method is called when the visual schema has been reloaded - */ - virtual void reloaded(const tk::StyleSheet *sheet); - - //--------------------------------------------------------------------------------- - // Metadata, casting and type information - public: - /** Get widget controller class - * - * @return actual widget controller class metadata - */ - inline const ctl_class_t *get_class() const { return pClass; } - - /** Check wheter the widget is instance of some class - * - * @param wclass widget class - * @return true if widget is instance of some class - */ - bool instance_of(const ctl_class_t *wclass) const; - inline bool instance_of(const ctl_class_t &wclass) const { return instance_of(&wclass); } - - /** Another way to check if widget is instance of some class - * - * @return true if widget is instance of some class - */ - template - inline bool instance_of() const { return instance_of(&Target::metadata); }; - - /** Cast widget to another type - * - * @return pointer to widget or NULL if cast failed - */ - template - inline Target *cast() { return instance_of(&Target::metadata) ? static_cast(this) : NULL; } - - /** Cast widget to another type - * - * @return pointer to widget or NULL if cast failed - */ - template - inline const Target *cast() const { return instance_of(&Target::metadata) ? static_cast(this) : NULL; } - - /** Get pointer to self as pointer to ctl::Widget class - * - * @return pointer to self - */ - inline ctl::Widget *self() { return this; } }; - template - inline Target *ctl_cast(ctl::Widget *src) - { - return ((src != NULL) && (src->instance_of(&Target::metadata))) ? static_cast(src) : NULL; - } - - template - inline const Target *ctl_cast(const ctl::Widget *src) - { - return ((src != NULL) && (src->instance_of(&Target::metadata))) ? static_cast(src) : NULL; - } - - template - inline Target *ctl_ptrcast(void *src) - { - ctl::Widget *w = (src != NULL) ? static_cast(src) : NULL; - return ((w != NULL) && (w->instance_of(&Target::metadata))) ? static_cast(w) : NULL; - } - - template - inline const Target *ctl_ptrcast(const void *src) - { - const ctl::Widget *w = (src != NULL) ? static_cast(src) : NULL; - return ((w != NULL) && (w->instance_of(&Target::metadata))) ? static_cast(w) : NULL; - } - } /* namespace ctl */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Window.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Window.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Window.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/Window.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 июн. 2021 г. @@ -43,27 +43,27 @@ namespace lsp tk::Registry sWidgets; ctl::LCString sTitle; + protected: + tk::handler_id_t bind_slot(const char *widget_id, tk::slot_t id, tk::event_handler_t handler); + tk::handler_id_t bind_shortcut(tk::Window *wnd, ws::code_t key, size_t mod, tk::event_handler_t handler); + public: explicit Window(ui::IWrapper *src, tk::Window *window); - virtual ~Window(); + virtual ~Window() override; - virtual status_t init(); - virtual void destroy(); + virtual status_t init() override; + virtual void destroy() override; public: inline ctl::Registry *controllers() { return &sControllers; } inline tk::Registry *widgets() { return &sWidgets; } - public: - virtual void begin(ui::UIContext *ctx); - - virtual void set(ui::UIContext *ctx, const char *name, const char *value); - - virtual status_t add(ui::UIContext *ctx, ctl::Widget *child); - - virtual void end(ui::UIContext *ctx); - - virtual void reloaded(const tk::StyleSheet *sheet); + public: // ctl::DOMController + virtual void begin(ui::UIContext *ctx) override; + virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; + virtual status_t add(ui::UIContext *ctx, ctl::Widget *child) override; + virtual void end(ui::UIContext *ctx) override; + virtual void reloaded(const tk::StyleSheet *sheet) override; }; } /* namespace ctl */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/compound/ComboBox.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/compound/ComboBox.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/compound/ComboBox.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/compound/ComboBox.h 2025-08-26 18:15:48.069961132 +0000 @@ -59,7 +59,6 @@ namespace lsp ctl::Color sInactiveBorderColor; ctl::Color sInactiveBorderGapColor; - ctl::Boolean sActivity; ctl::LCString sEmptyText; lltl::parray vItems; // Custom items diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Align.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Align.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Align.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Align.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 12 мая 2021 г. @@ -43,18 +43,23 @@ namespace lsp static const ctl_class_t metadata; protected: - ctl::Expression sHAlign; - ctl::Expression sVAlign; - ctl::Expression sHScale; - ctl::Expression sVScale; + ctl::Expression sHAlign; + ctl::Expression sVAlign; + ctl::Expression sHScale; + ctl::Expression sVScale; protected: void update_alignment(); public: explicit Align(ui::IWrapper *wrapper, tk::Align *widget); + Align(const Align &) = delete; + Align(Align &&) = delete; virtual ~Align() override; + Align & operator = (const Align &) = delete; + Align & operator = (Align &&) = delete; + virtual status_t init() override; public: diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Overlay.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Overlay.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Overlay.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Overlay.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 3 апр. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_CONTAINERS_OVERLAY_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_CONTAINERS_OVERLAY_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include + + +namespace lsp +{ + namespace ctl + { + /** + * Overlay controller + */ + class Overlay: public Widget + { + public: + static const ctl_class_t metadata; + + protected: + ui::IPort *pPort; // Port that controls the visibility of the widget + LSPString sTriggerWID; // Trigger widget identifier + LSPString sAreaWID; // Area widget identifier + float fHOrigin; // Horizontal origin + float fVOrigin; // Vertial origin + float fHAlign; // Horizontal alignment + float fVAlign; // Vertial alignment + + ctl::Float sTransparency; // Transparency of the overlay + ctl::Integer sPriority; // Drawing priority + ctl::Boolean sAutoClose; // Automatically close flag + ctl::Integer sBorderRadius; // Border radius + ctl::Integer sBorderSize; // Border size + ctl::Color sBorderColor; // Border color + ctl::Padding sIPadding; // Internal padding + + ctl::Expression sHOrigin; // Horizontal relative offset of origin point from left-top position of trigger area + ctl::Expression sVOrigin; // Vertical relative offset of origin point from left-top position of trigger area + ctl::Expression sHAlign; // Horizontal widget alignment relative to the origin point + ctl::Expression sVAlign; // Vertical widget alignment relative to the origin point + + ctl::Expression sLayoutHAlign; // Internal layout horizontal alignment + ctl::Expression sLayoutVAlign; // Internal layout vertical alignment + ctl::Expression sLayoutHScale; // Internal layout horizontal scale + ctl::Expression sLayoutVScale; // Internal layout vertical scale + + protected: + static bool update_float(float & value, ctl::Expression & expr); + static bool calc_position(ws::rectangle_t *rect, tk::Overlay *overlay, void *data); + static bool filter_event(const ws::event_t *ev, tk::Overlay *overlay, void *data); + + static status_t slot_on_hide(tk::Widget *sender, void *ptr, void *data); + + protected: + void update_layout_alignment(); + void update_alignment(); + void on_hide_overlay(); + bool calc_position(ws::rectangle_t *rect, tk::Overlay *overlay); + bool filter_event(const ws::event_t *ev, tk::Overlay *overlay); + bool get_area(ws::rectangle_t *rect, const LSPString *wid); + + public: + explicit Overlay(ui::IWrapper *wrapper, tk::Overlay *widget); + Overlay(const Overlay &) = delete; + Overlay(Overlay &&) = delete; + virtual ~Overlay() override; + + Overlay & operator = (const Overlay &) = delete; + Overlay & operator = (Overlay &&) = delete; + + virtual status_t init() override; + + public: + virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; + virtual status_t add(ui::UIContext *ctx, ctl::Widget *child) override; + virtual void notify(ui::IPort *port, size_t flags) override; + virtual void end(ui::UIContext *ctx) override; + virtual void reloaded(const tk::StyleSheet *sheet) override; + }; + + } /* namespace ctl */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_CONTAINERS_OVERLAY_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Tab.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Tab.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Tab.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/containers/Tab.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 22 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_CONTAINERS_TAB_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_CONTAINERS_TAB_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include + +namespace lsp +{ + namespace ctl + { + /** + * Tab widget controller implementation + */ + class Tab: public Widget + { + public: + static const ctl_class_t metadata; + + protected: + ctl::LCString sText; + + public: + explicit Tab(ui::IWrapper *wrapper, tk::Tab *tab); + Tab(const Tab &) = delete; + Tab(Tab &&) = delete; + virtual ~Tab() override; + + Tab & operator = (const Tab &) = delete; + Tab & operator = (Tab &&) = delete; + + virtual status_t init() override; + + public: + virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; + virtual status_t add(ui::UIContext *ctx, ctl::Widget *child) override; + }; + + } /* namespace ctl */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_CONTAINERS_TAB_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/graph/Axis.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/graph/Axis.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/graph/Axis.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/graph/Axis.h 2025-08-26 18:15:48.069961132 +0000 @@ -47,13 +47,13 @@ namespace lsp ctl::Float sMin; ctl::Float sMax; ctl::Float sZero; + ctl::Boolean sLogScale; ctl::Expression sDx; ctl::Expression sDy; ctl::Expression sAngle; ctl::Expression sLength; ctl::Integer sWidth; ctl::Color sColor; - bool bLogSet; protected: static status_t slot_graph_resize(tk::Widget *sender, void *ptr, void *data); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/headless/PortLink.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/headless/PortLink.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/headless/PortLink.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/headless/PortLink.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 25 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_HEADLESS_PORTLINK_H_ +#define LSP_PLUG_IN_PLUG_FW_CTL_HEADLESS_PORTLINK_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include + +namespace lsp +{ + namespace ctl + { + /** + * Port link: defines the group of ports and dependency between ports in a group + */ + class PortLink: public DOMController, public expr::Resolver + { + public: + static const ctl_class_t metadata; + + protected: + typedef struct binding_t + { + char *pId; // Binding identifier + float fOldValue; // Old value + float fNewValue; // New value + ui::IPort *pPort; // Associated port + ctl::Expression sValue; // Expression for computing the value + } binding_t; + + protected: + lltl::parray vBindings; // List of port bindings + ctl::Expression sActivity; // Activity expression + bool bEnabled; // Enabled flag + bool bChanging; // Changing mode (avoid recursive calls) + + protected: + static void destroy_binding(binding_t *b); + + protected: + binding_t *get_binding(const char *id); + + public: + explicit PortLink(ui::IWrapper *wrapper); + PortLink(const PortLink &) = delete; + PortLink(PortLink &&) = delete; + virtual ~PortLink() override; + + PortLink & operator = (const PortLink &) = delete; + PortLink & operator = (PortLink &&) = delete; + + public: // expr::Resolver + virtual status_t resolve(expr::value_t *value, const char *name, size_t num_indexes, const ssize_t *indexes) override; + virtual status_t resolve(expr::value_t *value, const LSPString *name, size_t num_indexes, const ssize_t *indexes) override; + + public: // ctl::Controller + virtual status_t init() override; + + public: // ctl::DOMController + virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; + virtual void end(ui::UIContext *ctx) override; + + public: // ui::IPortListener + virtual void notify(ui::IPort *port, size_t flags) override; + }; + + } /* namespace ctl */ +} /* namespace lsp */ + + +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_HEADLESS_PORTLINK_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Bevel.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Bevel.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Bevel.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Bevel.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 14 июн. 2021 г. @@ -50,16 +50,20 @@ namespace lsp public: explicit Bevel(ui::IWrapper *wrapper, tk::Bevel *widget); + Bevel(const Bevel &) = delete; + Bevel(Bevel &&) = delete; virtual ~Bevel() override; + Bevel & operator = (const Bevel &) = delete; + Bevel & operator = (Bevel &&) = delete; + virtual status_t init() override; public: virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; }; - } -} - + } /* namespace ctl */ +} /* namespace lsp */ #endif /* LSP_PLUG_IN_PLUG_FW_CTL_SIMPLE_BEVEL_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Button.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Button.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Button.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Button.h 2025-08-26 18:15:48.069961132 +0000 @@ -75,10 +75,10 @@ namespace lsp ctl::Color sHoleColor; ctl::Boolean sEditable; - ctl::Boolean sActivity; ctl::Boolean sHover; ctl::Padding sTextPad; ctl::LCString sText; + ctl::Boolean sTextClip; protected: static status_t slot_change(tk::Widget *sender, void *ptr, void *data); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/CheckBox.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/CheckBox.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/CheckBox.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/CheckBox.h 2025-08-26 18:15:48.069961132 +0000 @@ -48,7 +48,6 @@ namespace lsp ctl::Integer sCheckRadius; ctl::Integer sCheckGapSize; ctl::Integer sCheckMinSize; - ctl::Boolean sActivity; ctl::Color sColor; ctl::Color sFillColor; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Edit.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Edit.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Edit.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Edit.h 2025-08-26 18:15:48.069961132 +0000 @@ -47,7 +47,6 @@ namespace lsp ssize_t nInputDelay; ctl::LCString sEmptyText; - ctl::Boolean sActivity; ctl::Color sColor; ctl::Color sBorderColor; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Fader.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Fader.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Fader.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Fader.h 2025-08-26 18:15:48.069961132 +0000 @@ -66,7 +66,6 @@ namespace lsp ctl::Color sInactiveScaleBorderColor; ctl::Color sInactiveBalanceColor; - ctl::Boolean sActivity; ctl::Expression sMin; ctl::Expression sMax; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Hyperlink.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Hyperlink.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Hyperlink.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Hyperlink.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 12 июн. 2021 г. @@ -42,23 +42,30 @@ namespace lsp static const ctl_class_t metadata; protected: - LCString sText; - LCString sUrl; + LCString sText; + LCString sUrl; - ctl::Color sColor; - ctl::Color sHoverColor; + ctl::Color sColor; + ctl::Color sHoverColor; + ctl::Color sInactiveColor; + ctl::Color sInactiveHoverColor; public: explicit Hyperlink(ui::IWrapper *wrapper, tk::Hyperlink *widget); + Hyperlink(const Hyperlink &) = delete; + Hyperlink(Hyperlink &&) = delete; virtual ~Hyperlink() override; + Hyperlink & operator = (const Hyperlink &) = delete; + Hyperlink & operator = (Hyperlink &&) = delete; + virtual status_t init() override; public: virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; }; - } -} + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Indicator.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Indicator.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Indicator.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Indicator.h 2025-08-26 18:15:48.069961132 +0000 @@ -85,7 +85,6 @@ namespace lsp ctl::Color sInactiveColor; ctl::Color sInactiveTextColor; - ctl::Boolean sActivity; ctl::Padding sIPadding; LSPString sFormat; PropListener sListener; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Knob.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Knob.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Knob.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Knob.h 2025-08-26 18:15:48.069961132 +0000 @@ -79,7 +79,6 @@ namespace lsp ctl::Boolean sMeterVisible; ctl::Boolean sEditable; - ctl::Boolean sActivity; ctl::Expression sMin; ctl::Expression sMax; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Label.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Label.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Label.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Label.h 2025-08-26 18:15:48.069961132 +0000 @@ -78,9 +78,12 @@ namespace lsp ctl::Color sColor; ctl::Color sHoverColor; + ctl::Color sInactiveColor; + ctl::Color sInactiveHoverColor; ctl::Padding sIPadding; ctl::LCString sText; + ctl::Boolean sTextClip; ui::IPort *pPort; ui::IPort *pLangPort; float fValue; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Led.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Led.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Led.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/Led.h 2025-08-26 18:15:48.069961132 +0000 @@ -54,8 +54,6 @@ namespace lsp ctl::Color sHoleColor; - ctl::Boolean sActivity; - ctl::Expression sLight; ui::IPort *pPort; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/ProgressBar.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/ProgressBar.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/ProgressBar.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/simple/ProgressBar.h 2025-08-26 18:15:48.069961132 +0000 @@ -60,7 +60,6 @@ namespace lsp ctl::LCString sText; ctl::Boolean sShowText; - ctl::Boolean sActivity; ctl::Integer sBorderSize; ctl::Integer sBorderGapSize; ctl::Integer sBorderRadius; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioEnvelope.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioEnvelope.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioEnvelope.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioEnvelope.h 2025-08-26 18:15:48.069961132 +0000 @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 8 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef PLUG_IN_PLUG_FW_CTL_SPECIFIC_AUDIOENVELOPE_H_ +#define PLUG_IN_PLUG_FW_CTL_SPECIFIC_AUDIOENVELOPE_H_ + +#ifndef LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_CTL_IMPL_ */ + +#include +#include + +namespace lsp +{ + namespace ctl + { + /** + * Audio envelope widget controller + */ + class AudioEnvelope: public Widget + { + public: + static const ctl_class_t metadata; + + protected: + typedef struct point_t + { + ui::IPort *pPort; + tk::Float *pValue; + float fOldValue; + float fNewValue; + } point_t; + + enum points_t + { + P_ATTACK, + P_HOLD, + P_DECAY, + P_BREAK, + P_SLOPE, + P_SUSTAIN, + P_RELEASE, + + P_TOTAL + }; + + enum role_t + { + R_TIME, + R_CURVE, + R_LEVEL, + + R_TOTAL + }; + + protected: + point_t vPoints[P_TOTAL][R_TOTAL]; + ui::IPort *vTypes[P_TOTAL]; + + ctl::Boolean sHoldEnabled; + ctl::Boolean sBreakEnabled; + ctl::Boolean sQuadPoint; + ctl::Boolean sFill; + ctl::Boolean sWire; + ctl::Boolean sEditable; + ctl::Integer sLineWidth; + ctl::Color sLineColor; + ctl::Color sFillColor; + ctl::Integer sPointSize; + ctl::Color sPointColor; + ctl::Color sPointHoverColor; + ctl::Color sColor; + ctl::Boolean sBorderFlat; + ctl::Boolean sGlass; + ctl::Color sGlassColor; + ctl::Padding sIPadding; + ctl::Color sBorderColor; + + bool bCommitting; + bool bSubmitting; + + protected: + static float get_normalized(ui::IPort *port); + static void set_normalized(ui::IPort *port, float value); + static status_t slot_change(tk::Widget *sender, void *ptr, void *data); + static void curve_function(float *y, const float *x, size_t count, const tk::AudioEnvelope *sender, void *data); + + protected: + void arrange_time_values(); + void sync_time_values(point_t *actor); + void commit_values(); + void submit_ports(); + size_t get_function(points_t point); + + public: + explicit AudioEnvelope(ui::IWrapper *wrapper, tk::AudioEnvelope *widget); + AudioEnvelope(const AudioEnvelope &) = delete; + AudioEnvelope(AudioEnvelope &&) = delete; + virtual ~AudioEnvelope() override; + + AudioEnvelope & operator = (const AudioEnvelope &) = delete; + AudioEnvelope & operator = (AudioEnvelope &&) = delete; + + virtual status_t init() override; + virtual void destroy() override; + + public: + virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; + virtual void end(ui::UIContext *ctx) override; + virtual void notify(ui::IPort *port, size_t flags) override; + }; + + } /* namespace ctl */ +} /* namespace lsp */ + + + + +#endif /* PLUG_IN_PLUG_FW_CTL_SPECIFIC_AUDIOENVELOPE_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioFolder.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioFolder.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioFolder.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioFolder.h 2025-08-26 18:15:48.069961132 +0000 @@ -44,13 +44,16 @@ namespace lsp protected: ui::IPort *pPort; - ui::IPort *pAutoload; tk::ListBoxItem *wActive; ctl::Enum sHScroll; ctl::Enum sVScroll; + ctl::Expression sAutoLoad; + ctl::Expression sAutoPlay; bool bActive; // Navigator is active + bool bAutoLoad; // Automatically load samples + bool bAutoPlay; // Automatically play samples ctl::DirController sDirController; // Directory controller protected: @@ -59,6 +62,8 @@ namespace lsp protected: void sync_state(); + void sync_auto_load(); + void sync_auto_play(); void set_activity(bool active); void update_styles(); void apply_action(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioNavigator.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioNavigator.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioNavigator.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioNavigator.h 2025-08-26 18:15:48.069961132 +0000 @@ -63,6 +63,7 @@ namespace lsp protected: void sync_state(); + void sync_auto_play(); void set_activity(bool active); void update_styles(); void apply_action(); @@ -82,8 +83,10 @@ namespace lsp ctl::Boolean sHover; ctl::Padding sTextPad; ctl::LCString sText; + ctl::Expression sAutoPlay; bool bActive; // Navigator is active + bool bAutoPlay; // Automatically play sample when navigating action_t enAction; // Actual action ctl::DirController sDirController; // Directory controller diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioSample.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioSample.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioSample.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/AudioSample.h 2025-08-26 18:15:48.069961132 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 20 июл. 2021 г. @@ -96,7 +96,6 @@ namespace lsp tk::Menu *pMenu; DataSink *pDataSink; DragInSink *pDragInSink; - bool bFullSample; bool bLoadPreview; lltl::parray vFormats; lltl::parray vMenuItems; @@ -136,6 +135,7 @@ namespace lsp ctl::Expression sPlayPosition; ctl::Expression sLength; ctl::Expression sActualLength; + ctl::Expression sFullSample; ctl::Padding sIPadding; @@ -187,8 +187,9 @@ namespace lsp virtual status_t init() override; virtual void destroy() override; - public: + public: // ctl::Widget virtual void set(ui::UIContext *ctx, const char *name, const char *value) override; + virtual status_t add(ui::UIContext *ctx, ctl::Widget *child) override; virtual void end(ui::UIContext *ctx) override; virtual void notify(ui::IPort *port, size_t flags) override; virtual void reloaded(const tk::StyleSheet *sheet) override; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/FileButton.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/FileButton.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/FileButton.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/FileButton.h 2025-08-26 18:15:48.069961132 +0000 @@ -80,7 +80,6 @@ namespace lsp ctl::Expression sProgress; ctl::Padding sTextPadding; ctl::Boolean sGradient; - ctl::Boolean sActivity; ctl::Integer sBorderSize; ctl::Integer sBorderPressedSize; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/Fraction.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/Fraction.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/Fraction.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/Fraction.h 2025-08-26 18:15:48.069961132 +0000 @@ -55,7 +55,6 @@ namespace lsp ctl::Float sAngle; ctl::Integer sTextPad; ctl::Integer sThick; - ctl::Boolean sActivity; ctl::Color sColor; ctl::Color sNumColor; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/LedChannel.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/LedChannel.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/LedChannel.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/LedChannel.h 2025-08-26 18:15:48.069961132 +0000 @@ -79,7 +79,6 @@ namespace lsp tk::prop::Color sPropYellowZoneColor; tk::prop::Color sPropRedZoneColor; - ctl::Boolean sActivity; ctl::Boolean sReversive; ctl::Boolean sPeakVisible; ctl::Boolean sBalanceVisible; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/MidiNote.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/MidiNote.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/MidiNote.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/specific/MidiNote.h 2025-08-26 18:15:48.069961132 +0000 @@ -82,7 +82,6 @@ namespace lsp ctl::Color sInactiveColor; ctl::Color sInactiveTextColor; - ctl::Boolean sActivity; ctl::Padding sIPadding; protected: diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Boolean.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Boolean.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Boolean.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Boolean.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 апр. 2021 г. @@ -52,7 +52,7 @@ namespace lsp void apply_changes(); protected: - virtual void on_updated(ui::IPort *port) override; + virtual void on_updated(ui::IPort *port, size_t flags) override; public: explicit Boolean(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Enum.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Enum.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Enum.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Enum.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 авг. 2021 г. @@ -47,7 +47,7 @@ namespace lsp void apply_changes(); protected: - virtual void on_updated(ui::IPort *port) override; + virtual void on_updated(ui::IPort *port, size_t flags) override; public: explicit Enum(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Expression.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Expression.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Expression.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Expression.h 2025-08-26 18:15:48.073961093 +0000 @@ -56,7 +56,7 @@ namespace lsp ui::IPortListener *pListener; protected: - virtual void on_updated(ui::IPort *port) override; + virtual void on_updated(ui::IPort *port, size_t flags) override; public: explicit Expression(); @@ -67,7 +67,7 @@ namespace lsp Expression & operator = (const Expression &) = delete; Expression & operator = (Expression &&) = delete; - void init(ui::IWrapper *wrapper, ui::IPortListener *listener); + void init(ui::IWrapper *wrapper, ui::IPortListener *listener, expr::Resolver *resolver = NULL); public: float evaluate_float(float dfl = 0.0f); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Float.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Float.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Float.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Float.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 апр. 2021 г. @@ -47,7 +47,7 @@ namespace lsp void apply_changes(); protected: - virtual void on_updated(ui::IPort *port) override; + virtual void on_updated(ui::IPort *port, size_t flags) override; public: explicit Float(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Integer.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Integer.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Integer.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Integer.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 апр. 2021 г. @@ -47,7 +47,7 @@ namespace lsp void apply_changes(); protected: - virtual void on_updated(ui::IPort *port) override; + virtual void on_updated(ui::IPort *port, size_t flags) override; public: explicit Integer(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Property.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Property.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Property.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl/util/Property.h 2025-08-26 18:15:48.073961093 +0000 @@ -65,13 +65,14 @@ namespace lsp expr::Parameters sParams; PropResolver sResolver; ui::IWrapper *pWrapper; + expr::Resolver *pResolver; lltl::parray vDependencies; protected: void do_destroy(); void drop_dependencies(); status_t on_resolved(const LSPString *name, ui::IPort *p); - virtual void on_updated(ui::IPort *port); + virtual void on_updated(ui::IPort *port, size_t flags); protected: status_t evaluate(expr::value_t *value); @@ -89,7 +90,7 @@ namespace lsp Property & operator = (const Property &) = delete; Property & operator = (Property &&) = delete; - void init(ui::IWrapper *wrapper); + void init(ui::IWrapper *wrapper, expr::Resolver *resolver = NULL); virtual void destroy(); public: diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl.h 2025-03-01 12:42:57.428644568 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ctl.h 2025-08-26 18:15:48.065961171 +0000 @@ -46,12 +46,18 @@ #include #include - // Widget controllers + // Controllers + #include + #include #include #include #include #include + #include #include + #include + + #include #include #include @@ -73,6 +79,8 @@ #include #include #include + #include + #include #include #include #include @@ -100,6 +108,7 @@ #include #include + #include #include #include #include diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/ports.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/ports.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 нояб. 2020 г. @@ -28,132 +28,154 @@ // Port definitions for metadata #define AUDIO_INPUT(id, label) \ - { id, label, U_NONE, R_AUDIO_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_AUDIO_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL } #define AUDIO_OUTPUT(id, label) \ - { id, label, U_NONE, R_AUDIO_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_AUDIO_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL } #define MIDI_IN_CHANNEL(id, label) \ - { id, label, U_NONE, R_MIDI_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_MIDI_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL } #define MIDI_OUT_CHANNEL(id, label) \ - { id, label, U_NONE, R_MIDI_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_MIDI_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL } #define OSC_IN_CHANNEL(id, label) \ - { id, label, U_NONE, R_OSC_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_OSC_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL } #define OSC_OUT_CHANNEL(id, label) \ - { id, label, U_NONE, R_OSC_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_OSC_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL } #define FILE_CHANNEL(id, label) \ - { id, label, U_ENUM, R_CONTROL, F_INT, 0, 0, 0, 0, file_channels, NULL, NULL } -#define AMP_GAIN(id, label, dfl, max) \ - { id, label, U_GAIN_AMP, R_CONTROL, F_LOG | F_UPPER | F_LOWER | F_STEP, 0, max, dfl, GAIN_AMP_S_0_5_DB, NULL, NULL, NULL } -#define AMP_GAIN1(id, label, dfl) AMP_GAIN(id, label, dfl, 1.0f) -#define AMP_GAIN10(id, label, dfl) AMP_GAIN(id, label, dfl, 10.0f) -#define AMP_GAIN100(id, label, dfl) AMP_GAIN(id, label, dfl, 100.0f) -#define AMP_GAIN1000(id, label, dfl) AMP_GAIN(id, label, dfl, 1000.0f) -#define AMP_GAIN_RANGE(id, label, dfl, min, max) \ - { id, label, U_GAIN_AMP, R_CONTROL, F_LOG | F_UPPER | F_LOWER | F_STEP, min, max, dfl, GAIN_AMP_S_0_5_DB, NULL, NULL, NULL } + { id, label, NULL, U_ENUM, R_CONTROL, F_INT, 0, 0, 0, 0, file_channels, NULL, NULL } + #define STATUS(id, label) \ - { id, label, U_NONE, R_METER, F_INT | F_UPPER | F_LOWER, 0, STATUS_MAX, STATUS_UNSPECIFIED, 0, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_METER, F_INT | F_UPPER | F_LOWER, 0, STATUS_MAX, STATUS_UNSPECIFIED, 0, NULL, NULL, NULL } #define MESH(id, label, dim, points) \ - { id, label, U_NONE, R_MESH, 0, 0.0, 0.0, points, dim, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_MESH, 0, 0.0, 0.0, points, dim, NULL, NULL, NULL } #define STREAM(id, label, dim, frames, capacity) \ - { id, label, U_NONE, R_STREAM, 0, dim, frames, capacity, 0.0f, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_STREAM, 0, dim, frames, capacity, 0.0f, NULL, NULL, NULL } #define FBUFFER(id, label, rows, cols) \ - { id, label, U_NONE, R_FBUFFER, 0, 0.0, 0.0, rows, cols, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_FBUFFER, 0, 0.0, 0.0, rows, cols, NULL, NULL, NULL } #define PATH(id, label) \ - { id, label, U_STRING, R_PATH, 0, 0, 0, 0, 0, NULL, NULL, NULL } -#define TRIGGER(id, label) \ - { id, label, U_BOOL, R_CONTROL, F_TRG, 0, 0, 0.0f, 0, NULL, NULL, NULL } -#define SWITCH(id, label, dfl) \ - { id, label, U_BOOL, R_CONTROL, 0, 0, 0, dfl, 0, NULL, NULL, NULL } -#define COMBO(id, label, dfl, list) \ - { id, label, U_ENUM, R_CONTROL, 0, 0, 0, dfl, 0, list, NULL, NULL } + { id, label, NULL, U_STRING, R_PATH, 0, 0, 0, 0, 0, NULL, NULL, NULL } +#define TRIGGER(id, label, alias) \ + { id, label, alias, U_BOOL, R_CONTROL, F_TRG, 0, 0, 0.0f, 0, NULL, NULL, NULL } +#define SWITCH(id, label, alias, dfl) \ + { id, label, alias, U_BOOL, R_CONTROL, 0, 0, 0, dfl, 0, NULL, NULL, NULL } +#define COMBO(id, label, alias, dfl, list) \ + { id, label, alias, U_ENUM, R_CONTROL, 0, 0, 0, dfl, 0, list, NULL, NULL } #define COMBO_START(id, label, dfl, list, min) \ - { id, label, U_ENUM, R_CONTROL, F_MIN, min, 0, dfl, 0, list, NULL, NULL } + { id, label, NULL, U_ENUM, R_CONTROL, F_MIN, min, 0, dfl, 0, list, NULL, NULL } #define BLINK(id, label) \ - { id, label, U_BOOL, R_METER, 0, 0, 0, 0, 0, NULL, NULL, NULL } -#define KNOB(id, label, units, min, max, dfl, step) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP, \ - min, max, dfl, step, NULL, NULL, NULL } -#define CKNOB(id, label, units, min, max, dfl, step) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_CYCLIC, \ - min, max, dfl, step, NULL, NULL, NULL } -#define CONTROL(id, label, units, limits) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP, \ - limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } -#define CONTROL_DFL(id, label, units, limits, dfl) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP, \ - limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP, NULL, NULL, NULL } -#define INT_CONTROL(id, label, units, limits) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_INT, \ - limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } -#define INT_CONTROL_RANGE(id, label, units, min, max, dfl, step) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_INT, \ - min, max, dfl, step, NULL, NULL, NULL } + { id, label, NULL, U_BOOL, R_METER, 0, 0, 0, 0, 0, NULL, NULL, NULL } + +#define CONTROL_ALL(id, label, alias, units, min, max, dfl, step) \ + { id, label, alias, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP, min, max, dfl, step, NULL, NULL, NULL } +#define CONTROL(id, label, alias, units, limits) \ + CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) +#define CONTROL_DFL(id, label, alias, units, limits, dfl) \ + CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP) + +#define LOW_CONTROL_ALL(id, label, alias, units, min, max, dfl, step) \ + { id, label, NULL, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_LOWERING, min, max, dfl, step, NULL, NULL, NULL } +#define LOW_CONTROL(id, label, alias, units, limits) \ + LOW_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) +#define LOW_CONTROL_DFL(id, label, alias, units, limits, dfl) \ + LOW_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP) + +#define INT_CONTROL_ALL(id, label, alias, units, min, max, dfl, step) \ + { id, label, NULL, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_INT, min, max, dfl, step, NULL, NULL, NULL } +#define INT_CONTROL(id, label, alias, units, limits) \ + INT_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) +#define INT_CONTROL_DFL(id, label, alias, units, limits, dfl) \ + INT_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP) + +#define LOG_CONTROL_ALL(id, label, alias, units, min, max, dfl, step) \ + { id, label, alias, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_LOG, min, max, dfl, step, NULL, NULL, NULL } +#define LOG_CONTROL(id, label, alias, units, limits) \ + LOG_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) +#define LOG_CONTROL_DFL(id, label, alias, units, limits, dfl) \ + LOG_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP) + +#define EXT_LOG_CONTROL_ALL(id, label, alias, units, min, max, dfl, step) \ + { id, label, alias, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_LOG | F_EXT, min, max, dfl, step, NULL, NULL, NULL } +#define EXT_LOG_CONTROL(id, label, alias, units, limits) \ + EXT_LOG_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) +#define EXT_LOG_CONTROL_DFL(id, label, alias, units, limits, dfl) \ + EXT_LOG_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP) + +#define CYC_CONTROL_ALL(id, label, alias, units, min, max, dfl, step) \ + { id, label, alias, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_CYCLIC, min, max, dfl, step, NULL, NULL, NULL } +#define CYC_CONTROL(id, label, alias, units, limits) \ + CYC_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) +#define CYC_CONTROL_DFL(id, label, alias, units, limits, dfl) \ + CYC_CONTROL_ALL(id, label, alias, units, limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP) + +#define AMP_GAIN(id, label, alias, dfl, max) \ + LOG_CONTROL_ALL(id, label, alias, U_GAIN_AMP, 0.0f, max, dfl, GAIN_AMP_S_0_5_DB) +#define AMP_GAIN_RANGE(id, label, alias, dfl, min, max) \ + LOG_CONTROL_ALL(id, label, alias, U_GAIN_AMP, min, max, dfl, GAIN_AMP_S_0_5_DB) +#define AMP_GAIN1(id, label, alias, dfl) AMP_GAIN(id, label, alias, dfl, 1.0f) +#define AMP_GAIN10(id, label, alias, dfl) AMP_GAIN(id, label, alias, dfl, 10.0f) +#define AMP_GAIN100(id, label, alias, dfl) AMP_GAIN(id, label, alias, dfl, 100.0f) +#define AMP_GAIN1000(id, label, alias, dfl) AMP_GAIN(id, label, alias, dfl, 1000.0f) +#define AMP_GAIN10000(id, label, alias, dfl) AMP_GAIN(id, label, alias, dfl, 10000.0f) + +#define PAN_CTL(id, label, alias, dfl) \ + CONTROL_ALL(id, label, alias, U_PERCENT, -100.0f, 100.0f, dfl, 0.1f) +#define PERCENTS(id, label, alias, dfl, step) \ + CONTROL_ALL(id, label, alias, U_PERCENT, 0.0f, 100.0f, dfl, step) + #define HUE_CTL(id, label, dfl) \ - { id, label, U_NONE, R_CONTROL, F_UPPER | F_LOWER | F_STEP | F_CYCLIC, 0.0f, 1.0f, (dfl), 0.25f/360.0f, NULL, NULL } -#define CYC_CONTROL(id, label, units, limits) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_CYCLIC, \ - limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } -#define CYC_CONTROL_DFL(id, label, units, limits, dfl) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_CYCLIC, \ - limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP, NULL, NULL, NULL } + { id, label, NULL, U_NONE, R_CONTROL, F_UPPER | F_LOWER | F_STEP | F_CYCLIC, 0.0f, 1.0f, (dfl), 0.25f/360.0f, NULL, NULL } #define UNLIMITED_METER(id, label, units, dfl) \ - { id, label, units, R_METER, 0, 0.0f, 0.0f, dfl, 0.0f, NULL, NULL, NULL } + { id, label, NULL, units, R_METER, 0, 0.0f, 0.0f, dfl, 0.0f, NULL, NULL, NULL } #define METER(id, label, units, limits) \ - { id, label, units, R_METER, F_LOWER | F_UPPER | F_STEP, \ - limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } + { id, label, NULL, units, R_METER, F_LOWER | F_UPPER | F_STEP, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } #define METERZ(id, label, units, limits) \ - { id, label, units, R_METER, F_LOWER | F_UPPER | F_STEP, \ - limits ## _MIN, limits ## _MAX, 0.0f, 0.0f, NULL, NULL, NULL } + { id, label, NULL, units, R_METER, F_LOWER | F_UPPER | F_STEP, limits ## _MIN, limits ## _MAX, 0.0f, 0.0f, NULL, NULL, NULL } #define METER_MINMAX(id, label, units, min, max) \ - { id, label, units, R_METER, F_LOWER | F_UPPER | F_STEP, \ - min, max, min, 0.0f, NULL, NULL, NULL } -#define LOG_CONTROL(id, label, units, limits) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_LOG, \ - limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } -#define EXT_LOG_CONTROL(id, label, units, limits) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_LOG | F_EXT, \ - limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP, NULL, NULL, NULL } -#define LOG_CONTROL_DFL(id, label, units, limits, dfl) \ - { id, label, units, R_CONTROL, F_LOWER | F_UPPER | F_STEP | F_LOG, \ - limits ## _MIN, limits ## _MAX, dfl, limits ## _STEP, NULL, NULL, NULL } + { id, label, NULL, units, R_METER, F_LOWER | F_UPPER | F_STEP, min, max, min, 0.0f, NULL, NULL, NULL } + +#define INT_METER_UNLIMITED(id, label, units, dfl) \ + { id, label, NULL, units, R_METER, F_INT, 0.0f, 0.0f, dfl, 0.0f, NULL, NULL, NULL } +#define INT_METER_ALL(id, label, units, min, max, dfl, step) \ + { id, label, NULL, units, R_METER, F_LOWER | F_UPPER | F_STEP | F_INT, min, max, dfl, step, NULL, NULL, NULL } +#define INT_METER(id, label, units, limits) \ + INT_METER_ALL(id, label, units, limits ## _MIN, limits ## _MAX, limits ## _DFL, limits ## _STEP) + +#define ENUM_METER(id, label, dfl, list) \ + { id, label, NULL, U_ENUM, R_METER, F_INT, 0.0f, 0.0f, dfl, 0.0f, list, NULL, NULL } + #define PORT_SET(id, label, keys, ports) \ - { id, label, U_ENUM, R_PORT_SET, 0, 0, 0, 0, 0, keys, ports, NULL } -#define PAN_CTL(id, label, dfl) \ - { id, label, U_PERCENT, R_CONTROL, F_LOWER | F_UPPER | F_STEP, -100.0f, 100.0f, dfl, 0.1, NULL, NULL, NULL } -#define PERCENTS(id, label, dfl, step) \ - { id, label, U_PERCENT, R_CONTROL, F_LOWER | F_UPPER | F_STEP, 0, 100, dfl, step, NULL, NULL, NULL } + { id, label, NULL, U_ENUM, R_PORT_SET, 0, 0, 0, 0, 0, keys, ports, NULL } #define OUT_PERCENTS(id, label) \ - { id, label, U_PERCENT, R_METER, F_LOWER | F_UPPER, 0, 100, 0, 0, NULL, NULL } + { id, label, NULL, U_PERCENT, R_METER, F_LOWER | F_UPPER, 0, 100, 0, 0, NULL, NULL } #define METER_GAIN(id, label, max) \ - { id, label, U_GAIN_AMP, R_METER, F_LOG | F_UPPER | F_LOWER | F_PEAK, 0, max, 0.0f, 0, NULL, NULL, NULL } + { id, label, NULL, U_GAIN_AMP, R_METER, F_LOG | F_UPPER | F_LOWER | F_PEAK, 0, max, 0.0f, 0, NULL, NULL, NULL } #define METER_GAIN_DFL(id, label, max, dfl) \ - { id, label, U_GAIN_AMP, R_METER, F_LOG | F_UPPER | F_LOWER | F_PEAK, 0, max, dfl, 0, NULL, NULL, NULL } + { id, label, NULL, U_GAIN_AMP, R_METER, F_LOG | F_UPPER | F_LOWER | F_PEAK, 0, max, dfl, 0, NULL, NULL, NULL } #define METER_OUT_GAIN(id, label, max) \ - { id, label, U_GAIN_AMP, R_METER, F_LOG | F_UPPER | F_LOWER, 0, max, 0.0f, 0, NULL, NULL, NULL } + { id, label, NULL, U_GAIN_AMP, R_METER, F_LOG | F_UPPER | F_LOWER, 0, max, 0.0f, 0, NULL, NULL, NULL } #define LUFS_METER(id, label, max) \ - { id, label, U_LUFS, R_METER, F_UPPER | F_LOWER, -72.0f, max, -72.0f, 0, NULL, NULL, NULL } -#define METER_GAIN10(id, label) METER_GAIN(id, label, 10.0f) -#define METER_GAIN20(id, label) METER_GAIN(id, label, 20.0f) -#define METER_PERCENT(id, label) { id, label, U_PERCENT, R_METER, F_UPPER | F_LOWER, 0.0f, 100.0f, 0.0f, 0.1f, NULL, NULL, NULL } - -#define STRING(id, label, length) { id, label, U_NONE, R_STRING, F_LOWER | F_UPPER, 0, length, 0, 0, NULL, NULL, "" } -#define STRING_DFL(id, label, length, text) { id, label, U_NONE, R_STRING, F_LOWER | F_UPPER, 0, length, 0, 0, NULL, NULL, text } -#define OPT_STRING(id, label, length) { id, label, U_NONE, R_STRING, F_LOWER | F_UPPER | F_OPTIONAL, 0, length, 0, 0, NULL, NULL, "" } -#define OPT_STRING_DFL(id, label, length, text) { id, label, U_NONE, R_STRING, F_LOWER | F_UPPER | F_OPTIONAL, 0, length, 0, 0, NULL, NULL, text } - -#define SEND_NAME(id, label) { id, label, U_NONE, R_SEND_NAME, F_LOWER | F_UPPER, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } -#define OPT_SEND_NAME(id, label) { id, label, U_NONE, R_SEND_NAME, F_LOWER | F_UPPER | F_OPTIONAL, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } -#define RETURN_NAME(id, label) { id, label, U_NONE, R_RETURN_NAME, F_LOWER | F_UPPER, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } -#define OPT_RETURN_NAME(id, label) { id, label, U_NONE, R_RETURN_NAME, F_LOWER | F_UPPER | F_OPTIONAL, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } + { id, label, NULL, U_LUFS, R_METER, F_UPPER | F_LOWER, -72.0f, max, -72.0f, 0, NULL, NULL, NULL } +#define METER_GAIN10(id, label) METER_GAIN(id, label, 10.0f) +#define METER_GAIN20(id, label) METER_GAIN(id, label, 20.0f) +#define METER_PERCENT(id, label) { id, label, NULL, U_PERCENT, R_METER, F_UPPER | F_LOWER, 0.0f, 100.0f, 0.0f, 0.1f, NULL, NULL, NULL } + +#define STRING(id, label, length) { id, label, NULL, U_NONE, R_STRING, F_LOWER | F_UPPER, 0, length, 0, 0, NULL, NULL, "" } +#define STRING_DFL(id, label, length, text) { id, label, NULL, U_NONE, R_STRING, F_LOWER | F_UPPER, 0, length, 0, 0, NULL, NULL, text } +#define OPT_STRING(id, label, length) { id, label, NULL, U_NONE, R_STRING, F_LOWER | F_UPPER | F_OPTIONAL, 0, length, 0, 0, NULL, NULL, "" } +#define OPT_STRING_DFL(id, label, length, text) { id, label, NULL, U_NONE, R_STRING, F_LOWER | F_UPPER | F_OPTIONAL, 0, length, 0, 0, NULL, NULL, text } + +#define SEND_NAME(id, label) { id, label, NULL, U_NONE, R_SEND_NAME, F_LOWER | F_UPPER, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } +#define OPT_SEND_NAME(id, label) { id, label, NULL, U_NONE, R_SEND_NAME, F_LOWER | F_UPPER | F_OPTIONAL, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } +#define RETURN_NAME(id, label) { id, label, NULL, U_NONE, R_RETURN_NAME, F_LOWER | F_UPPER, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } +#define OPT_RETURN_NAME(id, label) { id, label, NULL, U_NONE, R_RETURN_NAME, F_LOWER | F_UPPER | F_OPTIONAL, 0, MAX_SHM_SEGMENT_NAME_BYTES, 0, 0, NULL, NULL, "" } #define AUDIO_SEND(id, label, index, group) \ - { id, label, U_NONE, R_AUDIO_SEND, 0, 0, 0, index, 0, NULL, NULL, group } + { id, label, NULL, U_NONE, R_AUDIO_SEND, 0, 0, 0, index, 0, NULL, NULL, group } #define OPT_AUDIO_SEND(id, label, index, group) \ - { id, label, U_NONE, R_AUDIO_SEND, F_OPTIONAL, 0, 0, index, 0, NULL, NULL, group } + { id, label, NULL, U_NONE, R_AUDIO_SEND, F_OPTIONAL, 0, 0, index, 0, NULL, NULL, group } #define AUDIO_RETURN(id, label, index, group) \ - { id, label, U_NONE, R_AUDIO_RETURN, 0, 0, 0, index, 0, NULL, NULL, group } + { id, label, NULL, U_NONE, R_AUDIO_RETURN, 0, 0, 0, index, 0, NULL, NULL, group } #define OPT_AUDIO_RETURN(id, label, index, group) \ - { id, label, U_NONE, R_AUDIO_RETURN, F_OPTIONAL, 0, 0, index, 0, NULL, NULL, group } + { id, label, NULL, U_NONE, R_AUDIO_RETURN, F_OPTIONAL, 0, 0, index, 0, NULL, NULL, group } #define SEND_MONO(id, channel, comment) \ SEND_NAME(id, comment), \ @@ -188,7 +210,7 @@ OPT_AUDIO_RETURN(channel "r", comment " input Right", 1, id) #define PORTS_END \ - { NULL, NULL } + { NULL, NULL, NULL } // Reduced ports #define AUDIO_INPUT_MONO AUDIO_INPUT(PORT_NAME_INPUT, "Input") @@ -219,22 +241,22 @@ #define OSC_INPUT OSC_IN_CHANNEL(PORT_NAME_OSC_INPUT, "OSC input") #define OSC_OUTPUT OSC_OUT_CHANNEL(PORT_NAME_OSC_OUTPUT, "OSC output") -#define IN_GAIN AMP_GAIN("g_in", "Input gain", GAIN_AMP_0_DB, GAIN_AMP_P_60_DB) -#define OUT_GAIN AMP_GAIN("g_out", "Output gain", GAIN_AMP_0_DB, GAIN_AMP_P_60_DB) +#define IN_GAIN AMP_GAIN("g_in", "Input gain", "Input gain", GAIN_AMP_0_DB, GAIN_AMP_P_60_DB) +#define OUT_GAIN AMP_GAIN("g_out", "Output gain", "Output gain", GAIN_AMP_0_DB, GAIN_AMP_P_60_DB) -#define DRY_GAIN(g) AMP_GAIN10("dry", "Dry amount", g) -#define DRY_GAIN_L(g) AMP_GAIN10("dry_l", "Dry amount L", g) -#define DRY_GAIN_R(g) AMP_GAIN10("dry_r", "Dry amount R", g) - -#define WET_GAIN(g) AMP_GAIN10("wet", "Wet amount", g) -#define WET_GAIN_L(g) AMP_GAIN10("wet_l", "Wet amount L", g) -#define WET_GAIN_R(g) AMP_GAIN10("wet_r", "Wet amount R", g) - -#define DRYWET(perc) PERCENTS("drywet", "Dry/Wet balance", perc, 0.1f) -#define DRYWET_L(perc) PERCENTS("dwmix_l", "Dry/Wet balance Left", perc, 0.1f) -#define DRYWET_R(perc) PERCENTS("dwmix_r", "Dry/Wet balance Right", perc, 0.1f) +#define DRY_GAIN(g) AMP_GAIN10("dry", "Dry amount", "Dry amount", g) +#define DRY_GAIN_L(g) AMP_GAIN10("dry_l", "Dry amount Left", "Dry amount L", g) +#define DRY_GAIN_R(g) AMP_GAIN10("dry_r", "Dry amount Right", "Dry amount R", g) + +#define WET_GAIN(g) AMP_GAIN10("wet", "Wet amount", "Wet amount", g) +#define WET_GAIN_L(g) AMP_GAIN10("wet_l", "Wet amount Left", "Wet amount L", g) +#define WET_GAIN_R(g) AMP_GAIN10("wet_r", "Wet amount Right", "Wet amount R", g) + +#define DRYWET(perc) PERCENTS("drywet", "Dry/Wet balance", "Dry/Wet", perc, 0.1f) +#define DRYWET_L(perc) PERCENTS("dwmix_l", "Dry/Wet balance Left", "Dry/Wet L", perc, 0.1f) +#define DRYWET_R(perc) PERCENTS("dwmix_r", "Dry/Wet balance Right", "Dry/Wet R", perc, 0.1f) -#define BYPASS { PORT_NAME_BYPASS, "Bypass", U_BOOL, R_BYPASS, F_UPPER | F_LOWER, 0, 1, 0, 0, NULL, NULL, NULL } +#define BYPASS { PORT_NAME_BYPASS, "Bypass", NULL, U_BOOL, R_BYPASS, F_UPPER | F_LOWER, 0, 1, 0, 0, NULL, NULL, NULL } // Port configurations diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/types.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/types.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/types.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/meta/types.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins * Created on: 28 сент. 2015 г. @@ -375,6 +375,7 @@ namespace lsp { const char *id; // Control ID const char *name; // Control name + const char *short_name; // Short name of the port unit_t unit; // Units role_t role; // Role int flags; // Flags diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/plug/data.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/plug/data.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/plug/data.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/plug/data.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 нояб. 2020 г. @@ -57,37 +57,50 @@ namespace lsp // Mesh port structure typedef struct mesh_t { - volatile mesh_state_t nState; // Actual state of the mesh + uint32_t nState; // Actual state of the mesh size_t nBuffers; // Overall number of buffers size_t nItems; // Number of items per each buffer float *pvData[]; // Array of pointers to buffer data - inline bool isEmpty() const { return nState == M_EMPTY; }; - inline bool containsData() const { return nState == M_DATA; }; - inline bool isWaiting() const { return nState == M_WAIT; }; + inline void init(float *ptr, size_t buffers, size_t length, uint32_t state = M_EMPTY) + { + atomic_store(&nState, state); + nBuffers = 0; + nItems = 0; + + for (size_t i=0; i(ptr); + ptr += length; + } + } + + inline bool isEmpty() const { return atomic_load(&nState) == M_EMPTY; }; + inline bool containsData() const { return atomic_load(&nState) == M_DATA; }; + inline bool isWaiting() const { return atomic_load(&nState) == M_WAIT; }; inline void data(size_t bufs, size_t items) { nBuffers = bufs; nItems = items; - nState = M_DATA; // This should be the last operation + atomic_store(&nState, M_DATA); // This should be the last operation } inline void cleanup() { nBuffers = 0; nItems = 0; - nState = M_EMPTY; // This should be the last operation + atomic_store(&nState, M_EMPTY); // This should be the last operation } - inline void markEmpty() + inline void mark_empty() { - nState = M_EMPTY; // This should be the last operation + atomic_store(&nState, M_EMPTY); // This should be the last operation } - inline void setWaiting() + inline void set_waiting() { - nState = M_WAIT; // This should be the last operation + atomic_store(&nState, M_WAIT); // This should be the last operation } } mesh_t; @@ -103,7 +116,7 @@ namespace lsp protected: typedef struct frame_t { - volatile uint32_t id; // Unique frame identifier + uint32_t id; // Unique frame identifier size_t head; // Head of the frame size_t tail; // The tail of frame size_t size; // The size of the frame @@ -116,7 +129,7 @@ namespace lsp size_t nBufCap; // Buffer capacity size_t nFrameCap; // Capacity in frames - volatile uint32_t nFrameId; // Current frame identifier + uint32_t nFrameId; // Current frame identifier frame_t *vFrames; // List of frames float **vChannels; // Channel data @@ -182,7 +195,7 @@ namespace lsp * @return identifier of head frame */ - inline uint32_t frame_id() const { return nFrameId; } + inline uint32_t frame_id() const { return atomic_load(&nFrameId); } /** * Begin write of frame data * @param size the required size of frame diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetListener.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetListener.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetListener.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetListener.h 2025-08-26 18:15:48.073961093 +0000 @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 30 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_UI_IPRESETLISTENER_H_ +#define LSP_PLUG_IN_PLUG_FW_UI_IPRESETLISTENER_H_ + +#include + +#ifndef LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ */ + +#include + +namespace lsp +{ + namespace ui + { + /** + * Callback interface for handling changes of presets + */ + class IPresetListener + { + public: + IPresetListener(); + IPresetListener(const IPresetListener &) = delete; + IPresetListener(IPresetListener &&) = delete; + virtual ~IPresetListener(); + + IPresetListener & operator = (const IPresetListener &) = delete; + IPresetListener & operator = (IPresetListener &&) = delete; + + public: + /** + * Handle event when preset has been deactivated + * @param preset deactivated preset + */ + virtual void preset_deactivated(const preset_t *preset); + + /** + * Handle event when preset has been activated + * @param preset activated preset + */ + virtual void preset_activated(const preset_t *preset); + + /** + * Handle event when the whole list of presets has been updated + */ + virtual void presets_updated(); + }; + + } /* namespace ui */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_UI_IPRESETLISTENER_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetManager.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetManager.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetManager.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IPresetManager.h 2025-08-26 18:15:48.073961093 +0000 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 30 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_UI_IPRESETMANAGER_H_ +#define LSP_PLUG_IN_PLUG_FW_UI_IPRESETMANAGER_H_ + +#include + +#ifndef LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ */ + +#include + +namespace lsp +{ + namespace ui + { + /** + * Interface for managing presets + */ + class IPresetManager + { + public: + IPresetManager(); + IPresetManager(const IPresetManager &) = delete; + IPresetManager(IPresetManager &&) = delete; + virtual ~IPresetManager(); + + IPresetManager & operator = (const IPresetManager &) = delete; + IPresetManager & operator = (IPresetManager &&) = delete; + + public: + /** + * Mark active preset being dirty (changed) + */ + virtual void mark_active_preset_dirty(); + }; + + } /* namespace ui */ +} /* namespace lsp */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_UI_IPRESETMANAGER_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IWrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IWrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IWrapper.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/IWrapper.h 2025-08-26 18:15:48.073961093 +0000 @@ -39,11 +39,15 @@ #include #include +#include #include #include #include #include #include +#include +#include +#include #include #include @@ -71,7 +75,7 @@ namespace lsp /** * UI wrapper */ - class IWrapper + class IWrapper: public IPresetManager { private: friend class ControlPort; @@ -82,9 +86,12 @@ namespace lsp protected: enum flags_t { - F_QUIT = 1 << 0, // Quit main loop flag - F_CONFIG_DIRTY = 1 << 1, // The configuration needs to be saved - F_CONFIG_LOCK = 1 << 2, // The configuration file is locked for update + F_QUIT = 1 << 0, // Quit main loop flag + F_CONFIG_DIRTY = 1 << 1, // The configuration needs to be saved + F_CONFIG_LOCK = 1 << 2, // The configuration file is locked for update + F_PRESET_SYNC = 1 << 3, // New preset has been selected and we need to synchronize state + F_PRESET_DIRTY = 1 << 4, // Active preset is dirty + F_FAVOURITES_DIRTY = 1 << 5, // List of favourites had been updated }; protected: @@ -96,6 +103,8 @@ namespace lsp size_t nFlags; // Flags wssize_t nPlayPosition; // Playback position of the current file preview wssize_t nPlayLength; // Overall playback file length in samples + ssize_t nActivePreset; // Active preset + preset_tab_t enPresetTab; // Active preset tab expr::Variables sGlobalVars; // Global variables plug::position_t sPosition; // Melodic position @@ -110,6 +119,8 @@ namespace lsp lltl::parray vKvtListeners; // KVT listeners lltl::ptrset vSchemaListeners; // Schema change listeners lltl::parray vPlayListeners; // List of playback listeners + lltl::parray vPresetListeners; // List of preset listeners + lltl::darray vPresets; // List of available presets protected: static ssize_t compare_ports(const IPort *a, const IPort *b); @@ -135,6 +146,7 @@ namespace lsp status_t save_global_config(io::IOutSequence *os, lltl::pphash *parameters); status_t read_parameters(const io::Path *file, lltl::pphash *params); + status_t get_user_config_path(io::Path *path); static void drop_parameters(lltl::pphash *params); void get_bundle_version_key(LSPString *key); void get_bundle_scaling_key(LSPString *key); @@ -146,10 +158,29 @@ namespace lsp protected: static bool set_port_value(ui::IPort *port, const config::param_t *param, size_t flags, const io::Path *base); void position_updated(const plug::position_t *pos); + static status_t allocate_temp_file(io::Path *dst, const io::Path *src); protected: virtual void visual_schema_reloaded(const tk::StyleSheet *sheet); + protected: + static preset_t *add_preset(lltl::darray *list); + static void destroy_presets(lltl::darray *list); + + protected: + status_t get_user_presets_path(io::Path *path); + status_t get_plugin_presets_path(io::Path *path); + void scan_factory_presets(lltl::darray *list); + void scan_user_presets(lltl::darray *list); + void scan_favourite_presets(lltl::darray *list); + status_t save_favourites(const io::Path *path); + void select_presets(lltl::darray *list, const preset_t *active); + void update_preset_list(); + preset_t *find_preset(const LSPString *name, bool user); + void notify_presets_updated(); + void notify_preset_deactivated(const preset_t *preset); + void notify_preset_activated(const preset_t *preset); + public: explicit IWrapper(ui::Module *ui, resource::ILoader *loader); IWrapper(const IWrapper &) = delete; @@ -485,6 +516,112 @@ namespace lsp * @return pointer to actual shared memory state or NULL */ virtual const core::ShmState *shm_state(); + + /** + * Get name of graphics backend + * @return name of graphics backend + */ + const char *graphics_backend() const; + + public: // ui::IPresetManager + virtual void mark_active_preset_dirty() override; + + public: // Preset management + /** + * Add preset listener + * @param listener preset listener + * @return status of operation + */ + status_t add_preset_listener(IPresetListener *listener); + + /** + * Remove preset listener + * @param listener preset listener + * @return status of operation + */ + status_t remove_preset_listener(IPresetListener *listener); + + /** + * Select active preset + * @param preset_id preset identifier, negative value for deselection of any preset + * @return status of operation + */ + virtual status_t select_active_preset(const preset_t *preset); + + /** + * Get active preset + * @return active preset + */ + const preset_t *active_preset() const; + + /** + * Check that active preset is dirty + * @return true if active preset is dirty + */ + bool active_preset_dirty() const; + + /** + * Get list of all available presets + * @return list of all available presets + */ + const preset_t *all_presets() const; + + /** + * Get number of all presets + * @return number of all presets + */ + size_t num_presets() const; + + /** + * Get current preset tab + * @return current preset tab + */ + preset_tab_t preset_tab() const; + + /** + * Mark preset as favourite + * @param preset preset to mark + * @param favourite favourite flag + */ + status_t mark_preset_favourite(const preset_t *preset, bool favourite); + + /** + * Remove user preset + * @param preset_id preset identifier + */ + status_t remove_preset(const preset_t *preset); + + /** + * Save current state to the selected user preset and switch to it + * @param name name of the preset + * @param flags preset flags + * @return status of operation + */ + status_t save_preset(const LSPString *name, size_t flags); + + /** + * Set current preset tab + * @param tab current preset tab + */ + void set_preset_tab(preset_tab_t tab); + + /** + * Request for presets scan + */ + void scan_presets(); + + /** + * Set current state of the preset to the DSP + * @param state current preset state + */ + virtual void send_preset_state(const core::preset_state_t *state); + + /** + * Receive current state of the preset ffrom DSP + * @param state current preset state + */ + void receive_preset_state(const core::preset_state_t *state); + }; } /* namespace ui */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/PortResolver.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/PortResolver.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/PortResolver.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/PortResolver.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 9 апр. 2021 г. @@ -37,17 +37,20 @@ namespace lsp */ class PortResolver: public expr::Resolver { - private: - PortResolver & operator = (const PortResolver &); - protected: ui::IWrapper *pWrapper; public: explicit PortResolver(); explicit PortResolver(ui::IWrapper *wrapper); + explicit PortResolver(const PortResolver &) = delete; + explicit PortResolver(PortResolver &&) = delete; virtual ~PortResolver() override; + PortResolver & operator = (const PortResolver &) = delete; + PortResolver & operator = (PortResolver &&) = delete; + + public: void init(ui::IWrapper *wrapper); public: diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/UIContext.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/UIContext.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/UIContext.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/UIContext.h 2025-08-26 18:15:48.073961093 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 9 апр. 2021 г. @@ -39,7 +39,10 @@ namespace lsp { namespace ctl { + class Controller; + class DOMController; class Widget; + class Overlay; class Registry; } @@ -51,23 +54,25 @@ namespace lsp */ class UIContext { - private: - UIContext & operator = (const UIContext &); - UIContext(const UIContext &); - protected: ui::IWrapper *pWrapper; ctl::Registry *pControllers; tk::Registry *pWidgets; expr::Resolver *pResolver; lltl::parray vStack; + lltl::parray vOverlays; expr::Variables vRoot; UIOverrides sOverrides; public: explicit UIContext(ui::IWrapper *wrapper, ctl::Registry *controllers, tk::Registry *widgets); + UIContext(const UIContext &) = delete; + UIContext(UIContext &&) = delete; ~UIContext(); + UIContext & operator = (const UIContext &) = delete; + UIContext & operator = (UIContext &&) = delete; + status_t init(); public: @@ -96,6 +101,12 @@ namespace lsp inline tk::Registry *widgets() { return pWidgets; } /** + * Get list of overlay widget controllers + * @return list of overlay widget controllers + */ + lltl::parray *overlays() { return &vOverlays; } + + /** * Get the display * @return display */ @@ -189,22 +200,23 @@ namespace lsp status_t eval_int(ssize_t *value, const LSPString *expr); /** - * Create widget controller by the tag name + * Create widget controller by the controller's tag name * * @param name the tag name of the widget * @return pointer to widget controller */ - ctl::Widget *create_controller(const LSPString *name); + ctl::Controller *create_controller(const LSPString *name); /** - * Set attributes to widget + * Set attributes to controller * @param widget widget to set attributes * @param atts attributes to set * @return status of operation */ - status_t set_attributes(ctl::Widget *widget, const LSPString * const *atts); + status_t set_attributes(ctl::DOMController *ctl, const LSPString * const *atts); }; - } -} + + } /* namespace ui */ +} /* namespace lsp */ #endif /* LSP_PLUG_IN_UI_UICONTEXT_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/const.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/const.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/const.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/const.h 2025-08-26 18:15:48.073961093 +0000 @@ -29,114 +29,117 @@ #include // UI configuration ports -#define UI_CONFIG_PORT_PREFIX "_ui_" -#define UI_KVT_PORT_PREFIX "_kvt_" -#define UI_LAST_VERSION_PORT_ID "last_version" -#define UI_DLG_DEFAULT_PATH_ID "dlg_default_path" -#define UI_DLG_DEFAULT_FTYPE_ID "dlg_default_ftype" -#define UI_DLG_SAMPLE_PATH_ID "dlg_sample_path" -#define UI_DLG_SAMPLE_FTYPE_ID "dlg_sample_ftype" -#define UI_DLG_IR_PATH_ID "dlg_ir_path" -#define UI_DLG_IR_FTYPE_ID "dlg_ir_ftype" -#define UI_DLG_CONFIG_PATH_ID "dlg_config_path" -#define UI_DLG_CONFIG_FTYPE_ID "dlg_config_ftype" -#define UI_DLG_MODEL3D_PATH_ID "dlg_model3d_path" -#define UI_DLG_MODEL3D_FTYPE_ID "dlg_model3d_ftype" -#define UI_DLG_REW_PATH_ID "dlg_rew_path" -#define UI_DLG_REW_FTYPE_ID "dlg_rew_ftype" -#define UI_DLG_HYDROGEN_PATH_ID "dlg_hydrogen_path" -#define UI_DLG_HYDROGEN_FTYPE_ID "dlg_hydrogen_ftype" -#define UI_DLG_LSPC_BUNDLE_PATH_ID "dlg_lspc_bundle_path" -#define UI_DLG_LSPC_BUNDLE_FTYPE_ID "dlg_lspc_bundle_ftype" -#define UI_DLG_SFZ_PATH_ID "dlg_sfz_path" -#define UI_DLG_SFZ_FTYPE_ID "dlg_sfz_ftype" -#define UI_R3D_BACKEND_PORT_ID "r3d_backend" -#define UI_LANGUAGE_PORT_ID "language" -#define UI_REL_PATHS_PORT_ID "use_relative_paths" -#define UI_SCALING_PORT_ID "ui_scaling" -#define UI_SCALING_HOST_PORT_ID "ui_scaling_host" -#define UI_FONT_SCALING_PORT_ID "font_scaling" -#define UI_BUNDLE_SCALING_PORT_ID "ui_bundle_scaling" -#define UI_VISUAL_SCHEMA_FILE_ID "visual_schema_file" -#define UI_PREVIEW_AUTO_PLAY_ID "preview_auto_play" -#define UI_ENABLE_KNOB_SCALE_ACTIONS_ID "enable_knob_scale_actions" -#define UI_USER_HYDROGEN_KIT_PATH_ID "user_hydrogen_kit_path" -#define UI_OVERRIDE_HYDROGEN_KIT_PATH_ID "override_hydrogen_kit_path" -#define UI_OVERRIDE_HYDROGEN_KITS_ID "override_hydrogen_kits" -#define UI_INVERT_VSCROLL_ID "invert_vscroll" -#define UI_GRAPH_DOT_INVERT_VSCROLL_ID "invert_graph_dot_vscroll" -#define UI_ZOOMABLE_SPECTRUM_GRAPH_ID "zoomable_spectrum_graph" -#define UI_FILTER_POINT_THICK_ID "filter_point_thickness" -#define UI_DOCUMENTATION_PATH_ID "documentation_path" -#define UI_FILELIST_NAVIGAION_AUTOLOAD_ID "file_list_navigation_autoload" -#define UI_TAKE_INST_NAME_FROM_FILE_ID "take_instrument_name_from_file" - -#define MSTUD_PORT UI_CONFIG_PORT_PREFIX UI_MOUNT_STUD_PORT_ID -#define VERSION_PORT UI_CONFIG_PORT_PREFIX UI_LAST_VERSION_PORT_ID -#define DEFAULT_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_DEFAULT_PATH_ID -#define DEFAULT_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_DEFAULT_FTYPE_ID -#define SAMPLE_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SAMPLE_PATH_ID -#define SAMPLE_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SAMPLE_FTYPE_ID -#define IR_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_IR_PATH_ID -#define IR_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_IR_FTYPE_ID -#define CONFIG_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_CONFIG_PATH_ID -#define CONFIG_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_CONFIG_FTYPE_ID -#define MODEL3D_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_MODEL3D_PATH_ID -#define MODEL3D_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_MODEL3D_FTYPE_ID -#define REW_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_REW_PATH_ID -#define REW_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_REW_FTYPE_ID -#define HYDROGEN_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_HYDROGEN_PATH_ID -#define HYDROGEN_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_HYDROGEN_FTYPE_ID -#define LSPC_BUNDLE_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_LSPC_BUNDLE_PATH_ID -#define LSPC_BUNDLE_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_LSPC_BUNDLE_FTYPE_ID -#define SFZ_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SFZ_PATH_ID -#define SFZ_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SFZ_FTYPE_ID -#define R3D_BACKEND_PORT UI_CONFIG_PORT_PREFIX UI_R3D_BACKEND_PORT_ID -#define LANGUAGE_PORT UI_CONFIG_PORT_PREFIX UI_LANGUAGE_PORT_ID -#define REL_PATHS_PORT UI_CONFIG_PORT_PREFIX UI_REL_PATHS_PORT_ID -#define UI_SCALING_PORT UI_CONFIG_PORT_PREFIX UI_SCALING_PORT_ID -#define UI_SCALING_HOST_PORT UI_CONFIG_PORT_PREFIX UI_SCALING_HOST_PORT_ID -#define UI_FONT_SCALING_PORT UI_CONFIG_PORT_PREFIX UI_FONT_SCALING_PORT_ID -#define UI_BUNDLE_SCALING_PORT UI_CONFIG_PORT_PREFIX UI_BUNDLE_SCALING_PORT_ID -#define UI_VISUAL_SCHEMA_PORT UI_CONFIG_PORT_PREFIX UI_VISUAL_SCHEMA_FILE_ID -#define UI_PREVIEW_AUTO_PLAY_PORT UI_CONFIG_PORT_PREFIX UI_PREVIEW_AUTO_PLAY_ID -#define UI_ENABLE_KNOB_SCALE_ACTIONS_PORT UI_CONFIG_PORT_PREFIX UI_ENABLE_KNOB_SCALE_ACTIONS_ID -#define UI_USER_HYDROGEN_KIT_PATH_PORT UI_CONFIG_PORT_PREFIX UI_USER_HYDROGEN_KIT_PATH_ID -#define UI_OVERRIDE_HYDROGEN_KIT_PATH_PORT UI_CONFIG_PORT_PREFIX UI_OVERRIDE_HYDROGEN_KIT_PATH_ID -#define UI_OVERRIDE_HYDROGEN_KITS_PORT UI_CONFIG_PORT_PREFIX UI_OVERRIDE_HYDROGEN_KITS_ID -#define UI_INVERT_VSCROLL_PORT UI_CONFIG_PORT_PREFIX UI_INVERT_VSCROLL_ID -#define UI_GRAPH_DOT_INVERT_VSCROLL_PORT UI_CONFIG_PORT_PREFIX UI_GRAPH_DOT_INVERT_VSCROLL_ID -#define UI_ZOOMABLE_SPECTRUM_GRAPH_PORT UI_CONFIG_PORT_PREFIX UI_ZOOMABLE_SPECTRUM_GRAPH_ID -#define UI_FILTER_POINT_THICK_PORT UI_CONFIG_PORT_PREFIX UI_FILTER_POINT_THICK_ID -#define UI_DOCUMENTATION_PORT UI_CONFIG_PORT_PREFIX UI_DOCUMENTATION_PATH_ID -#define UI_FILELIST_NAVIGAION_AUTOLOAD_PORT UI_CONFIG_PORT_PREFIX UI_FILELIST_NAVIGAION_AUTOLOAD_ID -#define UI_TAKE_INST_NAME_FROM_FILE_PORT UI_CONFIG_PORT_PREFIX UI_TAKE_INST_NAME_FROM_FILE_ID +#define UI_CONFIG_PORT_PREFIX "_ui_" +#define UI_KVT_PORT_PREFIX "_kvt_" +#define UI_LAST_VERSION_PORT_ID "last_version" +#define UI_DLG_DEFAULT_PATH_ID "dlg_default_path" +#define UI_DLG_DEFAULT_FTYPE_ID "dlg_default_ftype" +#define UI_DLG_SAMPLE_PATH_ID "dlg_sample_path" +#define UI_DLG_SAMPLE_FTYPE_ID "dlg_sample_ftype" +#define UI_DLG_IR_PATH_ID "dlg_ir_path" +#define UI_DLG_IR_FTYPE_ID "dlg_ir_ftype" +#define UI_DLG_CONFIG_PATH_ID "dlg_config_path" +#define UI_DLG_CONFIG_FTYPE_ID "dlg_config_ftype" +#define UI_DLG_MODEL3D_PATH_ID "dlg_model3d_path" +#define UI_DLG_MODEL3D_FTYPE_ID "dlg_model3d_ftype" +#define UI_DLG_REW_PATH_ID "dlg_rew_path" +#define UI_DLG_REW_FTYPE_ID "dlg_rew_ftype" +#define UI_DLG_HYDROGEN_PATH_ID "dlg_hydrogen_path" +#define UI_DLG_HYDROGEN_FTYPE_ID "dlg_hydrogen_ftype" +#define UI_DLG_LSPC_BUNDLE_PATH_ID "dlg_lspc_bundle_path" +#define UI_DLG_LSPC_BUNDLE_FTYPE_ID "dlg_lspc_bundle_ftype" +#define UI_DLG_SFZ_PATH_ID "dlg_sfz_path" +#define UI_DLG_SFZ_FTYPE_ID "dlg_sfz_ftype" +#define UI_R3D_BACKEND_PORT_ID "r3d_backend" +#define UI_LANGUAGE_PORT_ID "language" +#define UI_REL_PATHS_PORT_ID "use_relative_paths" +#define UI_SCALING_PORT_ID "ui_scaling" +#define UI_SCALING_HOST_PORT_ID "ui_scaling_host" +#define UI_FONT_SCALING_PORT_ID "font_scaling" +#define UI_BUNDLE_SCALING_PORT_ID "ui_bundle_scaling" +#define UI_VISUAL_SCHEMA_FILE_ID "visual_schema_file" +#define UI_PREVIEW_AUTO_PLAY_ID "preview_auto_play" +#define UI_ENABLE_KNOB_SCALE_ACTIONS_ID "enable_knob_scale_actions" +#define UI_USER_HYDROGEN_KIT_PATH_ID "user_hydrogen_kit_path" +#define UI_OVERRIDE_HYDROGEN_KIT_PATH_ID "override_hydrogen_kit_path" +#define UI_OVERRIDE_HYDROGEN_KITS_ID "override_hydrogen_kits" +#define UI_INVERT_VSCROLL_ID "invert_vscroll" +#define UI_GRAPH_DOT_INVERT_VSCROLL_ID "invert_graph_dot_vscroll" +#define UI_ZOOMABLE_SPECTRUM_GRAPH_ID "zoomable_spectrum_graph" +#define UI_FILTER_POINT_THICK_ID "filter_point_thickness" +#define UI_DOCUMENTATION_PATH_ID "documentation_path" +#define UI_FILELIST_NAVIGATION_AUTOLOAD_ID "file_list_navigation_autoload" +#define UI_FILELIST_NAVIGATION_AUTOPLAY_ID "file_list_navigation_auto_play" +#define UI_TAKE_INST_NAME_FROM_FILE_ID "take_instrument_name_from_file" + +#define MSTUD_PORT UI_CONFIG_PORT_PREFIX UI_MOUNT_STUD_PORT_ID +#define VERSION_PORT UI_CONFIG_PORT_PREFIX UI_LAST_VERSION_PORT_ID +#define DEFAULT_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_DEFAULT_PATH_ID +#define DEFAULT_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_DEFAULT_FTYPE_ID +#define SAMPLE_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SAMPLE_PATH_ID +#define SAMPLE_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SAMPLE_FTYPE_ID +#define IR_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_IR_PATH_ID +#define IR_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_IR_FTYPE_ID +#define CONFIG_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_CONFIG_PATH_ID +#define CONFIG_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_CONFIG_FTYPE_ID +#define MODEL3D_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_MODEL3D_PATH_ID +#define MODEL3D_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_MODEL3D_FTYPE_ID +#define REW_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_REW_PATH_ID +#define REW_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_REW_FTYPE_ID +#define HYDROGEN_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_HYDROGEN_PATH_ID +#define HYDROGEN_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_HYDROGEN_FTYPE_ID +#define LSPC_BUNDLE_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_LSPC_BUNDLE_PATH_ID +#define LSPC_BUNDLE_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_LSPC_BUNDLE_FTYPE_ID +#define SFZ_PATH_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SFZ_PATH_ID +#define SFZ_FTYPE_PORT UI_CONFIG_PORT_PREFIX UI_DLG_SFZ_FTYPE_ID +#define R3D_BACKEND_PORT UI_CONFIG_PORT_PREFIX UI_R3D_BACKEND_PORT_ID +#define LANGUAGE_PORT UI_CONFIG_PORT_PREFIX UI_LANGUAGE_PORT_ID +#define REL_PATHS_PORT UI_CONFIG_PORT_PREFIX UI_REL_PATHS_PORT_ID +#define UI_SCALING_PORT UI_CONFIG_PORT_PREFIX UI_SCALING_PORT_ID +#define UI_SCALING_HOST_PORT UI_CONFIG_PORT_PREFIX UI_SCALING_HOST_PORT_ID +#define UI_FONT_SCALING_PORT UI_CONFIG_PORT_PREFIX UI_FONT_SCALING_PORT_ID +#define UI_BUNDLE_SCALING_PORT UI_CONFIG_PORT_PREFIX UI_BUNDLE_SCALING_PORT_ID +#define UI_VISUAL_SCHEMA_PORT UI_CONFIG_PORT_PREFIX UI_VISUAL_SCHEMA_FILE_ID +#define UI_PREVIEW_AUTO_PLAY_PORT UI_CONFIG_PORT_PREFIX UI_PREVIEW_AUTO_PLAY_ID +#define UI_FILELIST_NAVIGATION_AUTOPLAY_PORT UI_CONFIG_PORT_PREFIX UI_FILELIST_NAVIGATION_AUTOPLAY_ID +#define UI_ENABLE_KNOB_SCALE_ACTIONS_PORT UI_CONFIG_PORT_PREFIX UI_ENABLE_KNOB_SCALE_ACTIONS_ID +#define UI_USER_HYDROGEN_KIT_PATH_PORT UI_CONFIG_PORT_PREFIX UI_USER_HYDROGEN_KIT_PATH_ID +#define UI_OVERRIDE_HYDROGEN_KIT_PATH_PORT UI_CONFIG_PORT_PREFIX UI_OVERRIDE_HYDROGEN_KIT_PATH_ID +#define UI_OVERRIDE_HYDROGEN_KITS_PORT UI_CONFIG_PORT_PREFIX UI_OVERRIDE_HYDROGEN_KITS_ID +#define UI_INVERT_VSCROLL_PORT UI_CONFIG_PORT_PREFIX UI_INVERT_VSCROLL_ID +#define UI_GRAPH_DOT_INVERT_VSCROLL_PORT UI_CONFIG_PORT_PREFIX UI_GRAPH_DOT_INVERT_VSCROLL_ID +#define UI_ZOOMABLE_SPECTRUM_GRAPH_PORT UI_CONFIG_PORT_PREFIX UI_ZOOMABLE_SPECTRUM_GRAPH_ID +#define UI_FILTER_POINT_THICK_PORT UI_CONFIG_PORT_PREFIX UI_FILTER_POINT_THICK_ID +#define UI_DOCUMENTATION_PORT UI_CONFIG_PORT_PREFIX UI_DOCUMENTATION_PATH_ID +#define UI_FILELIST_NAVIGATION_AUTOLOAD_PORT UI_CONFIG_PORT_PREFIX UI_FILELIST_NAVIGATION_AUTOLOAD_ID +#define UI_TAKE_INST_NAME_FROM_FILE_PORT UI_CONFIG_PORT_PREFIX UI_TAKE_INST_NAME_FROM_FILE_ID // Special widget identifiers -#define WUID_MAIN_MENU "main_menu" -#define WUID_EXPORT_MENU "export_menu" -#define WUID_IMPORT_MENU "import_menu" -#define WUID_LANGUAGE_MENU "language_menu" -#define WUID_RESET_SETTINGS_MENU "reset_settings_menu" +#define WUID_MAIN_MENU "main_menu" +#define WUID_PRESETS_MENU "presets_menu" +#define WUID_EXPORT_MENU "export_menu" +#define WUID_IMPORT_MENU "import_menu" +#define WUID_LANGUAGE_MENU "language_menu" +#define WUID_RESET_SETTINGS_MENU "reset_settings_menu" // Special ports for handling current time -#define TIME_PORT_PREFIX "_time_" -#define TIME_SAMPLE_RATE_PORT "sr" -#define TIME_SPEED_PORT "speed" -#define TIME_FRAME_PORT "frame" -#define TIME_NUMERATOR_PORT "num" -#define TIME_DENOMINATOR_PORT "denom" -#define TIME_BEATS_PER_MINUTE_PORT "bpm" -#define TIME_TICK_PORT "tick" -#define TIME_TICKS_PER_BEAT_PORT "tpb" - -#define SAMPLE_RATE_PORT TIME_PORT_PREFIX TIME_SAMPLE_RATE_PORT -#define SPEED_PORT TIME_PORT_PREFIX TIME_SPEED_PORT -#define FRAME_PORT TIME_PORT_PREFIX TIME_FRAME_PORT -#define NUMERATOR_PORT TIME_PORT_PREFIX TIME_NUMERATOR_PORT -#define DENOMINATOR_PORT TIME_PORT_PREFIX TIME_DENOMINATOR_PORT -#define BEATS_PER_MINUTE_PORT TIME_PORT_PREFIX TIME_BEATS_PER_MINUTE_PORT -#define TICK_PORT TIME_PORT_PREFIX TIME_TICK_PORT -#define TICKS_PER_BEAT_PORT TIME_PORT_PREFIX TIME_TICKS_PER_BEAT_PORT +#define TIME_PORT_PREFIX "_time_" +#define TIME_SAMPLE_RATE_PORT "sr" +#define TIME_SPEED_PORT "speed" +#define TIME_FRAME_PORT "frame" +#define TIME_NUMERATOR_PORT "num" +#define TIME_DENOMINATOR_PORT "denom" +#define TIME_BEATS_PER_MINUTE_PORT "bpm" +#define TIME_TICK_PORT "tick" +#define TIME_TICKS_PER_BEAT_PORT "tpb" + +#define SAMPLE_RATE_PORT TIME_PORT_PREFIX TIME_SAMPLE_RATE_PORT +#define SPEED_PORT TIME_PORT_PREFIX TIME_SPEED_PORT +#define FRAME_PORT TIME_PORT_PREFIX TIME_FRAME_PORT +#define NUMERATOR_PORT TIME_PORT_PREFIX TIME_NUMERATOR_PORT +#define DENOMINATOR_PORT TIME_PORT_PREFIX TIME_DENOMINATOR_PORT +#define BEATS_PER_MINUTE_PORT TIME_PORT_PREFIX TIME_BEATS_PER_MINUTE_PORT +#define TICK_PORT TIME_PORT_PREFIX TIME_TICK_PORT +#define TICKS_PER_BEAT_PORT TIME_PORT_PREFIX TIME_TICKS_PER_BEAT_PORT #endif /* LSP_PLUG_IN_PLUG_FW_UI_CONST_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/presets.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/presets.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/presets.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui/presets.h 2025-08-26 18:15:48.073961093 +0000 @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 24 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_UI_PRESETS_H_ +#define LSP_PLUG_IN_PLUG_FW_UI_PRESETS_H_ + +#include + +#ifndef LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ + #error "Use #include " +#endif /* LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ */ + +#include + +namespace lsp +{ + namespace ui + { + enum preset_flags_t + { + PRESET_FLAG_NONE = 0, + PRESET_FLAG_USER = 1 << 0, // User-defined preset + PRESET_FLAG_PATCH = 1 << 1, // Preset is modified by user + PRESET_FLAG_FAVOURITE = 1 << 2, // Preset marked as a favourite + }; + + enum preset_tab_t + { + PRESET_TAB_ALL, + PRESET_TAB_FACTORY, + PRESET_TAB_USER, + PRESET_TAB_FAVOURITES, + + PRESET_TAB_TOTAL + }; + + typedef struct preset_t + { + LSPString name; // Name of the preset + LSPString path; // Location of the preset + uint32_t flags; // Preset flags + } preset_t; + + typedef bool (*preset_filter_t)(const ui::preset_t *preset); + + ssize_t preset_compare_function(const preset_t *a, const preset_t *b); + + bool is_any_preset(const ui::preset_t *preset); + bool is_factory_preset(const ui::preset_t *preset); + bool is_user_preset(const ui::preset_t *preset); + bool is_favourite_preset(const ui::preset_t *preset); + + } /* namespace ui */ +} /* namespace lsp */ + +#endif /* LSP_PLUG_IN_PLUG_FW_UI_PRESETS_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui.h 2025-03-01 12:42:57.432644544 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/ui.h 2025-08-26 18:15:48.073961093 +0000 @@ -27,7 +27,10 @@ #define LSP_PLUG_IN_PLUG_FW_UI_IMPL_H_ #include + #include + #include + #include #include #include #include diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/util/validator/validator.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/util/validator/validator.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/util/validator/validator.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/util/validator/validator.h 2025-08-26 18:15:48.077961054 +0000 @@ -61,6 +61,7 @@ namespace lsp lltl::pphash port_ids; lltl::pphash clap_port_ids; lltl::pphash vst3_port_ids; + lltl::pphash port_short_names; } context_t; namespace ladspa diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/version.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/version.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/version.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/version.h 2025-08-26 18:15:48.077961054 +0000 @@ -24,7 +24,7 @@ #define LSP_PLUGIN_FW_MAJOR 1 #define LSP_PLUGIN_FW_MINOR 0 -#define LSP_PLUGIN_FW_MICRO 29 +#define LSP_PLUGIN_FW_MICRO 31 #if defined(LSP_PLUGIN_FW_PUBLISHER) #define LSP_PLUGIN_FW_PUBLIC LSP_EXPORT_MODIFIER diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/data.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/data.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/data.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/data.h 2025-08-26 18:15:48.077961054 +0000 @@ -36,7 +36,9 @@ namespace lsp namespace clap { constexpr uint32_t LSP_CLAP_MAGIC = 0x2050534C; - constexpr uint32_t LSP_CLAP_VERSION = 0x1; + constexpr uint32_t LSP_CLAP_VERSION_1 = 0x1; + constexpr uint32_t LSP_CLAP_VERSION_2 = 0x2; + constexpr uint32_t LSP_CLAP_VERSION_CURRENT = LSP_CLAP_VERSION_2; enum serial_flags_t { diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/helpers.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/helpers.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/helpers.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/helpers.h 2025-08-26 18:15:48.077961054 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 1 янв. 2023 г. @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -79,30 +80,18 @@ namespace lsp inline plug::mesh_t *create_mesh(const meta::port_t *meta) { - size_t buffers = meta->step; - size_t buf_size = meta->start * sizeof(float); - size_t mesh_size = sizeof(plug::mesh_t) + sizeof(float *) * buffers; - - // Align values to 64-byte boundaries - buf_size = align_size(buf_size, 0x40); - mesh_size = align_size(mesh_size, 0x40); + const size_t buffers = meta->step; + const size_t buf_size = align_size(meta->start * sizeof(float), 0x40); + const size_t mesh_size = align_size(sizeof(plug::mesh_t) + sizeof(float *) * buffers, 0x40); // Allocate pointer - uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); + uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); if (ptr == NULL) return NULL; - // Initialize references - plug::mesh_t *mesh = reinterpret_cast(ptr); - mesh->nState = plug::M_EMPTY; - mesh->nBuffers = 0; - mesh->nItems = 0; - ptr += mesh_size; - for (size_t i=0; ipvData[i] = reinterpret_cast(ptr); - ptr += buf_size; - } + // Initialize mesh + plug::mesh_t *mesh = advance_ptr_bytes(ptr, mesh_size); + mesh->init(reinterpret_cast(ptr), buffers, buf_size / sizeof(float)); return mesh; } @@ -171,6 +160,34 @@ namespace lsp } /** + * Read the variable-size block from the CLAP input streem + * @param is CLAP input stream + * @param buf target buffer to read the data to + * @param capacity the variable that stores buffer capacity + * @param count number of bytes to read + * @return status of operation + */ + inline status_t read_fully(const clap_istream_t *is, void **buf, size_t *capacity, size_t count) + { + // Reallocate memory if there is not enough space + uint8_t *s = reinterpret_cast(*buf); + size_t cap = *capacity; + if ((s == NULL) || (cap < count)) + { + cap = align_size(count, 32); + uint8_t *ns = static_cast(realloc(s, sizeof(uint8_t) * cap)); + if (ns == NULL) + return STATUS_NO_MEM; + + s = ns; + *buf = ns; + *capacity = cap; + } + + return read_fully(is, *buf, count); + } + + /** * Read simple data type from the CLAP input stream * @param is CLAP input stream * @param value value to write @@ -186,6 +203,12 @@ namespace lsp return STATUS_OK; } + /** + * Write variable-length integer + * @param os CLAP output stream + * @param value integer to write + * @return status of operation + */ inline status_t write_varint(const clap_ostream_t *os, size_t value) { do { @@ -201,6 +224,22 @@ namespace lsp } /** + * Get size of serialized variable-length integer + * @param value variable-length integer + * @return number of bytes used to serialize value + */ + inline size_t szof_varint(size_t value) + { + size_t szof = 0; + do { + ++szof; + value >>= 7; + } while (value > 0); + + return szof; + } + + /** * Write string to CLAP output stream * @param os CLAP output stream * @param s NULL_terminated string to write @@ -208,7 +247,7 @@ namespace lsp */ inline status_t write_string(const clap_ostream_t *os, const char *s) { - size_t len = strlen(s); + const size_t len = strlen(s); // Write variable-sized string length status_t res = write_varint(os, len); @@ -220,6 +259,17 @@ namespace lsp } /** + * Set serialized string size + * @param s string + * @return serialized string size + */ + inline size_t szof_string(const char *s) + { + const size_t len = strlen(s); + return szof_varint(len) + len; + } + + /** * Read the variable-sized integer * @param is input stream to perform read * @param value the pointer to store the read value @@ -302,7 +352,7 @@ namespace lsp if ((s == NULL) || (cap < (len + 1))) { cap = align_size(len + 1, 32); - char *ns = static_cast(realloc(s, sizeof(char *) * cap)); + char *ns = static_cast(realloc(s, sizeof(char) * cap)); if (ns == NULL) return STATUS_NO_MEM; @@ -319,6 +369,46 @@ namespace lsp return STATUS_OK; } + inline status_t read_preset_state(const clap_istream_t *is, core::preset_state_t *state) + { + // Read variable-sized preset length + size_t len = 0; + status_t res = read_varint(is, &len); + if (res != STATUS_OK) + return res; + + core::init_preset_state(state); + uint32_t flags = 0, tab = 0; + if ((res = read_fully(is, &flags)) != STATUS_OK) + return res; + if ((res = read_fully(is, &tab)) != STATUS_OK) + return res; + if ((res = read_string(is, state->name, core::PRESET_NAME_BYTES)) != STATUS_OK) + return res; + + state->flags = flags; + state->tab = tab; + + const size_t szof = sizeof(uint32_t) * 2 + szof_string(state->name); + + return (len == szof) ? STATUS_OK : STATUS_BAD_STATE; + } + + inline status_t write_preset_state(const clap_ostream_t *os, const core::preset_state_t *state) + { + // Read variable-sized preset length + status_t res; + const size_t szof = sizeof(uint32_t) * 2 + szof_string(state->name); + + if ((res = write_varint(os, szof)) != STATUS_OK) + return res; + if ((res = write_fully(os, uint32_t(state->flags))) != STATUS_OK) + return res; + if ((res = write_fully(os, uint32_t(state->tab))) != STATUS_OK) + return res; + return write_string(os, state->name); + } + inline float to_clap_value(const meta::port_t *meta, float value, float *min_value, float *max_value) { float min = 0.0f, max = 1.0f, step = 0.0f; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/ui_wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/ui_wrapper.h 2025-08-26 18:15:48.077961054 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-comp-delay * Created on: 5 янв. 2023 г. @@ -44,6 +44,7 @@ namespace lsp fScaling = -100.0f; pParent = NULL; pTransientFor = NULL; + bUIInitialized = false; bRequestProcess = false; bUIActive = false; @@ -304,40 +305,44 @@ namespace lsp case meta::R_PATH: lsp_trace("creating path port %s", port->id); - cup = new clap::UIPathPort(cp); + cup = new clap::UIPathPort(cp, this); break; case meta::R_STRING: lsp_trace("creating string port %s", port->id); - cup = new clap::UIStringPort(cp); + cup = new clap::UIStringPort(cp, this); break; case meta::R_SEND_NAME: lsp_trace("creating send name port %s", port->id); - cup = new clap::UIStringPort(cp); + cup = new clap::UIStringPort(cp, this); break; case meta::R_RETURN_NAME: lsp_trace("creating return name port %s", port->id); - cup = new clap::UIStringPort(cp); + cup = new clap::UIStringPort(cp, this); break; case meta::R_CONTROL: - case meta::R_METER: + lsp_trace("creating parameter port %s", port->id); + cup = new clap::UIParameterPort(static_cast(cp), &bRequestProcess, this); + break; + case meta::R_BYPASS: - lsp_trace("creating regular port %s", port->id); - // VST specifies only INPUT parameters, output should be read in different way - if (meta::is_out_port(port)) - cup = new clap::UIMeterPort(cp); - else - cup = new clap::UIParameterPort(static_cast(cp), &bRequestProcess); + lsp_trace("creating bypass port %s", port->id); + cup = new clap::UIParameterPort(static_cast(cp), &bRequestProcess, NULL); + break; + + case meta::R_METER: + lsp_trace("creating meter port %s", port->id); + cup = new clap::UIMeterPort(cp); break; case meta::R_PORT_SET: { char postfix_buf[MAX_PARAM_ID_BYTES], param_name[MAX_PARAM_ID_BYTES]; lsp_trace("creating port group %s", port->id); - UIPortGroup *upg = new clap::UIPortGroup(static_cast(cp), &bRequestProcess); + UIPortGroup *upg = new clap::UIPortGroup(static_cast(cp), &bRequestProcess, this); // Add immediately port group to list vPorts.add(upg); @@ -650,6 +655,10 @@ namespace lsp *height = lsp_min(sr.nMinHeight, 32); } + lsp_trace("return width = %d, height = %d", + (width != NULL) ? int(*width) : 0, + (height != NULL) ? int(*height) : 0); + return true; } @@ -680,7 +689,7 @@ namespace lsp ws::size_limit_t sr; wnd->get_padded_size_limits(&sr); - hints->can_resize_horizontally = (sr.nMaxWidth < 0) || (sr.nMaxWidth > sr.nMinWidth); + hints->can_resize_horizontally = (sr.nMaxWidth < 0) || (sr.nMaxWidth > sr.nMinWidth); hints->can_resize_vertically = (sr.nMaxHeight< 0) || (sr.nMaxHeight > sr.nMinHeight); hints->preserve_aspect_ratio = false; @@ -711,6 +720,13 @@ namespace lsp tk::SizeConstraints::apply(&r, &sr); + lsp_trace("adjust size width = %d -> %d, height = %d -> %d", + *width, int(r.nWidth), + *height, int(r.nHeight)); + + if ((r.nWidth > ssize_t(*width)) || (r.nHeight > ssize_t(*height))) + return false; + *width = r.nWidth; *height = r.nHeight; @@ -727,13 +743,26 @@ namespace lsp return false; lsp_finally { sMutex.unlock(); }; + // Ensure that we can resize the window to the desired size ws::rectangle_t r; - wnd->get_padded_screen_rectangle(&r); + ws::size_limit_t sr; + wnd->get_padded_size_limits(&sr); + r.nLeft = 0; + r.nTop = 0; + r.nWidth = width; + r.nHeight = height; + + tk::SizeConstraints::apply(&r, &sr); + if ((r.nWidth > ssize_t(width)) || (r.nHeight > ssize_t(height))) + return false; + + // Check that we need to resize window + wnd->get_padded_screen_rectangle(&r); if ((r.nWidth != ssize_t(width)) && (r.nHeight != ssize_t(height))) { - lsp_trace("width = {%d, %d}, height = {%d, %d}, call for resize", - int(r.nWidth), int(width), int(r.nHeight), int(height)); + lsp_trace("width = %d -> %d, height = %d -> %d, call for resize", + int(width), int(r.nWidth), int(height), int(r.nHeight)); wnd->resize_window(width, height); } @@ -836,8 +865,12 @@ namespace lsp return; // Perform main data transfers and state sync + core::preset_state_t state; tranfet_ui_to_dsp(); transfer_dsp_to_ui(); + if (pWrapper->fetch_preset_state(&state, false)) + receive_preset_state(&state); + IWrapper::main_iteration(); } @@ -874,6 +907,11 @@ namespace lsp pExt->gui->request_resize(pExt->host, sr.nMinWidth, sr.nMinHeight); } + // Fetch preset state + core::preset_state_t state; + if (pWrapper->fetch_preset_state(&state, true)) + receive_preset_state(&state); + // Update UI status bUIActive = true; if (pWrapper != NULL) @@ -913,6 +951,12 @@ namespace lsp return STATUS_OK; } + void UIWrapper::send_preset_state(const core::preset_state_t *state) + { + if (pWrapper != NULL) + pWrapper->set_preset_state(state, clap::Wrapper::PT_STATE); + } + } /* namespace clap */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/impl/wrapper.h 2025-08-26 18:15:48.077961054 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 дек. 2022 г. @@ -55,10 +55,13 @@ namespace lsp nLatency = 0; nTailSize = 0; - nDumpReq = 0; + atomic_store(&nDumpReq, 0); nDumpResp = 0; - nStateReq = 0; + atomic_store(&nStateReq, 0); nStateResp = 0; + atomic_store(&nPresetFlags, 0); + + core::init_preset_state(&sPresetState); bLatencyChanged = false; bUpdateSettings = true; @@ -772,6 +775,45 @@ namespace lsp { } + void Wrapper::process_transport_event(const clap_event_transport_t *ev) + { +// lsp_trace("CLAP_EVENT_TRANSPORT: " +// "flags=0x%x, song_pos_beats=%lld, song_pos_seconds=%lld, tempo=%f, tempo_inc=%f, " +// "loop_start_beats=%lld, loop_end_beats=%lld, loop_start_seconds=%lld, loop_end_seconds=%lld, " +// "bar_start=%lld, bar_number=%d, tsig_num=%d, tsig_denom=%d", +// int(ev->flags), +// (long long)(ev->song_pos_beats), +// (long long)(ev->song_pos_seconds), +// ev->tempo, +// ev->tempo_inc, +// (long long)(ev->loop_start_beats), +// (long long)(ev->loop_end_beats), +// (long long)(ev->loop_start_seconds), +// (long long)(ev->loop_end_seconds), +// (long long)(ev->bar_start), +// int(ev->bar_number), +// int(ev->tsig_num), +// int(ev->tsig_denom)); + + // Update the transport state + if (ev->flags & CLAP_TRANSPORT_HAS_TEMPO) + { + sPosition.beatsPerMinute = ev->tempo; + sPosition.beatsPerMinuteChange = ev->tempo_inc; + } + if (ev->flags & CLAP_TRANSPORT_HAS_TIME_SIGNATURE) + { + sPosition.numerator = ev->tsig_num; + sPosition.denominator = ev->tsig_denom; + } + if (ev->flags & CLAP_TRANSPORT_HAS_BEATS_TIMELINE) + { + sPosition.frame = sPosition.sampleRate * (ev->song_pos_seconds / double(CLAP_SECTIME_FACTOR)); + sPosition.ticksPerBeat = DEFAULT_TICKS_PER_BEAT; + sPosition.tick = (sPosition.ticksPerBeat * double(ev->song_pos_beats - ev->bar_start) * sPosition.numerator * sPosition.beatsPerMinute) / (60.0 * CLAP_BEATTIME_FACTOR); + } + } + size_t Wrapper::prepare_block(size_t *ev_index, size_t offset, const clap_process_t *process) { // There are no more events in the block? @@ -802,6 +844,9 @@ namespace lsp { // Fetch the event until it's timestamp is not out of the block const clap_event_header_t *hdr = process->in_events->get(process->in_events, i); + lsp_trace("i=%d, event: size=%d, time=%d, space_id=%d, type=%d, flags=0x%x, last_time=%d", + int(hdr->size), int(hdr->time), int(hdr->space_id), int(hdr->type), int(hdr->flags), int(last_time)); + if ((hdr->space_id != CLAP_CORE_EVENT_SPACE_ID) || (hdr->time < offset)) continue; else if (hdr->time >= last_time) @@ -869,23 +914,7 @@ namespace lsp case CLAP_EVENT_TRANSPORT: { const clap_event_transport_t *ev = reinterpret_cast(hdr); - // Update the transport state - if (ev->flags & CLAP_TRANSPORT_HAS_TEMPO) - { - sPosition.beatsPerMinute = ev->tempo; - sPosition.beatsPerMinuteChange = ev->tempo_inc; - } - if (ev->flags & CLAP_TRANSPORT_HAS_TIME_SIGNATURE) - { - sPosition.numerator = ev->tsig_num; - sPosition.denominator = ev->tsig_denom; - } - if (ev->flags & CLAP_TRANSPORT_HAS_BEATS_TIMELINE) - { - sPosition.frame = sPosition.sampleRate * (ev->song_pos_seconds / double(CLAP_SECTIME_FACTOR)); - sPosition.ticksPerBeat = DEFAULT_TICKS_PER_BEAT; - sPosition.tick = (sPosition.ticksPerBeat * double(ev->song_pos_beats - ev->bar_start) * sPosition.numerator * sPosition.beatsPerMinute) / (60.0 * CLAP_BEATTIME_FACTOR); - } + process_transport_event(ev); break; } case CLAP_EVENT_MIDI: @@ -1064,6 +1093,10 @@ namespace lsp } } + // Update transport if it is present + if (process->transport != NULL) + process_transport_event(process->transport); + // Sync the parameter ports with the UI for (size_t i=0, n=vParamPorts.size(); ideserialize(is)) != STATUS_OK) - { - lsp_warn("Failed to deserialize port id=%s", name); - return res; - } - } - else - { - if ((res = read_value(is, name, &p)) != STATUS_OK) - { - lsp_warn("Failed to read value for port id=%s", name); - return res; - } - lsp_warn("Missing port id=%s, skipping", name); - } - } - else + if (name[0] == '/') { // Read the KVT parameter flags uint8_t flags = 0; @@ -1887,6 +1911,52 @@ namespace lsp sKVT.put(name, &p, kflags); } } + else if ((name[0] == '!') && (has_preset_settings)) + { + // Special variables + if (strcmp(name, "!preset_settings") == 0) + { + core::preset_state_t state; + if ((res = read_preset_state(is, &state)) != STATUS_OK) + { + lsp_warn("Error reading preset state, code=%d", int(res)); + return res; + } + + set_preset_state(&state, PT_STATE); + } + else + { + lsp_trace("Unknown special variable %s, skipping", name); + if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) + { + lsp_warn("Failed to skip special variable"); + return res; + } + } + } + else + { + // Obtain the port by it's identifier + clap::Port *cp = find_by_id(name); + if (cp != NULL) + { + if ((res = cp->deserialize(is)) != STATUS_OK) + { + lsp_warn("Failed to deserialize port id=%s", name); + return res; + } + } + else + { + if ((res = read_value(is, name, &p)) != STATUS_OK) + { + lsp_warn("Failed to read value for port id=%s", name); + return res; + } + lsp_warn("Missing port id=%s, skipping", name); + } + } } // Analyze result @@ -2174,6 +2244,131 @@ namespace lsp return (pShmClient != NULL) ? pShmClient->state() : NULL; } + void Wrapper::set_preset_state(const core::preset_state_t *state, size_t mode) + { + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d, mode=%d", + this, state->name, state->flags, state->tab, int(mode)); + + { + // Lock the state + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if ((flags & PT_TYPE) > mode) // Leave if data has greater priority than submitted + { + lsp_trace("preset state not updated, flags=0x%x, mode=%d", int(flags), int(mode)); + return; + } + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, mode & (~PT_LOCK))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + core::copy_preset_state(&sPresetState, state); + } + + // Mark state changed if data was transferred from UI + if (mode == PT_UI) + state_changed(); + + lsp_trace("this=%p, mode=0x%x", this, int(mode)); + } + + bool Wrapper::fetch_preset_state(core::preset_state_t *state, bool force) + { + { + // Lock the state + while (true) + { + // We can fetch data only if it is in PT_STATE state or fetch is forced + const uatomic_t flags = atomic_load(&nPresetFlags); + if ((!force) && ((flags & PT_TYPE) != PT_STATE)) + return false; + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, flags & (~(PT_LOCK | PT_TYPE)))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + // Now we have locked state + core::copy_preset_state(state, &sPresetState); + } + + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d", + this, state->name, state->flags, state->tab); + return true; + } + + status_t Wrapper::serialize_preset_settings(const clap_ostream_t *os) + { + core::preset_state_t state; + + { + // Lock the atomic state + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // Now we have locked state + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, flags & (~PT_LOCK))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + // Fetch the value + core::copy_preset_state(&state, &sPresetState); + } + + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d, mode=0x%x", + this, state.name, state.flags, state.tab); + + // Serialize stuff + status_t res; + if ((res = write_string(os, "!preset_settings")) != STATUS_OK) + return res; + + return write_preset_state(os, &state); + } + } /* namespace clap */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_ports.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_ports.h 2025-08-26 18:15:48.077961054 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-comp-delay * Created on: 5 янв. 2023 г. @@ -68,14 +68,16 @@ namespace lsp class UIParameterPort: public UIPort { protected: - float fValue; - uatomic_t nSID; - bool *bRqFlag; + ui::IPresetManager *pManager; + float fValue; + uatomic_t nSID; + bool *bRqFlag; public: - explicit UIParameterPort(clap::ParameterPort *port, bool *rq_flag): + explicit UIParameterPort(clap::ParameterPort *port, bool *rq_flag, ui::IPresetManager *manager): UIPort(port->metadata(), port) { + pManager = manager; fValue = pMetadata->start; nSID = port->sid() - 1; bRqFlag = rq_flag; @@ -100,15 +102,25 @@ namespace lsp virtual void set_value(float value) override { - fValue = meta::limit_value(pMetadata, value); + lsp_trace("this=%p, id=%s, value=%f", this, id(), value); + value = meta::limit_value(pMetadata, value); + if (value == fValue) + return; + + fValue = value; if (bRqFlag != NULL) *bRqFlag = true; - if (pPort == NULL) return; clap::ParameterPort *port = static_cast(pPort); port->write_value(value); + + if (pManager != NULL) + { + pManager->mark_active_preset_dirty(); + lsp_trace("mark_active_preset_dirty"); + } } virtual bool sync() override @@ -135,7 +147,8 @@ namespace lsp class UIPortGroup: public UIParameterPort { public: - explicit UIPortGroup(clap::PortGroup *port, bool *rq_flag) : UIParameterPort(port, rq_flag) + explicit UIPortGroup(clap::PortGroup *port, bool *rq_flag, ui::IPresetManager *manager): + UIParameterPort(port, rq_flag, manager) { } @@ -330,11 +343,13 @@ namespace lsp class UIPathPort: public UIPort { private: - clap::path_t *pPath; + ui::IPresetManager *pManager; + clap::path_t *pPath; public: - explicit UIPathPort(clap::Port *port): UIPort(port->metadata(), port) + explicit UIPathPort(clap::Port *port, ui::IPresetManager *manager): UIPort(port->metadata(), port) { + pManager = manager; plug::path_t *path = pPort->buffer(); if (path != NULL) pPath = static_cast(path); @@ -371,8 +386,12 @@ namespace lsp virtual void write(const void *buffer, size_t size, size_t flags) override { - if (pPath != NULL) - pPath->submit(static_cast(buffer), size, true, flags); + if (pPath == NULL) + return; + + pPath->submit(static_cast(buffer), size, true, flags); + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void set_default() override @@ -384,13 +403,16 @@ namespace lsp class UIStringPort: public UIPort { private: + ui::IPresetManager *pManager; plug::string_t *pValue; char *pData; uint32_t nSerial; public: - explicit UIStringPort(clap::Port *port): UIPort(port->metadata(), port) + explicit UIStringPort(clap::Port *port, ui::IPresetManager *manager): UIPort(port->metadata(), port) { + pManager = manager; + clap::StringPort *sp = static_cast(port); pValue = sp->data(); pData = (pValue != NULL) ? reinterpret_cast(malloc(pValue->max_bytes() + 1)) : NULL; @@ -455,6 +477,9 @@ namespace lsp nSerial = pValue->submit(buffer, size, flags & plug::PF_STATE_RESTORE); lsp_trace("Submitted id=%s, count=%d, buffer=%s, size=%d, value=%s", id(), int(count), buffer, int(size), pData); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void set_default() override diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/ui_wrapper.h 2025-08-26 18:15:48.077961054 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 5 янв. 2023 г. @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -105,6 +106,7 @@ namespace lsp virtual bool accept_window_size(tk::Window *wnd, size_t width, size_t height) override; virtual meta::plugin_format_t plugin_format() const override; virtual const core::ShmState *shm_state() override; + virtual void send_preset_state(const core::preset_state_t *state) override; public: // CLAP API bool set_scale(double scale); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/clap/wrapper.h 2025-08-26 18:15:48.077961054 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -60,6 +61,17 @@ namespace lsp */ class Wrapper: public plug::IWrapper { + public: + enum preset_type_t + { + PT_NONE = 0, + PT_UI = 1, + PT_STATE = 2, + + PT_TYPE = 0x000f, + PT_LOCK = 0x8000 + }; + protected: typedef struct audio_group_t { @@ -77,12 +89,14 @@ namespace lsp const meta::package_t *pPackage; // Package metadata clap::HostExtensions *pExt; // CLAP Extensions ipc::IExecutor *pExecutor; // Executor service + core::preset_state_t sPresetState; // Preset state int32_t nLatency; // The actual plugin latency int32_t nTailSize; // Tail size uatomic_t nDumpReq; // State dump request counter uatomic_t nDumpResp; // State dump response counter uatomic_t nStateReq; // Current version of the state uatomic_t nStateResp; // Last reported version of the state + uatomic_t nPresetFlags; // Preset flags #ifdef WITH_UI_FEATURE const meta::plugin_t *pUIMetadata; // UI metadata @@ -132,7 +146,9 @@ namespace lsp status_t generate_audio_port_groups(const meta::plugin_t *meta); clap::ParameterPort *find_param(clap_id param_id); size_t prepare_block(size_t *ev_index, size_t offset, const clap_process_t *process); + void process_transport_event(const clap_event_transport_t *ev); void generate_output_events(size_t offset, const clap_process_t *process); + status_t serialize_preset_settings(const clap_ostream_t *os); #ifdef WITH_UI_FEATURE protected: @@ -211,6 +227,8 @@ namespace lsp inline core::SamplePlayer *sample_player(); void request_state_dump(); inline HostExtensions *extensions(); + void set_preset_state(const core::preset_state_t *state, size_t mode); + bool fetch_preset_state(core::preset_state_t *state, bool force); #ifdef WITH_UI_FEATURE public: diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/common/libpath.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/common/libpath.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/common/libpath.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/common/libpath.h 2025-08-26 18:15:48.077961054 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 22 янв. 2021 г. @@ -36,6 +36,7 @@ namespace lsp { +#if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD) typedef struct getlibpath_path_t { char **paths; @@ -229,6 +230,7 @@ namespace lsp buf->size += n; } } +#endif #if defined(PLATFORM_LINUX) /** @@ -390,10 +392,14 @@ namespace lsp */ static char **get_library_paths(const char **exclude) { +#if defined(PLATFORM_LINUX) + char **res = NULL; + if (getlibpath_proc(&res, exclude)) + return res; +#elif defined(PLATFORM_BSD) char **res = NULL; if (getlibpath_proc(&res, exclude)) return res; -#if defined(PLATFORM_BSD) if (getlibpath_procstat(&res, exclude)) return res; #endif /* PLATFORM_BSD */ @@ -437,7 +443,7 @@ namespace lsp return path; } -} +} /* namespace lsp */ #endif /* LSP_PLUG_IN_PLUG_FW_WRAP_COMMON_LIBPATH_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/gstreamer/impl/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/gstreamer/impl/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/gstreamer/impl/wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/gstreamer/impl/wrapper.h 2025-08-26 18:15:48.081961014 +0000 @@ -981,7 +981,7 @@ namespace lsp for (size_t i=0, n=vSink.size(); ideinterleave(&in_buf[offset*nChannels + i], nChannels, to_do); @@ -1023,7 +1023,7 @@ namespace lsp for (size_t i=0, n=vSource.size(); iinterleave(&out_buf[offset*nChannels + i], nChannels, to_do); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/ui_wrapper.h 2025-08-26 18:15:48.081961014 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 31 янв. 2022 г. @@ -261,19 +261,22 @@ namespace lsp break; case meta::R_PATH: - jup = new jack::UIPathPort(jp); + jup = new jack::UIPathPort(jp, this); break; case meta::R_STRING: case meta::R_SEND_NAME: case meta::R_RETURN_NAME: - jup = new jack::UIStringPort(jp); + jup = new jack::UIStringPort(jp, this); vSyncPorts.add(jup); break; case meta::R_CONTROL: + jup = new jack::UIControlPort(jp, this); + break; + case meta::R_BYPASS: - jup = new jack::UIControlPort(jp); + jup = new jack::UIControlPort(jp, NULL); break; case meta::R_METER: @@ -285,7 +288,7 @@ namespace lsp { LSPString postfix_str; jack::PortGroup *pg = static_cast(jp); - jack::UIPortGroup *upg = new jack::UIPortGroup(pg); + jack::UIPortGroup *upg = new jack::UIPortGroup(pg, this); vPorts.add(upg); for (size_t row=0; rowrows(); ++row) @@ -396,14 +399,19 @@ namespace lsp } // Transfer the values of the ports to the UI - size_t sync = vSyncPorts.size(); - for (size_t i=0; ilock_meters_soft()) { - jack::UIPort *jup = vSyncPorts.uget(i); - do { - if (jup->sync()) - jup->notify_all(ui::PORT_NONE); - } while (jup->sync_again()); + lsp_finally { pWrapper->unlock_meters(); }; + + size_t sync = vSyncPorts.size(); + for (size_t i=0; isync()) + jup->notify_all(ui::PORT_NONE); + } while (jup->sync_again()); + } } // Synchronize KVT state diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/impl/wrapper.h 2025-08-26 18:15:48.081961014 +0000 @@ -31,10 +31,12 @@ namespace lsp { namespace jack { - Wrapper::Wrapper(jack::Factory *factory, plug::Module *plugin, resource::ILoader *loader): IWrapper(plugin, loader) + Wrapper::Wrapper(jack::Factory *factory, plug::Module *plugin, resource::ILoader *loader, const wrapper_info_t *info): + IWrapper(plugin, loader) { pFactory = factory; pClient = NULL; + sClientName = (info->client_name != NULL) ? strdup(info->client_name) : NULL; nState = S_CREATED; bUpdateSettings = true; nLatency = 0; @@ -48,6 +50,8 @@ namespace lsp atomic_store(&nDumpReq, 0); nDumpResp = 0; + atomic_init(nLockMeters); + pSamplePlayer = NULL; pShmClient = NULL; @@ -57,6 +61,11 @@ namespace lsp Wrapper::~Wrapper() { pClient = NULL; + if (sClientName != NULL) + { + free(sClientName); + sClientName = NULL; + } nState = S_CREATED; nLatency = 0; pExecutor = NULL; @@ -213,11 +222,24 @@ namespace lsp status_t Wrapper::connect() { - // Ensure that client identifier is not longer than jack_client_name_size() - size_t max_client_size = jack_client_name_size(); - char *client_name = static_cast(alloca(max_client_size)); - strncpy(client_name, pPlugin->metadata()->uid, max_client_size); - client_name[max_client_size-1] = '\0'; + // Init client identifier and ensure that it is not longer than jack_client_name_size() + char *client_name = NULL; + lsp_finally { + if (client_name != NULL) + free(client_name); + }; + { + const size_t max_client_size = jack_client_name_size(); + client_name = static_cast(malloc(max_client_size)); + if (client_name == NULL) + return STATUS_NO_MEM; + + strncpy( + client_name, + (sClientName != NULL) ? sClientName : pPlugin->metadata()->uid, + max_client_size); + client_name[max_client_size-1] = '\0'; + } // Check connection state switch (nState) @@ -429,6 +451,19 @@ namespace lsp if (dp != NULL) dp->after_process(samples); } + + // Commit meters + if (lock_meters()) + { + lsp_finally { unlock_meters(); }; + for (size_t i=0, n=vMeters.size(); icommit(); + } + } + return 0; } @@ -510,6 +545,7 @@ namespace lsp delete p; } vParams.flush(); + vMeters.flush(); vAllPorts.flush(); vSortedPorts.flush(); @@ -603,8 +639,12 @@ namespace lsp break; case meta::R_METER: - jp = new jack::MeterPort(port, this); + { + jack::MeterPort *mp = new jack::MeterPort(port, this); + vMeters.add(mp); + jp = mp; break; + } case meta::R_PORT_SET: { @@ -1159,6 +1199,35 @@ namespace lsp return true; } + bool Wrapper::lock_meters() + { + for (size_t i=0; i<10; ++i) + { + if (atomic_trylock(nLockMeters)) + return true; + } + + return false; + } + + bool Wrapper::lock_meters_soft() + { + for (size_t i=0; i<10; ++i) + { + if (atomic_trylock(nLockMeters)) + return true; + if (i & 1) + ipc::Thread::yield(); + } + + return false; + } + + void Wrapper::unlock_meters() + { + atomic_unlock(nLockMeters); + } + bool Wrapper::test_display_draw() { uatomic_t last = atomic_load(&nQueryDrawReq); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/main/posix.h 2025-08-26 18:15:48.081961014 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 22 янв. 2021 г. @@ -438,7 +438,8 @@ int main(int argc, const char **argv) lsp::IPluginLoop *loop = NULL; lsp::status_t res = factory(&loop, JACK_PLUGIN_UID, argc, argv); if (res != lsp::STATUS_OK) - return -res; + return (res == lsp::STATUS_CANCELLED) ? 0 : -res; + lsp_finally { if (loop != NULL) delete loop; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ports.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ports.h 2025-08-26 18:15:48.081961014 +0000 @@ -487,12 +487,14 @@ namespace lsp { private: float fValue; + float fUIValue; bool bForce; public: explicit MeterPort(const meta::port_t *meta, Wrapper *w) : Port(meta, w) { fValue = meta->start; + fUIValue = fValue; bForce = true; } @@ -529,12 +531,16 @@ namespace lsp fValue = value; } + void commit() + { + fUIValue = fValue; + bForce = pMetadata->flags & meta::F_PEAK; + } + public: float sync_value() { - float value = fValue; - bForce = true; - return value; + return fUIValue; } }; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/types.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/types.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/types.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/types.h 2025-08-26 18:15:48.081961014 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2020 Linux Studio Plugins Project - * (C) 2020 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 нояб. 2020 г. @@ -41,6 +41,11 @@ namespace lsp const char *dst; } connection_t; + typedef struct wrapper_info_t + { + const char *client_name; + } wrapper_info_t; + typedef struct path_t: public plug::path_t { enum flags_t @@ -157,30 +162,18 @@ namespace lsp inline plug::mesh_t *create_mesh(const meta::port_t *meta) { - size_t buffers = meta->step; - size_t buf_size = meta->start * sizeof(float); - size_t mesh_size = sizeof(plug::mesh_t) + sizeof(float *) * buffers; - - // Align values to 64-byte boundaries - buf_size = align_size(buf_size, OPTIMAL_ALIGN); - mesh_size = align_size(mesh_size, OPTIMAL_ALIGN); + const size_t buffers = meta->step; + const size_t buf_size = align_size(meta->start * sizeof(float), 0x40); + const size_t mesh_size = align_size(sizeof(plug::mesh_t) + sizeof(float *) * buffers, 0x40); // Allocate pointer - uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); + uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); if (ptr == NULL) return NULL; - // Initialize references - plug::mesh_t *mesh = reinterpret_cast(ptr); - mesh->nState = plug::M_EMPTY; - mesh->nBuffers = 0; - mesh->nItems = 0; - ptr += mesh_size; - for (size_t i=0; ipvData[i] = reinterpret_cast(ptr); - ptr += buf_size; - } + // Initialize mesh + plug::mesh_t *mesh = advance_ptr_bytes(ptr, mesh_size); + mesh->init(reinterpret_cast(ptr), buffers, buf_size / sizeof(float)); return mesh; } @@ -190,8 +183,8 @@ namespace lsp if (mesh != NULL) free(mesh); } - } -} + } /* namespace jack */ +} /* namespace lsp */ #endif /* LSP_PLUG_IN_PLUG_FW_WRAP_JACK_TYPES_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ui_ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ui_ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ui_ports.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/ui_ports.h 2025-08-26 18:15:48.081961014 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 29 янв. 2021 г. @@ -67,12 +67,14 @@ namespace lsp class UIControlPort: public UIPort { protected: - float fValue; + float fValue; + ui::IPresetManager *pManager; public: - explicit UIControlPort(jack::Port *port): UIPort(port) + explicit UIControlPort(jack::Port *port, ui::IPresetManager *manager): UIPort(port) { fValue = port->value(); + pManager = manager; } UIControlPort(const UIControlPort &) = delete; @@ -94,17 +96,22 @@ namespace lsp virtual void set_value(float value) override { - fValue = meta::limit_value(pMetadata, value); + value = meta::limit_value(pMetadata, value); + if (value == fValue) + return; + + fValue = value; pPort->commit_value(fValue); + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void write(const void *buffer, size_t size) override { - if (size == sizeof(float)) - { - fValue = *static_cast(buffer); - pPort->commit_value(fValue); - } + if (size != sizeof(float)) + return; + + set_value(*static_cast(buffer)); } }; @@ -114,7 +121,7 @@ namespace lsp jack::PortGroup *pPG; public: - explicit UIPortGroup(jack::PortGroup *port) : UIControlPort(port) + explicit UIPortGroup(jack::PortGroup *port, ui::IPresetManager *manager) : UIControlPort(port, manager) { pPG = port; } @@ -160,14 +167,8 @@ namespace lsp virtual bool sync() override { float value = fValue; - - if (pMetadata->flags & meta::F_PEAK) - { - jack::MeterPort *mp = static_cast(pPort); - fValue = mp->sync_value(); - } - else - fValue = pPort->value(); + jack::MeterPort *mp = static_cast(pPort); + fValue = mp->sync_value(); return fValue != value; } @@ -404,12 +405,15 @@ namespace lsp class UIPathPort: public UIPort { private: - jack::path_t *pPath; - char sPath[PATH_MAX]; + ui::IPresetManager *pManager; + jack::path_t *pPath; + char sPath[PATH_MAX]; public: - explicit UIPathPort(jack::Port *port): UIPort(port) + explicit UIPathPort(jack::Port *port, ui::IPresetManager *manager): UIPort(port) { + pManager = manager; + plug::path_t *path = pPort->buffer(); pPath = (path != NULL) ? static_cast(path) : NULL; sPath[0] = '\0'; @@ -444,6 +448,9 @@ namespace lsp ::memcpy(sPath, buffer, size); sPath[size] = '\0'; + if (pManager != NULL) + pManager->mark_active_preset_dirty(); + // Submit path string to DSP if (pPath != NULL) pPath->submit(sPath, flags); @@ -458,13 +465,16 @@ namespace lsp class UIStringPort: public UIPort { private: + ui::IPresetManager *pManager; plug::string_t *pValue; char *pData; uint32_t nSerial; public: - explicit UIStringPort(jack::Port *port): UIPort(port) + explicit UIStringPort(jack::Port *port, ui::IPresetManager *manager): UIPort(port) { + pManager = manager; + jack::StringPort *sp = static_cast(port); pValue = sp->data(); pData = (pValue != NULL) ? reinterpret_cast(malloc(pValue->max_bytes() + 1)) : NULL; @@ -509,6 +519,9 @@ namespace lsp const size_t count = lsp_min(size, pValue->nCapacity); plug::utf8_strncpy(pData, count, buffer, size); nSerial = pValue->submit(buffer, size, flags & plug::PF_STATE_RESTORE); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void set_default() override @@ -521,6 +534,9 @@ namespace lsp plug::utf8_strncpy(pData, pValue->nCapacity, text); write(pData, strlen(pData), plug::PF_PRESET_IMPORT); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual bool sync() override diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/wrapper.h 2025-03-01 12:42:57.436644521 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/jack/wrapper.h 2025-08-26 18:15:48.081961014 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 нояб. 2020 г. @@ -46,11 +46,12 @@ namespace lsp { namespace jack { - class Port; - class DataPort; class AudioBufferPort; - class StringPort; + class DataPort; class Factory; + class MeterPort; + class Port; + class StringPort; /** * Wrapper for the plugin module @@ -93,6 +94,7 @@ namespace lsp private: jack::Factory *pFactory; // Factory for shared resources jack_client_t *pClient; // JACK connection client + char *sClientName; // JACK client name state_t nState; // Connection state to JACK server bool bUpdateSettings; // Plugin settings are required to be updated ssize_t nLatency; // The actual latency of device @@ -107,12 +109,14 @@ namespace lsp uatomic_t nQueryDrawResp; // QueryDraw response uatomic_t nDumpReq; // Dump state to file request uatomic_t nDumpResp; // Dump state to file response + uatomic_t nLockMeters; // Meters lock core::SamplePlayer *pSamplePlayer; // Sample player core::ShmClient *pShmClient; // Shared memory client lltl::parray vAllPorts; // All ports lltl::parray vParams; // All input parameters + lltl::parray vMeters; // Meters lltl::parray vSortedPorts; // Alphabetically-sorted ports lltl::parray vDataPorts; // Data ports (audio, MIDI) lltl::parray vAudioBuffers; // Audio buffers @@ -139,7 +143,7 @@ namespace lsp static bool set_port_value(jack::Port *port, const config::param_t *param, size_t flags, const io::Path *base); public: - explicit Wrapper(jack::Factory *factory, plug::Module *plugin, resource::ILoader *loader); + explicit Wrapper(jack::Factory *factory, plug::Module *plugin, resource::ILoader *loader, const wrapper_info_t *info); Wrapper(const Wrapper &) = delete; Wrapper(Wrapper &&) = delete; virtual ~Wrapper() override; @@ -150,6 +154,7 @@ namespace lsp status_t init(); void destroy(); + public: // plug::IWrapper virtual ipc::IExecutor *executor() override; virtual void query_display_draw() override; @@ -174,6 +179,10 @@ namespace lsp void set_routing(const lltl::darray *routing); status_t disconnect(); + bool lock_meters(); + bool lock_meters_soft(); + void unlock_meters(); + jack::Port *port_by_id(const char *id); jack::Port *port_by_idx(size_t index); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/extensions.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/extensions.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/extensions.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/extensions.h 2025-08-26 18:15:48.081961014 +0000 @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -171,6 +172,13 @@ namespace lsp LV2_URID uridMaxBlockLength; LV2_URID uridScaleFactor; + // Preset-related URIDs + LV2_URID uridPresetState; + LV2_URID uridPresetStateType; + LV2_URID uridPresetName; + LV2_URID uridPresetFlags; + LV2_URID uridPresetTab; + // OSC-related URIDs LV2_URID uridOscBundle; LV2_URID uridOscBundleTimetag; @@ -356,6 +364,13 @@ namespace lsp uridMaxBlockLength = map_uri(LV2_BUF_SIZE__maxBlockLength); uridScaleFactor = map_uri(LV2_UI__scaleFactor); + // Preset-related URIDs + uridPresetState = map_primitive("preset_state"); + uridPresetStateType = map_type("PresetState"); + uridPresetName = map_field("PresetState", "name"); + uridPresetFlags = map_field("PresetState", "flags"); + uridPresetTab = map_field("PresetState", "tab"); + // OSC-related URIDs uridOscBundle = map_uri(LV2_OSC__Bundle); uridOscBundleTimetag = map_uri(LV2_OSC__bundleTimetag); @@ -907,6 +922,85 @@ namespace lsp write_data(nAtomOut, lv2_atom_total_size(msg), uridEventTransfer, msg); return true; } + + LV2_Atom *ui_serialize_preset_state(LV2_Atom_Forge_Frame *frame, const core::preset_state_t *state) + { + LV2_Atom *obj = forge_object(frame, uridPresetState, uridPresetStateType); + { + forge_key(uridPresetName); + forge_string(state->name); + forge_key(uridPresetFlags); + forge_int(int32_t(state->flags)); + forge_key(uridPresetTab); + forge_int(int32_t(state->tab)); + } + forge_pop(frame); + + return obj; + } + + bool deserialize_preset_state(core::preset_state_t *state, const LV2_Atom_Object_Body *obody, uint32_t p_type, size_t p_size) + { + if ((p_type != forge.Object) && (p_type != uridBlank)) + { + lsp_warn("Invalid preset atom type: %d = %s", int(p_type), unmap_urid(p_type)); + return false; + } + + if (obody->otype != uridPresetStateType) + { + lsp_warn("Unsupported preset state object type: %d = %s", int(obody->otype), unmap_urid(obody->otype)); + return false; + } + + state->name[0] = '\0'; + state->flags = core::PRESET_FLAG_NONE; + state->tab = 0; + + // Parse preset object + for ( + LV2_Atom_Property_Body *item = lv2_atom_object_begin(obody) ; + !lv2_atom_object_is_end(obody, p_size, item) ; + item = lv2_atom_object_next(item) + ) + { + lsp_trace("item->key (%d) = %s", int(item->key), unmap_urid(item->key)); + lsp_trace("item->value.type (%d) = %s", int(item->value.type), unmap_urid(item->value.type)); + + // Analyze type of value + if ((item->key == uridPresetName) && (item->value.type == forge.String)) + { + const LV2_Atom_String *value = reinterpret_cast(&item->value); + const char *name = reinterpret_cast(&value[1]); + const size_t len = lsp_min(strnlen(name, value->atom.size), core::PRESET_NAME_BYTES - 1); + memcpy(state->name, name, len); + state->name[len] = '\0'; + } + else if ((item->key == uridPresetFlags) && (item->value.type == forge.Int)) + state->flags = reinterpret_cast(&item->value)->body; + else if ((item->key == uridPresetTab) && (item->value.type == forge.Int)) + state->tab = reinterpret_cast(&item->value)->body; + else + lsp_warn("Unknown preset state property: %d (%s)", item->key, unmap_urid(item->key)); + } // for (object body) + + return true; + } + + bool ui_send_preset_state(const core::preset_state_t *state) + { + if (map == NULL) + return false; + + // Forge PATCH SET message + LV2_Atom_Forge_Frame frame; + forge_set_buffer(pBuffer, nBufSize); + + forge_frame_time(0); + LV2_Atom *msg = ui_serialize_preset_state(&frame, state); + write_data(nAtomOut, lv2_atom_total_size(msg), uridEventTransfer, msg); + return true; + } }; #define PATCH_OVERHEAD (sizeof(LV2_Atom_Property) + sizeof(LV2_Atom_URID) + sizeof(LV2_Atom) + 0x20) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/ui_wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -255,7 +255,7 @@ namespace lsp const meta::port_t *port = &latency_port; if ((port->id != NULL) && (port->name != NULL)) { - pLatency = new lv2::UIFloatPort(port, pExt, NULL); + pLatency = new lv2::UIMeterPort(port, pExt, NULL); vPorts.add(pLatency); nLatencyID = vExtPorts.size(); if (pExt->atom_supported()) @@ -410,7 +410,7 @@ namespace lsp break; case meta::R_CONTROL: - result = new lv2::UIFloatPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL); + result = new lv2::UIControlPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL, this); if (postfix == NULL) { result->set_id(vExtPorts.size()); @@ -428,7 +428,7 @@ namespace lsp } break; case meta::R_METER: - result = new lv2::UIPeakPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL); + result = new lv2::UIMeterPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL); if (postfix == NULL) { result->set_id(vExtPorts.size()); @@ -438,7 +438,7 @@ namespace lsp break; case meta::R_PATH: if (pExt->atom_supported()) - result = new lv2::UIPathPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL); + result = new lv2::UIPathPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL, this); else result = new lv2::UIPort(p, pExt); // Stub port lsp_trace("Added path port id=%", p->id); @@ -447,7 +447,7 @@ namespace lsp case meta::R_SEND_NAME: case meta::R_RETURN_NAME: if (pExt->atom_supported()) - result = new lv2::UIStringPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL); + result = new lv2::UIStringPort(p, pExt, (w != NULL) ? w->port(p->id) : NULL, this); else result = new lv2::UIPort(p, pExt); // Stub port #ifdef LSP_TRACE @@ -492,7 +492,7 @@ namespace lsp case meta::R_PORT_SET: { char postfix_buf[MAX_PARAM_ID_BYTES]; - lv2::UIPortGroup *pg = new lv2::UIPortGroup(p, pExt, (w != NULL) ? w->port(p->id) : NULL); + lv2::UIPortGroup *pg = new lv2::UIPortGroup(p, pExt, (w != NULL) ? w->port(p->id) : NULL, this); vPorts.add(pg); lsp_trace("Added port_set port id=%", pg->metadata()->id); @@ -868,6 +868,18 @@ namespace lsp lsp_trace("Submitted new shm_state"); } } + else if (obj->body.otype == pExt->uridPresetStateType) + { + core::preset_state_t state; + + if (pExt->deserialize_preset_state(&state, &obj->body, obj->atom.type, obj->atom.size)) + { + lsp_trace("Received preset state name='%s', flags=0x%x, tab=%d", + state.name, int(state.flags), int(state.tab)); + + receive_preset_state(&state); + } + } else { lsp_trace("Received object"); @@ -1257,6 +1269,13 @@ namespace lsp return sShmState.get(); } + void UIWrapper::send_preset_state(const core::preset_state_t *state) + { + // Send preset state to DSP + if (!pExt->ui_send_preset_state(state)) + lsp_warn("failed to send preset state"); + } + } /* namespace lv2 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/impl/wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -83,6 +83,7 @@ namespace lsp bQueueDraw = false; bUpdateSettings = true; bStateManage = false; + bSendPreset = false; fSampleRate = DEFAULT_SAMPLE_RATE; pOscPacket = reinterpret_cast(::malloc(OSC_PACKET_MAX)); atomic_store(&nStateMode, SM_LOADING); @@ -97,6 +98,8 @@ namespace lsp pShmClient = NULL; + init_preset_state(&sPresetState); + pFactory->acquire(); } @@ -981,6 +984,7 @@ namespace lsp { ++nClients; ++nStateReqs; + bSendPreset = true; // Mark that we need to send preset settings atomic_add(&nShmReqs, 1); lsp_trace("UI has connected, current number of clients=%d", int(nClients)); if (pKVTDispatcher != NULL) @@ -1041,6 +1045,20 @@ namespace lsp pSamplePlayer->play_sample(position, release); } } + else if (obj->body.otype == pExt->uridPresetStateType) + { + core::preset_state_t state; + init_preset_state(&state); + + if (pExt->deserialize_preset_state(&state, &obj->body, obj->atom.type, obj->atom.size)) + { + // Remember new preset settings, mark state as changed and reset transmission flag + copy_preset_state(&sPresetState, &state); + + bSendPreset = false; + state_changed(); + } + } else { lsp_trace( @@ -1306,7 +1324,7 @@ namespace lsp pExt->forge_pop(&frame); // Cleanup data of the mesh for refill - mesh->markEmpty(); + mesh->mark_empty(); } // Serialize streams (it's own primitive STREAM) @@ -1459,6 +1477,34 @@ namespace lsp } } + void Wrapper::transmit_preset_settings_to_clients(const core::preset_state_t *state) + { + if (!bSendPreset) + return; + + lsp_trace("Transmitting preset state preset='%s', flags=0x%x, tab=%d", + state->name, int(state->flags), int(state->tab)); + + LV2_Atom_Forge_Frame frame; + + pExt->forge_frame_time(0); // Event header + pExt->forge_object(&frame, pExt->uridPresetState, pExt->uridPresetStateType); + + pExt->forge_key(pExt->uridPresetName); + pExt->forge_string(state->name); + + pExt->forge_key(pExt->uridPresetFlags); + pExt->forge_int(state->flags); + + pExt->forge_key(pExt->uridPresetTab); + pExt->forge_int(state->tab); + + pExt->forge_pop(&frame); + + // Reset send flag + bSendPreset = false; + } + void Wrapper::transmit_atoms(size_t samples) { // Get sequence @@ -1535,6 +1581,7 @@ namespace lsp transmit_port_data_to_clients(sync_req, patch_req, state_req); } + transmit_preset_settings_to_clients(&sPresetState); transmit_play_position_to_clients(); transmit_shm_state_to_clients(); } @@ -1779,6 +1826,31 @@ namespace lsp pExt->store_value(pExt->uridKvtObject, msg->type, &msg[1], msg->size); } + void Wrapper::save_preset_state(const core::preset_state_t *state) + { + // We should use our own forge to prevent from race condition + LV2_Atom_Forge forge; + LV2_Atom_Forge_Frame frame; + lv2::lv2_sink sink(0x100); + + // Initialize sink + lv2_atom_forge_init(&forge, pExt->map); + lv2_atom_forge_set_sink(&forge, lv2_sink::sink, lv2_sink::deref, &sink); + lv2_atom_forge_object(&forge, &frame, 0, pExt->uridPresetStateType); + { + lv2_atom_forge_key(&forge, pExt->uridPresetName); + lv2_atom_forge_string(&forge, state->name, strlen(state->name)); + lv2_atom_forge_key(&forge, pExt->uridPresetFlags); + lv2_atom_forge_int(&forge, int32_t(state->flags)); + lv2_atom_forge_key(&forge, pExt->uridPresetTab); + lv2_atom_forge_int(&forge, int32_t(state->tab)); + } + lv2_atom_forge_pop(&forge, &frame); + + LV2_Atom *msg = reinterpret_cast(sink.buf); + pExt->store_value(pExt->uridPresetState, msg->type, &msg[1], msg->size); + } + void Wrapper::save_state( LV2_State_Store_Function store, LV2_State_Handle handle, @@ -1813,6 +1885,8 @@ namespace lsp lvp->save(); } + save_preset_state(&sPresetState); + // Save state of all KVT parameters if (sKVTMutex.lock()) { @@ -1854,6 +1928,31 @@ namespace lsp lsp_warn("Unsupported KVT property type: %s", pExt->unmap_urid(p_type)); } + void Wrapper::restore_preset_state() + { + uint32_t p_type = 0; + size_t p_size = 0; + const void *ptr = pExt->retrieve_value(pExt->uridPresetState, &p_type, &p_size); + if (ptr == NULL) + return; + + lsp_trace("Deserializing preset state"); + lsp_trace("p_type = %d (%s), p_size = %d", int(p_type), pExt->unmap_urid(p_type), int(p_size)); + + core::preset_state_t state; + init_preset_state(&state); + + if (pExt->deserialize_preset_state(&state, static_cast(ptr), p_type, p_size)) + { + lsp_trace("Restored preset state preset='%s', flags=0x%x, tab=%d", + state.name, int(state.flags), int(state.tab)); + + // Now state has been parsed, we can mark it as need for sync with UI + copy_preset_state(&sPresetState, &state); + bSendPreset = true; + } + } + void Wrapper::parse_kvt_v2(const LV2_Atom *data, size_t size) { for (const LV2_Atom *item = data; @@ -2180,6 +2279,9 @@ namespace lsp sKVTMutex.unlock(); } + // Restore preset state + restore_preset_state(); + // Update the state pExt->reset_state_context(); atomic_store(&nStateMode, SM_LOADING); @@ -2209,6 +2311,8 @@ namespace lsp // Increment number of clients ++nDirectClients; atomic_add(&nShmReqs, 1); + bSendPreset = true; + if (pKVTDispatcher != NULL) pKVTDispatcher->connect_client(); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ports.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ports.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 20 нояб. 2021 г. @@ -657,7 +657,7 @@ namespace lsp } // Set mesh waiting until next frame is allowed - mesh->setWaiting(); + mesh->set_waiting(); } }; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/static.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/static.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/static.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/static.h 2025-08-26 18:15:48.085960977 +0000 @@ -33,15 +33,15 @@ namespace lsp // Latency ports' metadata for LV2 plugins static const meta::port_t latency_port = { - LSP_LV2_LATENCY_PORT, "Latency OUT", meta::U_NONE, meta::R_METER, meta::F_INT | meta::F_LOWER | meta::F_UPPER, 0, MAX_SAMPLE_RATE, 0, 0, NULL + LSP_LV2_LATENCY_PORT, "Latency OUT", "Latency", meta::U_NONE, meta::R_METER, meta::F_INT | meta::F_LOWER | meta::F_UPPER, 0, MAX_SAMPLE_RATE, 0, 0, NULL, NULL, NULL }; // Atom ports' metadata for LV2 plugins static const meta::port_t atom_ports[] = { // Input and output ATOM ports - { LSP_LV2_ATOM_PORT_IN, "UI Input", meta::U_NONE, meta::R_AUDIO_IN, 0, 0, 0, 0, 0, NULL }, - { LSP_LV2_ATOM_PORT_OUT, "UI Output", meta::U_NONE, meta::R_AUDIO_OUT, 0, 0, 0, 0, 0, NULL }, + { LSP_LV2_ATOM_PORT_IN, "UI Input", "UI Input", meta::U_NONE, meta::R_AUDIO_IN, 0, 0, 0, 0, 0, NULL, NULL, NULL }, + { LSP_LV2_ATOM_PORT_OUT, "UI Output", "UI Output", meta::U_NONE, meta::R_AUDIO_OUT, 0, 0, 0, 0, 0, NULL, NULL, NULL }, { NULL, NULL } }; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/types.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/types.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/types.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/types.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 12 нояб. 2021 г. @@ -79,57 +79,35 @@ namespace lsp ~lv2_mesh_t() { // Simply delete root structure - if (pData != NULL) - { - delete [] (pData); - pData = NULL; - } + free_aligned(pData); pMesh = NULL; } void init(const meta::port_t *meta) { // Calculate sizes - nBuffers = meta->step; - nMaxItems = meta->start; + nBuffers = meta->step; + nMaxItems = meta->start; - size_t hdr_size = align_size(sizeof(plug::mesh_t) + sizeof(float *) * nBuffers, DEFAULT_ALIGN); - size_t urid_size = align_size(sizeof(LV2_URID) * nBuffers, DEFAULT_ALIGN); - size_t buf_size = align_size(sizeof(float) * nMaxItems, DEFAULT_ALIGN); - size_t to_alloc = hdr_size + urid_size + buf_size * nBuffers; - - lsp_trace("buffers = %d, max_items=%d, hdr_size=%d, urid_size=%d, buf_size=%d, to_alloc=%d", - int(nBuffers), int(nMaxItems), int(hdr_size), int(urid_size), int(buf_size), int(to_alloc)); - pData = new uint8_t[to_alloc + DEFAULT_ALIGN]; - if (pData == NULL) - return; - uint8_t *ptr = align_ptr(pData, DEFAULT_ALIGN); - pMesh = reinterpret_cast(ptr); - ptr += hdr_size; - - lsp_trace("ptr = %p, pMesh = %p", ptr, pMesh); - - for (size_t i=0; ipvData[i] = reinterpret_cast(ptr); - ptr += buf_size; - } - - lsp_assert(ptr <= &pData[to_alloc + DEFAULT_ALIGN]); - - pMesh->nState = plug::M_WAIT; - pMesh->nBuffers = 0; - pMesh->nItems = 0; + const size_t hdr_size = align_size(sizeof(plug::mesh_t) + sizeof(float *) * nBuffers, 0x40); + const size_t buf_size = align_size(sizeof(float) * nMaxItems, 0x40); + const size_t to_alloc = hdr_size + buf_size * nBuffers; + + lsp_trace("buffers = %d, max_items=%d, hdr_size=%d, buf_size=%d, to_alloc=%d", + int(nBuffers), int(nMaxItems), int(hdr_size), int(buf_size), int(to_alloc)); - lsp_trace("Initialized"); + uint8_t *ptr = alloc_aligned(pData, to_alloc, DEFAULT_ALIGN); + if (ptr == NULL) + return; + pMesh = advance_ptr_bytes(ptr, hdr_size); + pMesh->init(reinterpret_cast(ptr), nBuffers, buf_size / sizeof(float), plug::M_WAIT); } static size_t size_of_port(const meta::port_t *meta) { - size_t hdr_size = sizeof(LV2_Atom_Int) + sizeof(LV2_Atom_Int) + 0x100; // Some extra bytes - size_t prop_size = sizeof(uint32_t) * 2; - size_t vector_size = prop_size + sizeof(LV2_Atom_Vector) + meta->start * sizeof(float); + size_t hdr_size = sizeof(LV2_Atom_Int) + sizeof(LV2_Atom_Int) + 0x100; // Some extra bytes + size_t prop_size = sizeof(uint32_t) * 2; + size_t vector_size = prop_size + sizeof(LV2_Atom_Vector) + meta->start * sizeof(float); return LSP_LV2_SIZE_PAD(size_t(hdr_size + vector_size * meta->step)); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_ports.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_ports.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 20 нояб. 2021 г. @@ -66,18 +66,21 @@ namespace lsp class UIPortGroup: public UIPort { protected: - size_t nRows; - size_t nCols; - size_t nCurrRow; - lv2::Port *pPort; + size_t nRows; + size_t nCols; + size_t nCurrRow; + lv2::Port *pPort; + ui::IPresetManager *pManager; public: - UIPortGroup(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port) : UIPort(meta, ext) + UIPortGroup(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port, ui::IPresetManager *manager): + UIPort(meta, ext) { nCurrRow = meta->start; nRows = list_size(meta->items); nCols = port_list_size(meta->members); pPort = port; + pManager = manager; if (port != NULL) { @@ -100,11 +103,14 @@ namespace lsp virtual void set_value(float value) override { size_t new_value = meta::limit_value(pMetadata, value); - if ((new_value >= 0) && (new_value < nRows) && (new_value != nCurrRow)) + if ((new_value < nRows) && (new_value != nCurrRow)) { nCurrRow = new_value; lsp_trace("writing patch event id=%s, value=%d", pMetadata->id, int(new_value)); pExt->ui_write_patch(this); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } } @@ -131,37 +137,39 @@ namespace lsp inline size_t cols() const { return nCols; } }; - class UIFloatPort: public UIPort + class UIControlPort: public UIPort { protected: - float fValue; - bool bForce; - lv2::Port *pPort; + ui::IPresetManager *pManager; + float fValue; + bool bForce; + lv2::Port *pPort; public: - explicit UIFloatPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port) : + explicit UIControlPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port, ui::IPresetManager *manager) : UIPort(meta, ext) { - fValue = meta->start; - pPort = port; + pManager = manager; + fValue = meta->start; + pPort = port; if (port != NULL) { - lsp_trace("Connected direct float port id=%s", port->metadata()->id); + lsp_trace("Connected direct control port id=%s", port->metadata()->id); fValue = port->value(); } - bForce = port != NULL; + bForce = port != NULL; } - UIFloatPort(const UIFloatPort &) = delete; - UIFloatPort(UIFloatPort &&) = delete; + UIControlPort(const UIControlPort &) = delete; + UIControlPort(UIControlPort &&) = delete; - virtual ~UIFloatPort() override + virtual ~UIControlPort() override { fValue = pMetadata->start; } - UIFloatPort & operator = (const UIFloatPort &) = delete; - UIFloatPort & operator = (UIFloatPort &&) = delete; + UIControlPort & operator = (const UIControlPort &) = delete; + UIControlPort & operator = (UIControlPort &&) = delete; public: virtual float value() override @@ -171,7 +179,11 @@ namespace lsp virtual void set_value(float value) override { - fValue = meta::limit_value(pMetadata, value); + value = meta::limit_value(pMetadata, value); + if (fValue == value) + return; + + fValue = value; if (nID >= 0) { // Use standard mechanism to access port @@ -183,9 +195,12 @@ namespace lsp lsp_trace("writing patch event id=%s, value=%f", pMetadata->id, fValue); pExt->ui_write_patch(this); } + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } - virtual LV2_URID get_type_urid() const override + virtual LV2_URID get_type_urid() const override { return pExt->forge.Float; } @@ -226,11 +241,11 @@ namespace lsp } }; - class UIBypassPort: public UIFloatPort + class UIBypassPort: public UIControlPort { public: explicit UIBypassPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port) : - UIFloatPort(meta, ext, port) + UIControlPort(meta, ext, port, NULL) { } @@ -242,7 +257,11 @@ namespace lsp public: virtual void set_value(float value) override { - fValue = meta::limit_value(pMetadata, value); + value = meta::limit_value(pMetadata, value); + if (value == fValue) + return; + + fValue = value; if (nID >= 0) { // Use standard mechanism to access port @@ -276,28 +295,75 @@ namespace lsp } }; - class UIPeakPort: public UIFloatPort + class UIMeterPort: public UIPort { + protected: + float fValue; + bool bForce; + lv2::Port *pPort; + public: - explicit UIPeakPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port) : - UIFloatPort(meta, ext, port) {} + explicit UIMeterPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *port) : + UIPort(meta, ext) + { + fValue = meta->start; + pPort = port; + if (port != NULL) + { + lsp_trace("Connected direct meter port id=%s", port->metadata()->id); + fValue = port->value(); + } + bForce = port != NULL; + } - UIPeakPort(const UIPeakPort &) = delete; - UIPeakPort(UIPeakPort &&) = delete; - UIPeakPort & operator = (const UIPeakPort &) = delete; - UIPeakPort & operator = (UIPeakPort &&) = delete; + UIMeterPort(const UIMeterPort &) = delete; + UIMeterPort(UIMeterPort &&) = delete; + UIMeterPort & operator = (const UIMeterPort &) = delete; + UIMeterPort & operator = (UIMeterPort &&) = delete; public: + virtual float value() override + { + return fValue; + } + + virtual LV2_URID get_type_urid() const override + { + return pExt->forge.Float; + } + + virtual void deserialize(const void *data) override + { + const LV2_Atom_Float *atom = reinterpret_cast(data); + fValue = meta::limit_value(pMetadata, atom->body); + } + virtual void notify(const void *buffer, size_t protocol, size_t size) override { if (size == sizeof(LV2UI_Peak_Data)) - { fValue = meta::limit_value(pMetadata, (reinterpret_cast(buffer))->peak); - return; - } - UIFloatPort::notify(buffer, protocol, size); + else if (size == sizeof(float)) + fValue = meta::limit_value(pMetadata, *(reinterpret_cast(buffer))); // lsp_trace("id=%s, value=%f", pMetadata->id, fValue); } + + virtual bool sync() override + { + if ((pPort == NULL) || (nID >= 0)) + return false; + + float old = fValue; + fValue = meta::limit_value(pMetadata, pPort->value()); + bool synced = (fValue != old) || bForce; + bForce = false; + + #ifdef LSP_TRACE + if (synced) + lsp_trace("Directly received float port id=%s, value=%f", + pPort->metadata()->id, fValue); + #endif + return synced; + } }; class UIMeshPort: public UIPort @@ -777,13 +843,15 @@ namespace lsp class UIPathPort: public UIPort { protected: + ui::IPresetManager *pManager; lv2::PathPort *pPort; char sPath[PATH_MAX]; public: - explicit UIPathPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *xport): + explicit UIPathPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *xport, ui::IPresetManager *manager): UIPort(meta, ext) { + pManager = manager; sPath[0] = '\0'; pPort = NULL; @@ -858,6 +926,9 @@ namespace lsp "writing patch event id=%s, path=%s (%d)", pMetadata->id, static_cast(buffer), int(size)); pExt->ui_write_patch(this); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void write(const void* buffer, size_t size) override @@ -895,17 +966,20 @@ namespace lsp class UIStringPort: public UIPort { protected: + ui::IPresetManager *pManager; plug::string_t *pValue; char *pData; uint32_t nCapacity; uint32_t nSerial; public: - explicit UIStringPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *xport): + explicit UIStringPort(const meta::port_t *meta, lv2::Extensions *ext, lv2::Port *xport, ui::IPresetManager *manager): UIPort(meta, ext) { + pManager = manager; + lv2::StringPort *sp = (xport != NULL) ? static_cast(xport) : NULL; - if (xport != NULL) + if (sp != NULL) { pValue = sp->data(); nCapacity = pValue->max_bytes(); @@ -915,6 +989,7 @@ namespace lsp { pValue = NULL; nCapacity = size_t(meta->max) * 4; + nSerial = 0; } // Allocate buffer to store value @@ -972,6 +1047,9 @@ namespace lsp "writing patch event id=%s, value=%s (%d)", pMetadata->id, static_cast(buffer), int(size)); pExt->ui_write_patch(this); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void write(const void* buffer, size_t size) override diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/ui_wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 нояб. 2021 г. @@ -127,6 +127,7 @@ namespace lsp virtual meta::plugin_format_t plugin_format() const override; virtual bool window_resized(tk::Window *wnd, size_t width, size_t height) override; virtual const core::ShmState *shm_state() override; + virtual void send_preset_state(const core::preset_state_t *state) override; }; } /* namespace lv2 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/lv2/wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -107,6 +107,7 @@ namespace lsp bool bQueueDraw; // Queue draw request bool bUpdateSettings;// Settings update bool bStateManage; // State management barrier + bool bSendPreset; // Need to send preset state to UI float fSampleRate; uint8_t *pOscPacket; // OSC packet data uatomic_t nStateMode; // State change flag @@ -125,13 +126,17 @@ namespace lsp core::ShmClient *pShmClient; // Shared memory client + core::preset_state_t sPresetState; // Preset state + LV2_Inline_Display_Image_Surface sSurface; // Canvas surface protected: lv2::Port *create_port(lltl::parray *plugin_ports, const meta::port_t *meta, const char *postfix, bool virt); void clear_midi_ports(); void save_kvt_parameters(); + void save_preset_state(const core::preset_state_t *state); void restore_kvt_parameters(); + void restore_preset_state(); void parse_kvt_v1(const LV2_Atom_Object_Body *data, size_t size); void parse_kvt_v2(const LV2_Atom *data, size_t size); @@ -147,6 +152,7 @@ namespace lsp void transmit_osc_events(lv2::Port *p); void transmit_kvt_events(); void transmit_atoms(size_t samples); + void transmit_preset_settings_to_clients(const core::preset_state_t *state); void receive_midi_event(const LV2_Atom_Event *ev); void receive_raw_osc_event(osc::parse_frame_t *frame); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/helpers.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/helpers.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/helpers.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/helpers.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 7 дек. 2021 г. @@ -38,30 +38,18 @@ namespace lsp { inline plug::mesh_t *create_mesh(const meta::port_t *meta) { - size_t buffers = meta->step; - size_t buf_size = meta->start * sizeof(float); - size_t mesh_size = sizeof(plug::mesh_t) + sizeof(float *) * buffers; - - // Align values to 64-byte boundaries - buf_size = align_size(buf_size, 0x40); - mesh_size = align_size(mesh_size, 0x40); + const size_t buffers = meta->step; + const size_t buf_size = align_size(meta->start * sizeof(float), 0x40); + const size_t mesh_size = align_size(sizeof(plug::mesh_t) + sizeof(float *) * buffers, 0x40); // Allocate pointer - uint8_t *ptr = new uint8_t[mesh_size + buf_size * buffers]; + uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); if (ptr == NULL) return NULL; - // Initialize references - plug::mesh_t *mesh = reinterpret_cast(ptr); - mesh->nState = plug::M_EMPTY; - mesh->nBuffers = 0; - mesh->nItems = 0; - ptr += mesh_size; - for (size_t i=0; ipvData[i] = reinterpret_cast(ptr); - ptr += buf_size; - } + // Initialize mesh + plug::mesh_t *mesh = advance_ptr_bytes(ptr, mesh_size); + mesh->init(reinterpret_cast(ptr), buffers, buf_size / sizeof(float)); return mesh; } @@ -69,7 +57,7 @@ namespace lsp inline void destroy_mesh(plug::mesh_t *mesh) { if (mesh != NULL) - delete [] reinterpret_cast(mesh); + free(mesh); } inline ssize_t serialize_string(const char *str, uint8_t *buf, size_t len) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/ui_wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/ui_wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 12 дек. 2021 г. @@ -102,40 +102,44 @@ namespace lsp case meta::R_PATH: lsp_trace("creating path port %s", port->id); - vup = new vst2::UIPathPort(port, vp); + vup = new vst2::UIPathPort(port, vp, this); break; case meta::R_STRING: lsp_trace("creating string port %s", port->id); - vup = new vst2::UIStringPort(port, vp); + vup = new vst2::UIStringPort(port, vp, this); break; case meta::R_SEND_NAME: lsp_trace("creating send name port %s", port->id); - vup = new vst2::UIStringPort(port, vp); + vup = new vst2::UIStringPort(port, vp, this); break; case meta::R_RETURN_NAME: lsp_trace("creating return name port %s", port->id); - vup = new vst2::UIStringPort(port, vp); + vup = new vst2::UIStringPort(port, vp, this); break; case meta::R_CONTROL: - case meta::R_METER: + lsp_trace("creating control port %s", port->id); + vup = new vst2::UIParameterPort(port, static_cast(vp), this); + break; + case meta::R_BYPASS: - lsp_trace("creating regular port %s", port->id); - // VST specifies only INPUT parameters, output should be read in different way - if (meta::is_out_port(port)) - vup = new vst2::UIMeterPort(port, vp); - else - vup = new vst2::UIParameterPort(port, static_cast(vp)); + lsp_trace("creating bypass port %s", port->id); + vup = new vst2::UIParameterPort(port, static_cast(vp), NULL); + break; + + case meta::R_METER: + lsp_trace("creating meter port %s", port->id); + vup = new vst2::UIMeterPort(port, vp); break; case meta::R_PORT_SET: { char postfix_buf[MAX_PARAM_ID_BYTES], param_name[MAX_PARAM_ID_BYTES]; lsp_trace("creating port group %s", port->id); - UIPortGroup *upg = new vst2::UIPortGroup(static_cast(vp)); + UIPortGroup *upg = new vst2::UIPortGroup(static_cast(vp), this); // Add immediately port group to list vPorts.add(upg); @@ -302,6 +306,13 @@ namespace lsp void UIWrapper::main_iteration() { transfer_dsp_to_ui(); + if (pWrapper != NULL) + { + core::preset_state_t state; + if (pWrapper->fetch_preset_state(&state, false)) + receive_preset_state(&state); + } + IWrapper::main_iteration(); } @@ -500,6 +511,12 @@ namespace lsp kvt_release(); } transfer_dsp_to_ui(); + if (pWrapper != NULL) + { + core::preset_state_t state; + if (pWrapper->fetch_preset_state(&state, true)) + receive_preset_state(&state); + } // Show the UI window tk::Window *wnd = window(); @@ -707,6 +724,12 @@ namespace lsp { return (pWrapper != NULL) ? pWrapper->shm_state() : NULL; } + + void UIWrapper::send_preset_state(const core::preset_state_t *state) + { + if (pWrapper != NULL) + pWrapper->set_preset_state(state, vst2::Wrapper::PT_STATE); + } } /* namespace vst2 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/impl/wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -69,6 +69,9 @@ namespace lsp pSamplePlayer = NULL; pShmClient = NULL; + core::init_preset_state(&sPresetState); + atomic_store(&nPresetFlags, PT_NONE); + pFactory->acquire(); } @@ -743,11 +746,22 @@ namespace lsp } } + // Serialize preset state + serialize_preset_state(); + if (sChunk.res != STATUS_OK) + { + lsp_warn("Error serializing preset state code=%d", int(sChunk.res)); + return sChunk.res; + } + status_t res = STATUS_OK; // Serialize KVT storage - if (sKVTMutex.lock()) { + if (!sKVTMutex.lock()) + return STATUS_BAD_STATE; + lsp_finally { sKVTMutex.unlock(); }; + const core::kvt_param_t *p; // Read the whole KVT storage @@ -859,7 +873,6 @@ namespace lsp } sKVT.gc(); - sKVTMutex.unlock(); } return res; @@ -1243,6 +1256,51 @@ namespace lsp } } + bool Wrapper::deserialize_special_variable(const char *name, const uint8_t *head, const uint8_t *tail) + { + lsp_trace("name = %s", name); + if (strcmp(name, "!preset_state") == 0) + { + core::preset_state_t state; + core::init_preset_state(&state); + + // Read flags and tab + IF_UNALIGNED_MEMORY_SAFE( + state.flags = BE_TO_CPU(*advance_ptr(head, 1)); + state.tab = BE_TO_CPU(*advance_ptr(head, 1)); + ) + IF_UNALIGNED_MEMORY_UNSAFE( + uint32_t flags, tab; + memcpy(&flags, advance_ptr_bytes(head, sizeof(uint32_t)), sizeof(uint32_t)); + memcpy(&tab, advance_ptr_bytes(head, sizeof(uint32_t)), sizeof(uint32_t)); + + state.flags = BE_TO_CPU(flags); + state.tab = BE_TO_CPU(tab); + ) + + // Read preset name + const char *pname = reinterpret_cast(head); + const size_t length = lsp_min(strnlen(pname, tail - head), core::PRESET_NAME_BYTES - 1); + memcpy(state.name, pname, length); + state.name[length + 1] = '\0'; + + lsp_trace("preset name = %s, flags=0x%x, tab=%d", state.name, int(state.flags), int(state.tab)); + + head += length + 1; + if (head <= tail) + { + set_preset_state(&state, PT_STATE); + return true; + } + else + lsp_trace("Failed parsing preset state: head=%p > tail=%p", head, tail); + } + else + lsp_warn("Unknown special variable: %s, skipping", name); + + return false; + } + void Wrapper::deserialize_v2_v3(const uint8_t *data, size_t bytes) { const uint8_t *head = data; @@ -1269,7 +1327,16 @@ namespace lsp lsp_warn("Unexpected end of chunk while fetching parameter name"); return; } - if (name[0] == '/') // This is KVT port? + else if (name[0] == '!') + { + head += len; + if (!deserialize_special_variable(name, head, next)) + lsp_warn("Error deserializing special variable %s, skipping", name); + + head = next; + continue; + } + else if (name[0] == '/') // This is KVT parameter? { head -= sizeof(uint32_t); // Rollback head pointer break; @@ -1304,8 +1371,11 @@ namespace lsp // Deserialize KVT state lsp_debug("Reading KVT ports..."); - if (sKVTMutex.lock()) { + if (!sKVTMutex.lock()) + return; + lsp_finally {sKVTMutex.unlock(); }; + sKVT.clear(); while (size_t(tail - head) >= sizeof(uint32_t)) @@ -1429,7 +1499,6 @@ namespace lsp } sKVT.gc(); - sKVTMutex.unlock(); } } @@ -1487,6 +1556,139 @@ namespace lsp pMaster(pEffect, audioMasterUpdateDisplay, 0, 0, 0, 0); } + void Wrapper::set_preset_state(const core::preset_state_t *state, uint32_t mode) + { + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d, mode=%d", + this, state->name, state->flags, state->tab, int(mode)); + + { + // Lock the state + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if ((flags & PT_TYPE) > mode) // Leave if data has greater priority than submitted + { + lsp_trace("preset state not updated, flags=0x%x, mode=%d", int(flags), int(mode)); + return; + } + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, mode & (~PT_LOCK))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + core::copy_preset_state(&sPresetState, state); + } + + // Mark state changed if data was transferred from UI + if (mode == PT_UI) + state_changed(); + + lsp_trace("this=%p, mode=0x%x", this, int(mode)); + } + + bool Wrapper::fetch_preset_state(core::preset_state_t *state, bool force) + { +// lsp_trace("this=%p, force=%s", this, (force) ? "true" : "false"); + + { + // Lock the state + while (true) + { + // We can fetch data only if it is in PT_STATE state or fetch is forced + const uatomic_t flags = atomic_load(&nPresetFlags); + if ((!force) && ((flags & PT_TYPE) != PT_STATE)) + return false; + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, flags & (~(PT_LOCK | PT_TYPE)))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + // Now we have locked state + core::copy_preset_state(state, &sPresetState); + } + + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d", + this, state->name, state->flags, state->tab); + return true; + } + + void Wrapper::serialize_preset_state() + { +// lsp_trace("this=%p", this); + + core::preset_state_t state; + + { + // Lock the atomic state + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // Now we have locked state + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, flags & (~PT_LOCK))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + // Fetch the value + core::copy_preset_state(&state, &sPresetState); + } + + // Serialize stuff + size_t param_off = sChunk.write(uint32_t(0)); // Reserve space for size + if (param_off != 0) + { + sChunk.write_string("!preset_state"); // Preset state object + sChunk.write(state.flags); + sChunk.write(state.tab); + sChunk.write_string(state.name); + sChunk.write_at(param_off, uint32_t(sChunk.offset - param_off - sizeof(uint32_t))); // Write the actual size + } + + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d, mode=0x%x", + this, state.name, state.flags, state.tab); + } + } /* namespace vst2 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ports.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ports.h 2025-08-26 18:15:48.085960977 +0000 @@ -420,10 +420,18 @@ namespace lsp { if (length < sizeof(float)) return -1; - float value = BE_TO_CPU(*(reinterpret_cast(data))); - write_value(value); + + float v; + IF_UNALIGNED_MEMORY_SAFE( + v = BE_TO_CPU(*(reinterpret_cast(data))); + ) + IF_UNALIGNED_MEMORY_UNSAFE( + memcpy(&v, data, sizeof(v)); + v = BE_TO_CPU(v); + ) + write_value(v); atomic_add(&nSID, 1); - return sizeof(float); + return sizeof(v); } virtual bool deserialize_v2(const uint8_t *data, size_t size) override @@ -431,7 +439,14 @@ namespace lsp if (size < sizeof(float)) return false; - float v = BE_TO_CPU(*(reinterpret_cast(data))); + float v; + IF_UNALIGNED_MEMORY_SAFE( + v = BE_TO_CPU(*(reinterpret_cast(data))); + ) + IF_UNALIGNED_MEMORY_UNSAFE( + memcpy(&v, data, sizeof(v)); + v = BE_TO_CPU(v); + ) write_value(v); atomic_add(&nSID, 1); return true; @@ -569,13 +584,20 @@ namespace lsp { if (length < sizeof(int32_t)) return -1; - int32_t value = BE_TO_CPU(*(reinterpret_cast(data))); - if ((value >= 0) && (value < ssize_t(nRows))) + int32_t v; + IF_UNALIGNED_MEMORY_SAFE( + v = BE_TO_CPU(*(reinterpret_cast(data))); + ) + IF_UNALIGNED_MEMORY_UNSAFE( + memcpy(&v, data, sizeof(v)); + v = BE_TO_CPU(v); + ) + if ((v >= 0) && (v < ssize_t(nRows))) { - fValue = value; + fValue = v; atomic_add(&nSID, 1); } - return sizeof(int32_t); + return sizeof(v); } virtual bool deserialize_v2(const uint8_t *data, size_t size) override diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_ports.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_ports.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 7 дек. 2021 г. @@ -63,12 +63,14 @@ namespace lsp class UIPortGroup: public UIPort { private: + ui::IPresetManager *pManager; vst2::PortGroup *pPG; uatomic_t nSID; public: - explicit UIPortGroup(vst2::PortGroup *port) : UIPort(port->metadata(), port) + explicit UIPortGroup(vst2::PortGroup *port, ui::IPresetManager *manager) : UIPort(port->metadata(), port) { + pManager = manager; pPG = port; nSID = port->sid() - 1; } @@ -86,7 +88,13 @@ namespace lsp virtual void set_value(float value) override { + value = limit_value(pMetadata, value); + if (value == pPort->value()) + return; + pPort->set_value(value); + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual bool sync() override @@ -107,13 +115,15 @@ namespace lsp class UIParameterPort: public UIPort { protected: - float fValue; - uatomic_t nSID; + ui::IPresetManager *pManager; + float fValue; + uatomic_t nSID; public: - explicit UIParameterPort(const meta::port_t *meta, vst2::ParameterPort *port): + explicit UIParameterPort(const meta::port_t *meta, vst2::ParameterPort *port, ui::IPresetManager *manager): UIPort(meta, port) { + pManager = manager; fValue = meta->start; nSID = port->sid() - 1; } @@ -137,9 +147,15 @@ namespace lsp virtual void set_value(float value) override { - fValue = meta::limit_value(pMetadata, value); + value = meta::limit_value(pMetadata, value); + if (value == fValue) + return; + + fValue = value; if (pPort != NULL) pPort->write_value(value); + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual bool sync() override @@ -327,11 +343,13 @@ namespace lsp class UIPathPort: public UIPort { private: - vst2::path_t *pPath; + ui::IPresetManager *pManager; + vst2::path_t *pPath; public: - explicit UIPathPort(const meta::port_t *meta, vst2::Port *port): UIPort(meta, port) + explicit UIPathPort(const meta::port_t *meta, vst2::Port *port, ui::IPresetManager *manager): UIPort(meta, port) { + pManager = manager; plug::path_t *path = pPort->buffer(); if (path != NULL) pPath = static_cast(path); @@ -368,8 +386,12 @@ namespace lsp virtual void write(const void *buffer, size_t size, size_t flags) override { - if (pPath != NULL) - pPath->submit(static_cast(buffer), size, true, flags); + if (pPath == NULL) + return; + + pPath->submit(static_cast(buffer), size, true, flags); + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void set_default() override @@ -381,13 +403,16 @@ namespace lsp class UIStringPort: public UIPort { private: - plug::string_t *pValue; - char *pData; - uint32_t nSerial; + ui::IPresetManager *pManager; + plug::string_t *pValue; + char *pData; + uint32_t nSerial; public: - explicit UIStringPort(const meta::port_t *meta, vst2::Port *port): UIPort(meta, port) + explicit UIStringPort(const meta::port_t *meta, vst2::Port *port, ui::IPresetManager *manager): UIPort(meta, port) { + pManager = manager; + vst2::StringPort *sp = static_cast(port); pValue = sp->data(); pData = (pValue != NULL) ? reinterpret_cast(malloc(pValue->max_bytes() + 1)) : NULL; @@ -447,6 +472,9 @@ namespace lsp const size_t count = lsp_min(size, pValue->nCapacity); plug::utf8_strncpy(pData, count, buffer, size); nSerial = pValue->submit(buffer, size, flags & plug::PF_STATE_RESTORE); + + if (pManager != NULL) + pManager->mark_active_preset_dirty(); } virtual void set_default() override diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/ui_wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 12 дек. 2021 г. @@ -76,7 +76,7 @@ namespace lsp virtual status_t init(void *root_widget) override; virtual void destroy() override; - public: // plug::IWrapper + public: // ui::IWrapper virtual core::KVTStorage *kvt_lock() override; virtual core::KVTStorage *kvt_trylock() override; virtual bool kvt_release() override; @@ -86,6 +86,7 @@ namespace lsp virtual status_t play_file(const char *file, wsize_t position, bool release) override; virtual meta::plugin_format_t plugin_format() const override; virtual const core::ShmState *shm_state() override; + virtual void send_preset_state(const core::preset_state_t *state) override; public: bool show_ui(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/wrapper.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst2/wrapper.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 8 дек. 2021 г. @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,16 @@ namespace lsp private: friend class UIWrapper; + enum preset_type_t + { + PT_NONE = 0, + PT_UI = 1, + PT_STATE = 2, + + PT_TYPE = 0x000f, + PT_LOCK = 0x8000 + }; + private: AEffect *pEffect; vst2::Factory *pFactory; @@ -69,6 +80,8 @@ namespace lsp vst2::Port *pBypass; core::SamplePlayer *pSamplePlayer; // Sample player core::ShmClient *pShmClient; // Shared memory client + core::preset_state_t sPresetState; // Preset state + uatomic_t nPresetFlags; // Preset flags lltl::parray vAudioPorts; // List of audio ports lltl::parray vAudioBuffers; // Audio buffer ports @@ -98,6 +111,10 @@ namespace lsp bool check_parameters_updated(); void apply_settings_update(); void report_latency(); + void set_preset_state(const core::preset_state_t *state, uint32_t mode); + bool fetch_preset_state(core::preset_state_t *state, bool force); + bool deserialize_special_variable(const char *name, const uint8_t *head, const uint8_t *tail); + void serialize_preset_state(); public: Wrapper( diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/controller.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/controller.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/controller.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/controller.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 5 февр. 2024 г. @@ -79,6 +79,7 @@ namespace lsp lltl::parray vPlainParams; // Input parameters (non-virtual) sorted according to the metadata order lltl::parray vParams; // Input parameters (non-virtual) sorted by unique parameter ID lltl::parray vMeters; // Meters + core::preset_state_t sPresetState; // Preset state #ifdef WITH_UI_FEATURE ipc::Mutex sWrappersLock; // Lock of wrappers @@ -103,9 +104,11 @@ namespace lsp void parse_raw_osc_event(osc::parse_frame_t *frame); status_t load_state(Steinberg::IBStream *is); void send_kvt_state(); + status_t deserialize_preset_state(core::preset_state_t *state, Steinberg::IBStream *is); #ifdef WITH_UI_FEATURE protected: + void receive_preset_state(ui::IWrapper *except); ui::Module *create_ui(); #endif /* WITH_UI_FEATURE */ @@ -138,11 +141,13 @@ namespace lsp status_t play_file(const char *file, wsize_t position, bool release); vst3::CtlPort *port_by_id(const char *id); void dump_state_request(); + void notify_preset_changed(); const core::ShmState *shm_state(); #ifdef WITH_UI_FEATURE public: // UI-related stuff status_t detach_ui_wrapper(UIWrapper *wrapper); + void send_preset_state(UIWrapper *wrapper, const core::preset_state_t *state); #endif /* WITH_UI_FEATURE */ public: // vst3::IDataSync diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ctl_ports.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ctl_ports.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ctl_ports.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ctl_ports.h 2025-08-26 18:15:48.085960977 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 6 февр. 2024 г. @@ -203,8 +203,12 @@ namespace lsp virtual void set_value(float value, size_t flags) override { + value = meta::limit_value(pMetadata, value); + if (value == fValue) + return; + lsp_trace("id=%s, value=%f, handler=%p", pMetadata->id, value, pHandler); - fValue = meta::limit_value(pMetadata, value); + fValue = value; if (pHandler != NULL) pHandler->port_write(this, flags); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/data.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/data.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/data.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/data.h 2025-08-26 18:15:48.085960977 +0000 @@ -61,6 +61,7 @@ namespace lsp constexpr const char *ID_MSG_KVT = "KVT"; constexpr const char *ID_MSG_ACTIVATE_UI = "UIActivate"; constexpr const char *ID_MSG_DEACTIVATE_UI = "UIDeactivate"; + constexpr const char *ID_MSG_PRESET_STATE = "PresetState"; constexpr const char *ID_MSG_PLAY_SAMPLE = "PlaySample"; constexpr const Steinberg::Vst::ParamID MIDI_MAPPING_PARAM_BASE = 0x40000000; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/event_handler.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/event_handler.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/event_handler.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/event_handler.h 2025-08-26 18:15:48.089960938 +0000 @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 6 июл. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_WRAP_VST3_EVENT_HANDLER_H_ +#define LSP_PLUG_IN_PLUG_FW_WRAP_VST3_EVENT_HANDLER_H_ + +#include + +#include + +#include +#include +#include + +#ifdef VST_USE_RUNLOOP_IFACE + +namespace lsp +{ + namespace vst3 + { + class EventHandler: public Steinberg::Linux::IEventHandler + { + private: + uatomic_t nRefCounter; + IUISync *pHandler; + + public: + EventHandler(IUISync *handler); + virtual ~EventHandler(); + EventHandler(const EventHandler &) = delete; + EventHandler(EventHandler &&) = delete; + + EventHandler & operator = (const EventHandler &) = delete; + EventHandler & operator = (EventHandler &&) = delete; + + public: // Steinberg::FUnknown + virtual Steinberg::tresult PLUGIN_API queryInterface(const Steinberg::TUID _iid, void **obj) override; + virtual Steinberg::uint32 PLUGIN_API addRef() override; + virtual Steinberg::uint32 PLUGIN_API release() override; + + public: // Steinberg::Linux::ITimerHandler + virtual void PLUGIN_API onFDIsSet(Steinberg::Linux::FileDescriptor fd) override; + }; + + } /* namespace vst3 */ +} /* namespace lsp */ + +#endif /* VST_USE_RUNLOOP_IFACE */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_WRAP_VST3_EVENT_HANDLER_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/factory.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/factory.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/factory.h 2025-03-01 12:42:57.440644496 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/factory.h 2025-08-26 18:15:48.089960938 +0000 @@ -67,7 +67,7 @@ namespace lsp ipc::IExecutor *pExecutor; // Offline task executor ipc::Thread *pDataSync; // Synchronization thread meta::package_t *pPackage; // Package manifest - volatile IDataSync *pActiveSync; // Active data sync + void *pActiveSync; // Active data sync lltl::ptrset vDataSync; // List of objects for synchronization core::CatalogManager sCatalogManager;// Catalog management diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/helpers.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/helpers.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/helpers.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/helpers.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 28 дек. 2023 г. @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -269,15 +270,32 @@ namespace lsp return STATUS_OK; } + inline status_t sizeof_varint(size_t value) + { + size_t szof = 0; + do { + ++szof; + value >>= 7; + } while (value > 0); + + return szof; + }; + /** * Write string to VST3 output stream * @param os VST3 output stream * @param s NULL-terminated string to write * @return number of actual bytes written or negative error code */ + inline size_t sizeof_string(const char *s) + { + const size_t len = strlen(s); + return sizeof_varint(len) + len; + } + inline status_t write_string(Steinberg::IBStream *os, const char *s) { - size_t len = strlen(s); + const size_t len = strlen(s); // Write variable-sized string length status_t res = write_varint(os, len); @@ -324,31 +342,71 @@ namespace lsp } /** - * Write floating-point value to the stream + * Write named floating-point value to the stream * @param is output stream * @param key parameter name + * @param type parameter type * @param value parameter value * @return status of operation */ template - inline status_t write_value(Steinberg::IBStream *is, const char *key, const T value) + inline status_t write_value(Steinberg::IBStream *is, const char *key, uint8_t type, const T value) { status_t res = write_string(is, key); - if (res == STATUS_OK) - { - T tmp = CPU_TO_LE(value); - res = write_fully(is, &tmp, sizeof(T)); - } - return res; + if (res != STATUS_OK) + return res; + + if ((res = write_fully(is, &type, sizeof(type))) != STATUS_OK) + return res; + + T tmp = CPU_TO_LE(value); + return write_fully(is, &tmp, sizeof(T)); } + /** + * Write named string value to the stream + * @param is output stream + * @param key parameter name + * @param value parameter value + * @param type parameter type + * @return status of operation + */ template <> - inline status_t write_value(Steinberg::IBStream *is, const char *key, const char *value) + inline status_t write_value(Steinberg::IBStream *is, const char *key, uint8_t type, const char *value) { status_t res = write_string(is, key); - if (res == STATUS_OK) - res = write_string(is, value); - return res; + if (res != STATUS_OK) + return res; + + if ((res = write_fully(is, &type, sizeof(type))) != STATUS_OK) + return res; + + return write_string(is, value); + } + + /** + * Write single value to the stream + * @param is output stream + * @param value value to write + * @return status of operation + */ + template + inline status_t write_single(Steinberg::IBStream *is, const T value) + { + T tmp = CPU_TO_LE(value); + return write_fully(is, &tmp, sizeof(T)); + } + + /** + * Write single UTF-8 string to the stream + * @param is output stream + * @param value value to write + * @return status of operation + */ + template <> + inline status_t write_single(Steinberg::IBStream *is, const char *value) + { + return write_string(is, value); } /** @@ -623,30 +681,18 @@ namespace lsp inline plug::mesh_t *create_mesh(const meta::port_t *meta) { - size_t buffers = meta->step; - size_t buf_size = meta->start * sizeof(float); - size_t mesh_size = sizeof(plug::mesh_t) + sizeof(float *) * buffers; - - // Align values to 64-byte boundaries - buf_size = align_size(buf_size, 0x40); - mesh_size = align_size(mesh_size, 0x40); + const size_t buffers = meta->step; + const size_t buf_size = align_size(meta->start * sizeof(float), 0x40); + const size_t mesh_size = align_size(sizeof(plug::mesh_t) + sizeof(float *) * buffers, 0x40); // Allocate pointer - uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); + uint8_t *ptr = static_cast(malloc(mesh_size + buf_size * buffers)); if (ptr == NULL) return NULL; - // Initialize references - plug::mesh_t *mesh = reinterpret_cast(ptr); - mesh->nState = plug::M_EMPTY; - mesh->nBuffers = 0; - mesh->nItems = 0; - ptr += mesh_size; - for (size_t i=0; ipvData[i] = reinterpret_cast(ptr); - ptr += buf_size; - } + // Initialize mesh + plug::mesh_t *mesh = advance_ptr_bytes(ptr, mesh_size); + mesh->init(reinterpret_cast(ptr), buffers, buf_size / sizeof(float)); return mesh; } @@ -1054,6 +1100,57 @@ namespace lsp return false; } + inline status_t serialize_preset_state(Steinberg::IBStream *os, const core::preset_state_t *state) + { + status_t res; + + const size_t szof = sizeof(uint32_t) * 2 + sizeof_string(state->name); + + // Serialize obtained preset state + if ((res = write_string(os, "!preset_state")) != STATUS_OK) + return res; + if ((res = write_varint(os, szof)) != STATUS_OK) + return res; + if ((res = write_single(os, uint32_t(state->flags))) != STATUS_OK) + return res; + if ((res = write_single(os, uint32_t(state->tab))) != STATUS_OK) + return res; + return write_string(os, state->name); + } + + inline status_t deserialize_preset_state(core::preset_state_t *state, Steinberg::IBStream *is) + { + status_t res; + char *name = NULL; + size_t name_cap = 0; + lsp_finally { + if (name != NULL) + free(name); + }; + + size_t in_szof = 0; + uint32_t flags = 0, tab = 0; + if ((res = read_varint(is, &in_szof)) != STATUS_OK) + return res; + if ((res = read_fully(is, &flags)) != STATUS_OK) + return res; + if ((res = read_fully(is, &tab)) != STATUS_OK) + return res; + if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) + return res; + + name_cap = lsp_min(name_cap, core::PRESET_NAME_BYTES - 1); + core::init_preset_state(state); + state->flags = flags; + state->tab = tab; + memcpy(state->name, name, name_cap); + state->name[name_cap] = '\0'; + + const size_t szof = sizeof(uint32_t) * 2 + sizeof_string(state->name); + + return (szof == in_szof) ? STATUS_OK : STATUS_CORRUPTED; + } + } /* namespace vst3 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/controller.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/controller.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/controller.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/controller.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 6 февр. 2024 г. @@ -78,6 +78,8 @@ namespace lsp fScalingFactor = -1.0f; bMidiMapping = false; bMsgWorkaround = false; + + core::init_preset_state(&sPresetState); } Controller::~Controller() @@ -288,11 +290,12 @@ namespace lsp { port_id, port_desc, + NULL, meta::U_NONE, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, 0.0f, 1.0f, 0.0f, 0.00001f, - NULL, NULL + NULL, NULL, NULL }; // Generate ports for all possible control codes @@ -519,11 +522,6 @@ namespace lsp Steinberg::tresult PLUGIN_API Controller::notify(Steinberg::Vst::IMessage *message) { - // Set-up DSP context - dsp::context_t ctx; - dsp::start(&ctx); - lsp_finally { dsp::finish(&ctx); }; - // Obtain the message data if (message == NULL) return Steinberg::kInvalidArgument; @@ -534,6 +532,11 @@ namespace lsp if (atts == NULL) return Steinberg::kInvalidArgument; + // Set-up DSP context + dsp::context_t ctx; + dsp::start(&ctx); + lsp_finally { dsp::finish(&ctx); }; + // Analyze the message Steinberg::char8 key[32]; Steinberg::int64 byte_order = VST3_BYTEORDER; @@ -603,15 +606,18 @@ namespace lsp #ifdef WITH_UI_FEATURE // Notify UI about position update + lltl::parray receivers; if (sWrappersLock.lock()) { lsp_finally { sWrappersLock.unlock(); }; - for (lltl::iterator it = vWrappers.values(); it; ++it) - { - UIWrapper *w = it.get(); - if (w != NULL) - w->commit_position(&pos); - } + receivers.add(vWrappers); + } + + for (lltl::iterator it = receivers.values(); it; ++it) + { + UIWrapper *w = it.get(); + if (w != NULL) + w->commit_position(&pos); } #endif /* WITH_UI_FEATURE */ } @@ -628,15 +634,18 @@ namespace lsp #ifdef WITH_UI_FEATURE // Notify UI about position update + lltl::parray receivers; if (sWrappersLock.lock()) { lsp_finally { sWrappersLock.unlock(); }; - for (lltl::iterator it = vWrappers.values(); it; ++it) - { - UIWrapper *w = it.get(); - if (w != NULL) - w->set_play_position(position, length); - } + receivers.add(vWrappers); + } + + for (lltl::iterator it = receivers.values(); it; ++it) + { + UIWrapper *w = it.get(); + if (w != NULL) + w->set_play_position(position, length); } #endif /* WITH_UI_FEATURE */ } @@ -1025,6 +1034,38 @@ namespace lsp sKVTMutex.unlock(); } } + #ifdef WITH_UI_FEATURE + else if (!strcmp(message_id, ID_MSG_PRESET_STATE)) + { + // Get endianess + if (atts->getInt("endian", byte_order) != Steinberg::kResultOk) + return Steinberg::kResultFalse; + + Steinberg::int64 flags = 0, tab = 0; + + if (atts->getInt("flags", flags) != Steinberg::kResultOk) + return Steinberg::kResultFalse; + if (atts->getInt("tab", tab) != Steinberg::kResultOk) + return Steinberg::kResultFalse; + + // Read identifier of the mesh port + const char *name = sRxNotifyBuf.get_string(atts, "name", byte_order); + if (name == NULL) + return Steinberg::kResultFalse; + + lsp_trace("Received preset state flags=0x%x, tab=%d, name='%s'", + int(flags), int(tab), name); + + // Commit state + sPresetState.flags = uint32_t(flags); + sPresetState.tab = uint32_t(tab); + const size_t length = lsp_min(strnlen(name, core::PRESET_NAME_BYTES), core::PRESET_NAME_BYTES - 1); + memcpy(sPresetState.name, name, length); + sPresetState.name[length] = '\0'; + + receive_preset_state(NULL); + } + #endif /* WITH_UI_FEATURE */ return Steinberg::kResultOk; } @@ -1107,7 +1148,11 @@ namespace lsp lsp_warn("Failed to read serial version"); return STATUS_CORRUPTED; } - if (version != 1) + + bool param_types = false; + if (version == 2) + param_types = true; + else if (version != 1) { lsp_warn("Unsupported serial version %d", int(version)); return STATUS_CORRUPTED; @@ -1145,8 +1190,67 @@ namespace lsp lsp_trace("Parameter name: %s", name); - if (name[0] != '/') + if (name[0] == '/') { + // Read the KVT parameter flags + uint8_t flags = 0; + if ((res = read_fully(is, &flags)) != STATUS_OK) + { + lsp_warn("Failed to resolve flags for parameter id=%s", name); + return res; + } + + lsp_trace("Parameter flags: 0x%x", int(flags)); + if ((res = read_kvt_value(is, name, &p)) != STATUS_OK) + { + lsp_warn("Failed to read value for KVT parameter id=%s, code=%d", name, int(res)); + return res; + } + + // This is KVT port, skip private data for DSP code + if ((p.type != core::KVT_ANY) && (!(flags & vst3::FLAG_PRIVATE))) + { + size_t kflags = core::KVT_TX; + kvt_dump_parameter("Fetched KVT parameter %s = ", &p, name); + sKVT.put(name, &p, kflags); + } + } + else if (name[0] == '!') + { + if (strcmp(name, "!preset_state") == 0) + { + core::preset_state_t state; + if ((res = vst3::deserialize_preset_state(&state, is)) != STATUS_OK) + { + lsp_warn("Failed to deserialize preset state, error code=%d", int(res)); + return res; + } + + core::copy_preset_state(&sPresetState, &state); + } + else + { + lsp_warn("Unknown special variable: %s, skipping", name); + if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) + { + lsp_warn("Failed to skip special variable", int(res)); + return res; + } + } + } + else + { + // Read parameter type + uint8_t param_type = '?'; + if (param_types) + { + if ((res = read_fully(is, ¶m_type)) != STATUS_OK) + { + lsp_warn("Failed to deserialize parameter type, error code=%d", int(res)); + return res; + } + } + // Try to find virtual port vst3::CtlPort *p = port_by_id(name); if (p != NULL) @@ -1154,39 +1258,58 @@ namespace lsp const meta::port_t *meta = p->metadata(); if (meta::is_path_port(meta)) { - vst3::CtlPathPort *pp = static_cast(p); + if ((param_type != '?') && (param_type != 's')) + { + lsp_warn("Failed to deserialize port id=%s: invalid parameter type '%c'", meta->id, char(param_type)); + return res; + } if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) { lsp_warn("Failed to deserialize port id=%s", meta->id); return res; } + + vst3::CtlPathPort *pp = static_cast(p); lsp_trace(" %s = %s", meta->id, name); pp->commit_value(name); pp->mark_changed(); } else if (meta::is_string_holding_port(meta)) { - vst3::CtlStringPort *sp = static_cast(p); + if ((param_type != '?') && (param_type != 's')) + { + lsp_warn("Failed to deserialize port id=%s: invalid parameter type '%c'", meta->id, char(param_type)); + return res; + } if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) { lsp_warn("Failed to deserialize port id=%s", meta->id); return res; } + + vst3::CtlStringPort *sp = static_cast(p); lsp_trace(" %s = %s", meta->id, name); sp->commit_value(name); sp->mark_changed(); } else if ((meta::is_control_port(meta)) || (meta::is_bypass_port(meta)) || (meta::is_port_set_port(meta))) { - vst3::CtlParamPort *pp = static_cast(p); + if ((param_type != '?') && (param_type != 'f')) + { + lsp_warn("Failed to deserialize port id=%s: invalid parameter type '%c'", meta->id, char(param_type)); + return res; + } + float v = 0.0f; if ((res = read_fully(is, &v)) != STATUS_OK) { lsp_warn("Failed to deserialize port id=%s", name); return res; } + + vst3::CtlParamPort *pp = static_cast(p); lsp_trace(" %s = %f", meta->id, v); pp->commit_value(v); pp->mark_changed(); @@ -1195,31 +1318,35 @@ namespace lsp lsp_warn("Port id=%s is present in serial data but has invalid type", name); } else - lsp_warn("Missing port id=%s, skipping", name); - } - else - { - // Read the KVT parameter flags - uint8_t flags = 0; - if ((res = read_fully(is, &flags)) != STATUS_OK) - { - lsp_warn("Failed to resolve flags for parameter id=%s", name); - return res; - } - - lsp_trace("Parameter flags: 0x%x", int(flags)); - if ((res = read_kvt_value(is, name, &p)) != STATUS_OK) - { - lsp_warn("Failed to read value for KVT parameter id=%s, code=%d", name, int(res)); - return res; - } - - // This is KVT port, skip private data for DSP code - if ((p.type != core::KVT_ANY) && (!(flags & vst3::FLAG_PRIVATE))) { - size_t kflags = core::KVT_TX; - kvt_dump_parameter("Fetched KVT parameter %s = ", &p, name); - sKVT.put(name, &p, kflags); + lsp_warn("Missing port id=%s, skipping", name); + switch (param_type) + { + case 'f': + { + float v; + if ((res = read_fully(is, &v)) != STATUS_OK) + { + lsp_warn("Failed to skip floating-point parameter"); + return res; + } + break; + } + case 's': + { + if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) + { + lsp_warn("Failed to skip string"); + return res; + } + break; + } + case '?': + break; + default: + lsp_warn("Unknown parameter type: '%c'", param_type); + return STATUS_CORRUPTED; + } } } } @@ -1251,7 +1378,14 @@ namespace lsp ); status_t res = load_state(state); - return (res == STATUS_OK) ? Steinberg::kResultOk : Steinberg::kInternalError; + if (res != STATUS_OK) + return Steinberg::kInternalError; + + #ifdef WITH_UI_FEATURE + receive_preset_state(NULL); + #endif /* WITH_UI_FEATURE */ + + return Steinberg::kResultOk; } Steinberg::int32 PLUGIN_API Controller::getParameterCount() @@ -1568,6 +1702,45 @@ namespace lsp return STATUS_OK; } + void Controller::send_preset_state(UIWrapper *wrapper, const core::preset_state_t *state) + { + // Copy preset state + core::copy_preset_state(&sPresetState, state); + + // Notify receivers + receive_preset_state(wrapper); + + // Send message to DSP backend + if (pPeerConnection != NULL) + { + LSPString name; + if (!name.set_utf8(state->name)) + return; + + // Allocate new message + Steinberg::Vst::IMessage *msg = alloc_message(pHostApplication, bMsgWorkaround); + if (msg == NULL) + return; + lsp_finally { safe_release(msg); }; + + // Initialize and send the message + msg->setMessageID(vst3::ID_MSG_PRESET_STATE); + Steinberg::Vst::IAttributeList *list = msg->getAttributes(); + + if (list->setInt("endian", VST3_BYTEORDER) != Steinberg::kResultOk) + return; + if (list->setInt("flags", state->flags) != Steinberg::kResultOk) + return; + if (list->setInt("tab", state->tab) != Steinberg::kResultOk) + return; + if (list->setString("name", to_tchar(name.get_utf16())) != Steinberg::kResultOk) + return; + + // Notify peer + pPeerConnection->notify(msg); + } + } + Steinberg::IPlugView * PLUGIN_API Controller::createView(Steinberg::FIDString name) { lsp_trace("this=%p, name=%s", this, name); @@ -1629,6 +1802,9 @@ namespace lsp } } + // Send peset state + w->receive_preset_state(&sPresetState); + // Return pointer to wrapper return w; } @@ -1740,6 +1916,23 @@ namespace lsp pPeerConnection->notify(msg); } + void Controller::notify_preset_changed() + { + #ifdef WITH_UI_FEATURE + // Notify UI about preset change + if (sWrappersLock.lock()) + { + lsp_finally { sWrappersLock.unlock(); }; + for (lltl::iterator it = vWrappers.values(); it; ++it) + { + UIWrapper *w = it.get(); + if (w != NULL) + w->mark_active_preset_dirty(); + } + } + #endif /* WITH_UI_FEATURE */ + } + const core::ShmState *Controller::shm_state() { return sShmState.get(); @@ -1838,6 +2031,7 @@ namespace lsp // Finally, we're ready to send message pPeerConnection->notify(msg); + notify_preset_changed(); } else if (meta::is_string_holding_port(meta)) { @@ -1870,6 +2064,7 @@ namespace lsp // Finally, we're ready to send message pPeerConnection->notify(msg); + notify_preset_changed(); } else { @@ -1905,6 +2100,7 @@ namespace lsp // Finally, we're ready to send message pPeerConnection->notify(msg); + notify_preset_changed(); } else { @@ -1916,6 +2112,7 @@ namespace lsp pComponentHandler->beginEdit(param_id); pComponentHandler->performEdit(param_id, valueNormalized); pComponentHandler->endEdit(param_id); + notify_preset_changed(); } } } @@ -1991,6 +2188,26 @@ namespace lsp } } + #ifdef WITH_UI_FEATURE + void Controller::receive_preset_state(ui::IWrapper *except) + { + // Notify UI about position update + lltl::parray receivers; + if (sWrappersLock.lock()) + { + lsp_finally { sWrappersLock.unlock(); }; + receivers.add(vWrappers); + } + + for (lltl::iterator it = receivers.values(); it; ++it) + { + UIWrapper *w = it.get(); + if ((w != NULL) && (w != except)) + w->receive_preset_state(&sPresetState); + } + } + #endif /* WITH_UI_FEATURE */ + } /* namespace vst3 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/event_handler.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/event_handler.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/event_handler.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/event_handler.h 2025-08-26 18:15:48.089960938 +0000 @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 6 июл. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef LSP_PLUG_IN_PLUG_FW_WRAP_VST3_IMPL_EVENT_HANDLER_H_ +#define LSP_PLUG_IN_PLUG_FW_WRAP_VST3_IMPL_EVENT_HANDLER_H_ + +#include + +#include + +#include +#include +#include +#include + +#ifdef VST_USE_RUNLOOP_IFACE + +namespace lsp +{ + namespace vst3 + { + EventHandler::EventHandler(IUISync *handler) + { + atomic_store(&nRefCounter, 1); + pHandler = handler; + } + + EventHandler::~EventHandler() + { + pHandler = NULL; + } + + Steinberg::tresult PLUGIN_API EventHandler::queryInterface(const Steinberg::TUID _iid, void **obj) + { + // Cast to the requested interface + if (Steinberg::iidEqual(_iid, Steinberg::FUnknown::iid)) + return cast_interface(this, obj); + if (Steinberg::iidEqual(_iid, Steinberg::Linux::IEventHandler::iid)) + return cast_interface(this, obj); + + return no_interface(obj); + } + + Steinberg::uint32 PLUGIN_API EventHandler::addRef() + { + return atomic_add(&nRefCounter, 1) + 1; + } + + Steinberg::uint32 PLUGIN_API EventHandler::release() + { + atomic_t ref_count = atomic_add(&nRefCounter, -1) - 1; + if (ref_count == 0) + delete this; + + return ref_count; + } + + void PLUGIN_API EventHandler::onFDIsSet(Steinberg::Linux::FileDescriptor fd) + { + if (pHandler != NULL) + pHandler->sync_ui(); + }; + + } /* namespace vst3 */ +} /* namespace lsp */ + +#endif /* VST_USE_RUNLOOP_IFACE */ + + + +#endif /* LSP_PLUG_IN_PLUG_FW_WRAP_VST3_IMPL_EVENT_HANDLER_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/factory.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/factory.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/factory.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/factory.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 27 дек. 2023 г. @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -61,7 +62,7 @@ namespace lsp pExecutor = NULL; pDataSync = NULL; pPackage = NULL; - pActiveSync = NULL; + atomic_store(&pActiveSync, NULL); #ifdef VST_USE_RUNLOOP_IFACE pRunLoop = NULL; @@ -686,7 +687,7 @@ namespace lsp if (!vDataSync.remove(sync)) return STATUS_NOT_FOUND; - while (pActiveSync == sync) + while (atomic_load(&pActiveSync) == sync) { // TODO: replace this with proper solution (add conditional wait) // sDataMutex.wait(); @@ -753,14 +754,14 @@ namespace lsp lsp_finally { sDataMutex.unlock(); }; if (!vDataSync.contains(dsync)) continue; - pActiveSync = dsync; + atomic_store(&pActiveSync, dsync); } // Now dsync object is locked, perform processing dsync->sync_data(); // Finally, unlock the data sync - pActiveSync = NULL; + atomic_store(&pActiveSync, NULL); } // Wait for a while diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/timer.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/timer.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/timer.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/timer.h 2025-08-26 18:15:48.089960938 +0000 @@ -53,7 +53,7 @@ namespace lsp // Cast to the requested interface if (Steinberg::iidEqual(_iid, Steinberg::FUnknown::iid)) return cast_interface(this, obj); - if (Steinberg::iidEqual(_iid, Steinberg::IPluginFactory::iid)) + if (Steinberg::iidEqual(_iid, Steinberg::Linux::ITimerHandler::iid)) return cast_interface(this, obj); return no_interface(obj); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/ui_wrapper.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/ui_wrapper.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 3 янв. 2024 г. @@ -62,7 +62,8 @@ namespace lsp #ifdef VST_USE_RUNLOOP_IFACE pRunLoop = NULL; - pTimer = safe_acquire(new vst3::PlatformTimer(this)); + pTimer = new vst3::PlatformTimer(this); + pEventHandler = new vst3::EventHandler(this); #endif /* VST_USE_RUNLOOP_IFACE */ } @@ -70,6 +71,11 @@ namespace lsp { lsp_trace("this=%p", this); + #ifdef VST_USE_RUNLOOP_IFACE + safe_release(pTimer); + safe_release(pEventHandler); + #endif /* VST_USE_RUNLOOP_IFACE */ + // Remove self from synchronization list of UI wrapper if (pController != NULL) pController->detach_ui_wrapper(this); @@ -550,6 +556,7 @@ namespace lsp #if defined(PLATFORM_WINDOWS) supported = (strcmp(type, Steinberg::kPlatformTypeHWND) == 0); #elif defined(PLATFORM_MACOSX) + supported = (strcmp(type, Steinberg::kPlatformTypeNSView) == 0); #else supported = (strcmp(type, Steinberg::kPlatformTypeX11EmbedWindowID) == 0); #endif @@ -566,8 +573,17 @@ namespace lsp #ifdef VST_USE_RUNLOOP_IFACE // Register the timer for event loop lsp_trace("this=%p, pRunLoop=%p, pTimer=%p", this, pRunLoop, pTimer); - if ((pRunLoop != NULL) && (pTimer != NULL)) - pRunLoop->registerTimer(pTimer, 1000 / UI_FRAMES_PER_SECOND); + if (pRunLoop != NULL) + { + if (pEventHandler != NULL) + { + int fd = 0; + if ((wWindow->display()->get_file_descriptor(&fd)) == STATUS_OK) + pRunLoop->registerEventHandler(pEventHandler, fd); + } + if (pTimer != NULL) + pRunLoop->registerTimer(pTimer, 1000 / UI_FRAMES_PER_SECOND); + } #endif /* VST_USE_RUNLOOP_IFACE */ // Show the window @@ -597,8 +613,13 @@ namespace lsp #ifdef VST_USE_RUNLOOP_IFACE // Unregister the timer for event loop - if ((pRunLoop != NULL) && (pTimer != NULL)) - pRunLoop->unregisterTimer(pTimer); + if (pRunLoop != NULL) + { + if (pEventHandler != NULL) + pRunLoop->unregisterEventHandler(pEventHandler); + if (pTimer != NULL) + pRunLoop->unregisterTimer(pTimer); + } #endif /* VST_USE_RUNLOOP_IFACE */ return Steinberg::kResultOk; @@ -656,12 +677,16 @@ namespace lsp lsp_trace("window is not visible"); ws::size_limit_t sr; - wWindow->get_size_limits(&sr); + wWindow->get_padded_size_limits(&sr); + + lsp_trace("size limits: width={min=%d, max=%d, pre=%d}, height={min=%d, max=%d, pre=%d}", + int(sr.nMinWidth), int(sr.nMaxWidth), int(sr.nPreWidth), + int(sr.nMinHeight), int(sr.nMaxHeight), int(sr.nPreHeight)); size->left = 0; size->top = 0; - size->right = lsp_min(sr.nMinWidth, 32); - size->bottom = lsp_min(sr.nMinHeight, 32); + size->right = lsp_max(sr.nMinWidth, 32); + size->bottom = lsp_max(sr.nMinHeight, 32); } lsp_trace("this=%p, size={left=%d, top=%d, right=%d, bottom=%d}", @@ -717,13 +742,35 @@ namespace lsp pPlugFrame = safe_acquire(frame); #ifdef VST_USE_RUNLOOP_IFACE + // Release previous pointer of the run loop + if (pRunLoop != NULL) + { + // Unregister the timer for event loop + if (pEventHandler != NULL) + pRunLoop->unregisterEventHandler(pEventHandler); + if (pTimer != NULL) + pRunLoop->unregisterTimer(pTimer); + safe_release(pRunLoop); + pRunLoop = NULL; + } + // Acquire new pointer to the run loop - safe_release(pRunLoop); pRunLoop = safe_query_iface(frame); if (pRunLoop == NULL) pRunLoop = pController->acquire_run_loop(); - lsp_trace("RUN LOOP object=%p", pRunLoop); + lsp_trace("RUN LOOP object=%p", pRunLoop); + if (pRunLoop != NULL) + { + if (pEventHandler != NULL) + { + int fd = 0; + if ((wWindow->display()->get_file_descriptor(&fd)) == STATUS_OK) + pRunLoop->registerEventHandler(pEventHandler, fd); + } + if (pTimer != NULL) + pRunLoop->registerTimer(pTimer, 1000 / UI_FRAMES_PER_SECOND); + } #endif /* VST_USE_RUNLOOP_IFACE */ return Steinberg::kResultOk; @@ -788,6 +835,7 @@ namespace lsp void UIWrapper::sync_ui() { + lsp_trace("sync_ui this=%p, pDisplay=%p"); if (pDisplay != NULL) pDisplay->main_iteration(); } @@ -870,6 +918,11 @@ namespace lsp return pController->shm_state(); } + void UIWrapper::send_preset_state(const core::preset_state_t *state) + { + pController->send_preset_state(this, state); + } + } /* namespace vst3 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/wrapper.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/impl/wrapper.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 1 янв. 2024 г. @@ -93,12 +93,16 @@ namespace lsp nDirtyResp = 0; nDumpReq = 0; nDumpResp = 0; + atomic_store(&nPresetFlags, PT_NONE); + nMaxSamplesPerBlock = 0; bUpdateSettings = true; bStateManage = false; bMidiMapping = false; bMsgWorkaround = false; + core::init_preset_state(&sPresetState); + nLatency = 0; } @@ -788,6 +792,7 @@ namespace lsp { port_id, port_desc, + NULL, meta::U_NONE, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -1285,7 +1290,7 @@ namespace lsp status_t Wrapper::save_state(Steinberg::IBStream *os) { status_t res; - const uint16_t version = 1; + const uint16_t version = 2; // Set-up DSP context dsp::context_t ctx; @@ -1318,7 +1323,7 @@ namespace lsp lsp_trace("Saving state of path parameter: %s = %s", meta->id, path->path()); const char *path_value = path->path(); - if ((res = write_value(os, meta->id, path_value)) != STATUS_OK) + if ((res = write_value(os, meta->id, 's', path_value)) != STATUS_OK) { lsp_trace("write_value failed for id=%s", meta->id); return res; @@ -1334,7 +1339,7 @@ namespace lsp } lsp_trace("Saving state of string parameter: %s = %s", meta->id, str); - if ((res = write_value(os, meta->id, str)) != STATUS_OK) + if ((res = write_value(os, meta->id, 's', str)) != STATUS_OK) { lsp_trace("write_value failed for id=%s", meta->id); return res; @@ -1350,7 +1355,7 @@ namespace lsp p->value()) ); - if ((res = write_value(os, meta->id, p->value())) != STATUS_OK) + if ((res = write_value(os, meta->id, 'f', p->value())) != STATUS_OK) { lsp_trace("write_value failed for id=%s", meta->id); return res; @@ -1358,6 +1363,13 @@ namespace lsp } } + // Write special variables + if ((res = serialize_preset_state(os)) != STATUS_OK) + { + lsp_warn("Error serializing preset state, error=%d", int(res)); + return res; + } + // Save state of all KVT parameters if (sKVTMutex.lock()) { @@ -1400,7 +1412,11 @@ namespace lsp lsp_warn("Failed to read serial version"); return STATUS_CORRUPTED; } - if (version != 1) + + bool param_types = false; + if (version == 2) + param_types = true; + else if (version != 1) { lsp_warn("Unsupported serial version %d", int(version)); return STATUS_CORRUPTED; @@ -1438,8 +1454,70 @@ namespace lsp lsp_trace("Parameter name: %s", name); - if (name[0] != '/') + if (name[0] == '/') + { + // Read the KVT parameter flags + uint8_t flags = 0; + if ((res = read_fully(is, &flags)) != STATUS_OK) + { + lsp_warn("Failed to resolve flags for parameter id=%s", name); + return res; + } + + lsp_trace("Parameter flags: 0x%x", int(flags)); + if ((res = read_kvt_value(is, name, &p)) != STATUS_OK) + { + lsp_warn("Failed to read value for KVT parameter id=%s, code=%d", name, int(res)); + return res; + } + + // This is KVT port + if (p.type != core::KVT_ANY) + { + size_t kflags = core::KVT_TX; + if (flags & vst3::FLAG_PRIVATE) + kflags |= core::KVT_PRIVATE; + + kvt_dump_parameter("Fetched KVT parameter %s = ", &p, name); + sKVT.put(name, &p, kflags); + } + } + else if (name[0] == '!') + { + if (strcmp(name, "!preset_state") == 0) + { + core::preset_state_t state; + if ((res = deserialize_preset_state(&state, is)) != STATUS_OK) + { + lsp_warn("Failed to deserialize preset state, error code=%d", int(res)); + return res; + } + + set_preset_state(&state, PT_STATE); + } + else + { + lsp_warn("Unknown special variable: %s, skipping", name); + if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) + { + lsp_warn("Failed to skip special variable", int(res)); + return res; + } + } + } + else { + // Read parameter type + uint8_t param_type = '?'; + if (param_types) + { + if ((res = read_fully(is, ¶m_type)) != STATUS_OK) + { + lsp_warn("Failed to deserialize parameter type, error code=%d", int(res)); + return res; + } + } + // Try to find virtual port vst3::Port *p = vParamMapping.get(name); if (p != NULL) @@ -1447,70 +1525,89 @@ namespace lsp const meta::port_t *meta = p->metadata(); if (meta::is_path_port(meta)) { - path_t *xp = p->buffer(); - + if ((param_type != '?') && (param_type != 's')) + { + lsp_warn("Failed to deserialize port id=%s: invalid parameter type '%c'", meta->id, char(param_type)); + return res; + } if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) { lsp_warn("Failed to deserialize port id=%s", meta->id); return res; } + + path_t *xp = p->buffer(); lsp_trace(" %s = %s", meta->id, name); xp->submit(name, strlen(name), plug::PF_STATE_RESTORE); } else if (meta::is_string_holding_port(meta)) { - vst3::StringPort *sp = static_cast(p); - plug::string_t *xs = sp->data(); + if ((param_type != '?') && (param_type != 's')) + { + lsp_warn("Failed to deserialize port id=%s: invalid parameter type '%c'", meta->id, char(param_type)); + return res; + } if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) { lsp_warn("Failed to deserialize port id=%s", meta->id); return res; } + + vst3::StringPort *sp = static_cast(p); + plug::string_t *xs = sp->data(); lsp_trace(" %s = %s", meta->id, name); xs->submit(name, strlen(name), true); } else { - vst3::ParameterPort *pp = static_cast(p); + if ((param_type != '?') && (param_type != 'f')) + { + lsp_warn("Failed to deserialize port id=%s: invalid parameter type '%c'", meta->id, char(param_type)); + return res; + } + float v = 0.0f; if ((res = read_fully(is, &v)) != STATUS_OK) { lsp_warn("Failed to deserialize port id=%s", name); return res; } + + vst3::ParameterPort *pp = static_cast(p); lsp_trace(" %s = %f", meta->id, v); pp->submit(v); } } else - lsp_warn("Missing port id=%s, skipping", name); - } - else - { - // Read the KVT parameter flags - uint8_t flags = 0; - if ((res = read_fully(is, &flags)) != STATUS_OK) - { - lsp_warn("Failed to resolve flags for parameter id=%s", name); - return res; - } - - lsp_trace("Parameter flags: 0x%x", int(flags)); - if ((res = read_kvt_value(is, name, &p)) != STATUS_OK) - { - lsp_warn("Failed to read value for KVT parameter id=%s, code=%d", name, int(res)); - return res; - } - - // This is KVT port - if (p.type != core::KVT_ANY) { - size_t kflags = core::KVT_TX; - if (flags & vst3::FLAG_PRIVATE) - kflags |= core::KVT_PRIVATE; - - kvt_dump_parameter("Fetched KVT parameter %s = ", &p, name); - sKVT.put(name, &p, kflags); + lsp_warn("Missing port id=%s, skipping", name); + switch (param_type) + { + case 'f': + { + float v; + if ((res = read_fully(is, &v)) != STATUS_OK) + { + lsp_warn("Failed to skip floating-point parameter"); + return res; + } + break; + } + case 's': + { + if ((res = read_string(is, &name, &name_cap)) != STATUS_OK) + { + lsp_warn("Failed to skip string"); + return res; + } + break; + } + case '?': + break; + default: + lsp_warn("Unknown parameter type: '%c'", param_type); + return STATUS_CORRUPTED; + } } } } @@ -1741,7 +1838,7 @@ namespace lsp Steinberg::tresult PLUGIN_API Wrapper::canProcessSampleSize(Steinberg::int32 symbolicSampleSize) { - lsp_trace("this=%p, symbolicSampleSize=%d", this, int(symbolicSampleSize)); +// lsp_trace("this=%p, symbolicSampleSize=%d", this, int(symbolicSampleSize)); // We support only 32-bit float samples return (symbolicSampleSize == Steinberg::Vst::kSample32) ? Steinberg::kResultTrue : Steinberg::kResultFalse; @@ -1837,31 +1934,33 @@ namespace lsp pos->sampleRate = pPlugin->sample_rate(); pos->speed = 1.0f; pos->frame = 0; - if ((pctx != NULL) && (pctx->state & Steinberg::Vst::ProcessContext::kTimeSigValid)) - { - pos->numerator = pctx->timeSigNumerator; - pos->denominator = pctx->timeSigDenominator; - } - else - { - pos->numerator = 4.0; - pos->denominator = 4.0; - } - if (pctx->state & Steinberg::Vst::ProcessContext::kTempoValid) - pos->beatsPerMinute = pctx->tempo; - else - pos->beatsPerMinute = BPM_DEFAULT; + pos->numerator = 4.0; + pos->denominator = 4.0; + pos->beatsPerMinute = BPM_DEFAULT; pos->beatsPerMinuteChange = 0.0f; + pos->tick = 0.0; pos->ticksPerBeat = DEFAULT_TICKS_PER_BEAT; - if ((pctx->state & Steinberg::Vst::ProcessContext::kProjectTimeMusicValid) && - (pctx->state & Steinberg::Vst::ProcessContext::kBarPositionValid)) + if (pctx != NULL) { - double uppqPos = (pctx->projectTimeMusic - pctx->barPositionMusic) * pctx->timeSigDenominator * 0.25 / pctx->timeSigNumerator; - pos->tick = pos->ticksPerBeat * pctx->timeSigNumerator * (uppqPos - int64_t(uppqPos)); + if (pctx->state & Steinberg::Vst::ProcessContext::kTimeSigValid) + { + pos->numerator = pctx->timeSigNumerator; + pos->denominator = pctx->timeSigDenominator; + } + + if (pctx->state & Steinberg::Vst::ProcessContext::kTempoValid) + pos->beatsPerMinute = pctx->tempo; + + if ((pctx->state & Steinberg::Vst::ProcessContext::kProjectTimeMusicValid) && + (pctx->state & Steinberg::Vst::ProcessContext::kBarPositionValid)) + { + double uppqPos = (pctx->projectTimeMusic - pctx->barPositionMusic) * pctx->timeSigDenominator * 0.25 / pctx->timeSigNumerator; + pos->tick = pos->ticksPerBeat * pctx->timeSigNumerator * (uppqPos - int64_t(uppqPos)); + } + else + pos->tick = 0.0; } - else - pos->tick = 0.0; // Sync position with UI if (atomic_trylock(nPositionLock)) @@ -2009,7 +2108,7 @@ namespace lsp void Wrapper::toggle_ui_state() { - uatomic_t counter = nUICounterReq; + uatomic_t counter = atomic_load(&nUICounterReq); if (counter == nUICounterResp) return; @@ -2947,6 +3046,7 @@ namespace lsp else if (!strcmp(message_id, vst3::ID_MSG_ACTIVATE_UI)) { atomic_add(&nUICounterReq, 1); + request_preset_state(); } else if (!strcmp(message_id, vst3::ID_MSG_DEACTIVATE_UI)) { @@ -3016,6 +3116,40 @@ namespace lsp osc::parse_destroy(&parser); } } + else if (!strcmp(message_id, ID_MSG_PRESET_STATE)) + { + // Get endianess + if (atts->getInt("endian", byte_order) != Steinberg::kResultOk) + return Steinberg::kResultFalse; + + Steinberg::int64 flags = 0, tab = 0; + + if (atts->getInt("flags", flags) != Steinberg::kResultOk) + return Steinberg::kResultFalse; + if (atts->getInt("tab", tab) != Steinberg::kResultOk) + return Steinberg::kResultFalse; + + // Read identifier of the mesh port + const char *name = sRxNotifyBuf.get_string(atts, "name", byte_order); + if (name == NULL) + return Steinberg::kResultFalse; + + lsp_trace("Received preset state flags=0x%x, tab=%d, name='%s'", + int(flags), int(tab), name); + + // Commit state + core::preset_state_t state; + core::init_preset_state(&state); + + state.flags = uint32_t(flags); + state.tab = uint32_t(tab); + const size_t length = lsp_min(strnlen(name, core::PRESET_NAME_BYTES), core::PRESET_NAME_BYTES - 1); + memcpy(state.name, name, length); + state.name[length] = '\0'; + + // Set preset state + set_preset_state(&state, PT_UI); + } return Steinberg::kResultOk; } @@ -3049,7 +3183,7 @@ namespace lsp void Wrapper::report_state_change() { // Report state change - uatomic_t dirty_req = nDirtyReq; + uatomic_t dirty_req = atomic_load(&nDirtyReq); if (dirty_req == nDirtyResp) return; @@ -3583,6 +3717,7 @@ namespace lsp // Do not synchronize other data until there is no UI visible if (nUICounterResp > 0) { + transmit_preset_state(); transmit_meter_values(); transmit_mesh_states(); transmit_frame_buffers(); @@ -3593,6 +3728,173 @@ namespace lsp } } + void Wrapper::set_preset_state(const core::preset_state_t *state, uint32_t mode) + { + lsp_trace("this=%p, name=%s, flags=0x%x, tab=%d, mode=%d", + this, state->name, state->flags, state->tab, int(mode)); + + { + // Lock the state + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if ((flags & PT_TYPE) > mode) // Leave if data has greater priority than submitted + { + lsp_trace("preset state not updated, flags=0x%x, mode=%d", int(flags), int(mode)); + return; + } + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, mode & (~PT_LOCK))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + core::copy_preset_state(&sPresetState, state); + } + + // Mark state changed if data was transferred from UI + if (mode == PT_UI) + state_changed(); + + lsp_trace("this=%p, mode=0x%x", this, int(mode)); + } + + + void Wrapper::request_preset_state() + { + // Set the 'PT_FORCE' flag + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (flags & PT_FORCE) + return; + if (atomic_cas(&nPresetFlags, flags, flags | PT_FORCE)) + break; + + ipc::Thread::yield(); + } + } + + void Wrapper::transmit_preset_state() + { + core::preset_state_t state; + + { + // Lock the state + while (true) + { + // We can fetch data only if it is in PT_STATE state or fetch is forced + const uatomic_t flags = atomic_load(&nPresetFlags); + if ((!(flags & PT_FORCE)) && ((flags & PT_TYPE) != PT_STATE)) + return; + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, flags & (~(PT_LOCK | PT_TYPE)))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + // Now we have locked state + core::copy_preset_state(&state, &sPresetState); + } + + // Now we can form message and transmit it + // Allocate new message + Steinberg::Vst::IMessage *msg = alloc_message(pHostApplication, bMsgWorkaround); + if (msg == NULL) + return; + lsp_finally { safe_release(msg); }; + + // Initialize and send the message + msg->setMessageID(vst3::ID_MSG_PRESET_STATE); + Steinberg::Vst::IAttributeList *list = msg->getAttributes(); + + if (list->setInt("endian", VST3_BYTEORDER) != Steinberg::kResultOk) + return; + if (list->setInt("flags", state.flags) != Steinberg::kResultOk) + return; + if (list->setInt("tab", state.tab) != Steinberg::kResultOk) + return; + + // Write identifier of the mesh port + if (!sTxNotifyBuf.set_string(list, "name", state.name)) + return ; + + // Notify peer + pPeerConnection->notify(msg); + } + + status_t Wrapper::serialize_preset_state(Steinberg::IBStream *os) + { + core::preset_state_t state; + { + // Lock the state + while (true) + { + // We can fetch data only if it is in PT_STATE state or fetch is forced + const uatomic_t flags = atomic_load(&nPresetFlags); + if (!(flags & PT_LOCK)) + { + if (atomic_cas(&nPresetFlags, flags, flags | PT_LOCK)) + break; + } + ipc::Thread::yield(); + } + + // State is locked + lsp_finally { + while (true) + { + const uatomic_t flags = atomic_load(&nPresetFlags); + if (atomic_cas(&nPresetFlags, flags, flags & (~PT_LOCK))) // Unlock the state + break; + ipc::Thread::yield(); + } + }; + + // Now we have locked state + core::copy_preset_state(&state, &sPresetState); + } + + // Serialize obtained preset state + lsp_trace("preset state: flags=0x%x, tab=%d, name=%s", int(state.flags), int(state.tab), state.name); + return vst3::serialize_preset_state(os, &state); + } + + status_t Wrapper::deserialize_preset_state(core::preset_state_t *state, Steinberg::IBStream *is) + { + status_t res = vst3::deserialize_preset_state(state, is); + if (res == STATUS_OK) + lsp_trace("preset state: flags=0x%x, tab=%d, name=%s", int(state->flags), int(state->tab), state->name); + + return res; + } + } /* namespace vst3 */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ui_wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ui_wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ui_wrapper.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/ui_wrapper.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 3 янв. 2024 г. @@ -53,6 +53,9 @@ namespace lsp public Steinberg::IPlugView, public Steinberg::IPlugViewContentScaleSupport { + private: + friend class Controller; + protected: uatomic_t nRefCounter; // Reference counter vst3::Controller *pController; // Controller @@ -67,6 +70,7 @@ namespace lsp #ifdef VST_USE_RUNLOOP_IFACE Steinberg::Linux::IRunLoop *pRunLoop; // Run loop interface Steinberg::Linux::ITimerHandler *pTimer; // Timer handler + Steinberg::Linux::IEventHandler *pEventHandler; // Event handler #endif /* VST_USE_RUNLOOP_IFACE */ protected: @@ -113,6 +117,7 @@ namespace lsp virtual void main_iteration() override; virtual meta::plugin_format_t plugin_format() const override; virtual const core::ShmState *shm_state() override; + virtual void send_preset_state(const core::preset_state_t *state) override; public: // vst3::IUISync virtual void sync_ui() override; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/wrapper.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/wrapper.h --- 1.2.21-5/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/wrapper.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/lsp-plug.in/plug-fw/wrap/vst3/wrapper.h 2025-08-26 18:15:48.089960938 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 1 янв. 2024 г. @@ -84,6 +84,18 @@ namespace lsp vst3::MidiPort *vPorts[]; // List of ports related to the event bus } event_bus_t; + enum preset_type_t + { + PT_NONE = 0, + PT_UI = 1, + PT_STATE = 2, + + PT_LOCK = 0x8000, + PT_FORCE = 0x4000, + + PT_TYPE = 0x000f + }; + class VST3KVTListener: public core::KVTListener { private: @@ -126,6 +138,7 @@ namespace lsp wssize_t nPlayPosition; // Sample playback position wssize_t nPlayLength; // Sample playback length plug::position_t sUIPosition; // Position notified to UI + core::preset_state_t sPresetState; // Preset state vst3::string_buf sRxNotifyBuf; // Notify buffer for notify() processing vst3::string_buf sTxNotifyBuf; // Notify buffer for sync_data() @@ -142,6 +155,7 @@ namespace lsp uatomic_t nDirtyResp; // Dirty state response uatomic_t nDumpReq; // State dump request uatomic_t nDumpResp; // State dump response + uatomic_t nPresetFlags; // Preset flags uint32_t nMaxSamplesPerBlock; // Maximum samples per block bool bUpdateSettings; // Indicator that settings should be updated bool bStateManage; // State management barrier @@ -182,6 +196,11 @@ namespace lsp bool check_parameters_updated(); void apply_settings_update(); + void set_preset_state(const core::preset_state_t *state, uint32_t mode); + void request_preset_state(); + status_t serialize_preset_state(Steinberg::IBStream *os); + status_t deserialize_preset_state(core::preset_state_t *state, Steinberg::IBStream *is); + status_t save_state(Steinberg::IBStream *os); status_t load_state(Steinberg::IBStream *is); @@ -203,6 +222,7 @@ namespace lsp void transmit_play_position(); void transmit_strings(); void transmit_shm_state(); + void transmit_preset_state(); public: explicit Wrapper(PluginFactory *factory, plug::Module *plugin, resource::ILoader *loader, const meta::package_t *package); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/private/ui/xml/DOMControllerNode.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/private/ui/xml/DOMControllerNode.h --- 1.2.21-5/modules/lsp-plugin-fw/include/private/ui/xml/DOMControllerNode.h 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/private/ui/xml/DOMControllerNode.h 2025-08-26 18:15:48.093960899 +0000 @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 25 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#ifndef PRIVATE_UI_XML_DOMCONTROLLERNODE_H_ +#define PRIVATE_UI_XML_DOMCONTROLLERNODE_H_ + +#include +#include + +#include +#include + +namespace lsp +{ + namespace ui + { + namespace xml + { + /** + * Node for configuring properties of the widget controller from the XML document + */ + class DOMControllerNode: public Node + { + private: + ctl::DOMController *pController; + + public: + explicit DOMControllerNode(UIContext *ctx, Node *parent, ctl::DOMController *ctl); + DOMControllerNode(const DOMControllerNode &) = delete; + DOMControllerNode(DOMControllerNode &&) = delete; + DOMControllerNode & operator = (const DOMControllerNode &) = delete; + DOMControllerNode & operator = (DOMControllerNode &&) = delete; + + virtual ~DOMControllerNode() override; + + public: // xml::Node + virtual status_t enter(const LSPString * const *atts) override; + virtual status_t leave() override; + }; + + } /* namespace xml */ + } /* namespace ui */ +} /* namespace lsp */ + + + +#endif /* PRIVATE_UI_XML_DOMCONTROLLERNODE_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/include/private/ui/xml/WidgetNode.h 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/private/ui/xml/WidgetNode.h --- 1.2.21-5/modules/lsp-plugin-fw/include/private/ui/xml/WidgetNode.h 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/include/private/ui/xml/WidgetNode.h 2025-08-26 18:15:48.093960899 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 10 апр. 2021 г. @@ -40,30 +40,27 @@ namespace lsp class WidgetNode: public Node { private: - WidgetNode & operator = (const WidgetNode *); - WidgetNode(const WidgetNode &); - - private: ctl::Widget *pWidget; WidgetNode *pChild; - Node *pSpecial; public: explicit WidgetNode(UIContext *ctx, Node *parent, ctl::Widget *widget); - virtual ~WidgetNode(); - - public: - virtual status_t lookup(Node **child, const LSPString *name); - - virtual status_t enter(const LSPString * const *atts); + WidgetNode(const WidgetNode &) = delete; + WidgetNode(WidgetNode &&) = delete; + WidgetNode & operator = (const WidgetNode &) = delete; + WidgetNode & operator = (WidgetNode &&) = delete; - virtual status_t completed(Node *child); + virtual ~WidgetNode() override; - virtual status_t leave(); + public: + virtual status_t lookup(Node **child, const LSPString *name) override; + virtual status_t enter(const LSPString * const *atts) override; + virtual status_t completed(Node *child) override; + virtual status_t leave() override; }; - } - } -} + } /* namespace xml */ + } /* namespace ui */ +} /* namespace lsp */ #endif /* PRIVATE_UI_XML_WIDGETNODE_H_ */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-plugin-fw/make/tools.mk --- 1.2.21-5/modules/lsp-plugin-fw/make/tools.mk 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/make/tools.mk 2025-08-26 18:15:48.093960899 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/modules.mk 1.2.23-0ubuntu1/modules/lsp-plugin-fw/modules.mk --- 1.2.21-5/modules/lsp-plugin-fw/modules.mk 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/modules.mk 2025-08-26 18:15:48.093960899 +0000 @@ -19,86 +19,101 @@ # # Variables that describe dependencies -LSP_3RD_PARTY_VERSION := 1.0.21 +LSP_3RD_PARTY_VERSION := 1.0.23 LSP_3RD_PARTY_NAME := lsp-3rd-party LSP_3RD_PARTY_TYPE := hdr LSP_3RD_PARTY_INC_OPT := -idirafter LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_DSP_UNITS_VERSION := 1.0.28 +LSP_DSP_UNITS_VERSION := 1.0.30 LSP_DSP_UNITS_NAME := lsp-dsp-units LSP_DSP_UNITS_TYPE := src LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_R3D_BASE_LIB_VERSION := 1.0.23 +LSP_R3D_BASE_LIB_VERSION := 1.0.25 LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib LSP_R3D_BASE_LIB_TYPE := src LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git -LSP_R3D_IFACE_VERSION := 1.0.23 +LSP_R3D_IFACE_VERSION := 1.0.25 LSP_R3D_IFACE_NAME := lsp-r3d-iface LSP_R3D_IFACE_TYPE := src LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git -LSP_R3D_GLX_LIB_VERSION := 1.0.23 +LSP_R3D_GLX_LIB_VERSION := 1.0.25 LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib LSP_R3D_GLX_LIB_TYPE := bin LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git -LSP_R3D_WGL_LIB_VERSION := 1.0.18 +LSP_R3D_WGL_LIB_VERSION := 1.0.20 LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib LSP_R3D_WGL_LIB_TYPE := bin LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git -LSP_TK_LIB_VERSION := 1.0.27 +LSP_TK_LIB_VERSION := 1.0.29 LSP_TK_LIB_NAME := lsp-tk-lib LSP_TK_LIB_TYPE := src LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git -LSP_WS_LIB_VERSION := 1.0.27 +LSP_WS_LIB_VERSION := 1.0.29 LSP_WS_LIB_NAME := lsp-ws-lib LSP_WS_LIB_TYPE := src LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git # System libraries +LIBAUDIOTOOLBOX_VERSION := system +LIBAUDIOTOOLBOX_NAME := libaudiotoolbox +LIBAUDIOTOOLBOX_TYPE := opt +LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox + +LIBCOREFOUNDATION_VERSION := system +LIBCOREFOUNDATION_NAME := libcorefoundation +LIBCOREFOUNDATION_TYPE := opt +LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation + +LIBCOCOA_VERSION := system +LIBCOCOA_NAME := libcocoa +LIBCOCOA_TYPE := opt +LIBCOCOA_LDFLAGS := -framework Cocoa + LIBADVAPI_VERSION := system LIBADVAPI_NAME := libadvapi32 LIBADVAPI_TYPE := opt diff -pruN 1.2.21-5/modules/lsp-plugin-fw/project.mk 1.2.23-0ubuntu1/modules/lsp-plugin-fw/project.mk --- 1.2.21-5/modules/lsp-plugin-fw/project.mk 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/project.mk 2025-08-26 18:15:48.093960899 +0000 @@ -24,4 +24,4 @@ ARTIFACT_NAME = lsp-plugin ARTIFACT_DESC = LSP Plugin Framework for building LSP Plugins ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_ALL = 1 -ARTIFACT_VERSION = 1.0.29 +ARTIFACT_VERSION = 1.0.31 diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/Makefile 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/Makefile --- 1.2.21-5/modules/lsp-plugin-fw/src/Makefile 2025-03-01 12:42:57.444644473 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/Makefile 2025-08-26 18:15:48.093960899 +0000 @@ -1,6 +1,6 @@ # -# Copyright (C) 2024 Linux Studio Plugins Project -# (C) 2024 Vladimir Sadovnikov +# Copyright (C) 2025 Linux Studio Plugins Project +# (C) 2025 Vladimir Sadovnikov # # This file is part of lsp-plugin-fw # @@ -210,8 +210,13 @@ GST_LIBDIR := $(LIBDIR)/$(IN JACK_LIBDIR := $(LIBDIR)/$(INSTALL_GROUP_LIBDIR) LADSPA_LIBDIR := $(LIBDIR)/ladspa LV2_LIBDIR := $(LIBDIR)/lv2/$(INSTALL_LIBDIR).lv2 -VST2_LIBDIR := $(LIBDIR)/vst/$(INSTALL_LIBDIR).vst -VST3_LIBDIR := $(LIBDIR)/vst3/$(INSTALL_LIBDIR).vst3 +ifeq ($(PLATFORM),MacOS) + VST2_LIBDIR := /Library/Audio/Plug-Ins/VST/$(INSTALL_LIBDIR).vst + VST3_LIBDIR := /Library/Audio/Plug-Ins/VST3/$(INSTALL_LIBDIR).vst3 +else + VST2_LIBDIR := $(LIBDIR)/vst/$(INSTALL_LIBDIR).vst + VST3_LIBDIR := $(LIBDIR)/vst3/$(INSTALL_LIBDIR).vst3 +endif DOC_SHAREDDIR := $(SHAREDDIR)/doc/$($(ROOT_ARTIFACT_ID)_NAME) ifeq ($(PLATFORM),Linux) @@ -256,6 +261,9 @@ else ifeq ($(PLATFORM),Windows) endif VST3_EXT := .vst3 VST3_LDFLAGS := -Wl,--kill-at +else ifeq ($(PLATFORM),MacOS) + VST3_ARCH := MacOS + VST3_EXT := else VST3_ARCH := $(shell uname -m)-${shell uname -s | tr '[:upper:]' '[:lower:]'} VST3_EXT := $(LIBRARY_EXT) @@ -280,7 +288,7 @@ VERSION_CFLAGS := \ #------------------------------------------------------------------------------ # Framework settings for (cross) build LSP_PLUGIN_FW_SRC_RES = $(LSP_PLUGIN_FW_BIN)/$(LSP_PLUGIN_FW_NAME)-res.cpp -LSP_PLUGIN_FW_SRC_RES_EXCL = -x "fonts/**/:i18n/**/:models/**/:presets/**/:schema/**/:ui/**/" +LSP_PLUGIN_FW_SRC_RES_EXCL = -x "fonts/**/:i18n/**/:presets/**/:schema/**/:ui/**/" LSP_PLUGIN_FW_SRC_RES_CKSUM = $(LSP_PLUGIN_FW_BIN)/res-checksum.json LSP_PLUGIN_FW_SRC_UI_RES = $(LSP_PLUGIN_FW_BIN)/$(LSP_PLUGIN_FW_NAME)-ui-res.cpp @@ -1490,7 +1498,10 @@ install_vst3: vst3 mkdir -p "$(DESTDIR)$(VST3_LIBDIR)/Contents/Resources" mkdir -p "$(DESTDIR)$(VST3_LIBDIR)/Contents/Resources" mkdir -p "$(DESTDIR)$(VST3_LIBDIR)/Contents/${VST3_ARCH}" - $($(HOST)UTL_VST3_MODINFO) "$(DESTDIR)$(VST3_LIBDIR)/Contents/Resources/moduleinfo.json" + $($(HOST)UTL_VST3_MODINFO) -m "$(DESTDIR)$(VST3_LIBDIR)/Contents/Resources/moduleinfo.json" + $(if $(findstring MacOS, $(PLATFORM)), \ + $($(HOST)UTL_VST3_MODINFO) -i "$(DESTDIR)$(VST3_LIBDIR)/Contents/Info.plist" -p "$(DESTDIR)$(VST3_LIBDIR)/Contents/PkgInfo" \ + ) $(INSTALL) $(ARTIFACT_LIB_VST3) "$(DESTDIR)$(VST3_LIBDIR)/Contents/${VST3_ARCH}/" install_xdg_msg: @@ -1629,7 +1640,10 @@ package_vst3: vst3 $(BIN_PACKAGE) -rm -rf "$(BUILDDIR)/$(BIN_PKG_DIR)" mkdir -p "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/Resources" mkdir -p "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/${VST3_ARCH}" - $($(HOST)UTL_VST3_MODINFO) "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/Resources/moduleinfo.json" + $($(HOST)UTL_VST3_MODINFO) -m "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/Resources/moduleinfo.json" + $(if $(findstring MacOS, $(PLATFORM)), \ + $($(HOST)UTL_VST3_MODINFO) -i "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/Info.plist" -p "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/PkgInfo" \ + ) $(INSTALL) $(ARTIFACT_LIB_VST3) "$(BUILDDIR)/$(BIN_PKG_DIR)/$(VST3_LIBDIR)/Contents/${VST3_ARCH}/" $(foreach target,$(BIN_PACKAGE_VST3), \ $(MAKE) -C "$($(patsubst package_%,%,$(target))_PATH)" install DESTDIR="$(BUILDDIR)/$(BIN_PKG_DIR)"; \ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/core/AudioReturn.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/AudioReturn.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/core/AudioReturn.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/AudioReturn.cpp 2025-08-26 18:15:48.093960899 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-plugin-template * Created on: 26 июн. 2024 г. @@ -71,7 +71,6 @@ namespace lsp sStream(free_stream), sParams(free_params) { - enStatus = ST_INACTIVE; sRecord.index = -1; sRecord.magic = 0; sRecord.version = 0; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/core/AudioSend.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/AudioSend.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/core/AudioSend.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/AudioSend.cpp 2025-08-26 18:15:48.093960899 +0000 @@ -68,7 +68,6 @@ namespace lsp sStream(free_stream), sParams(free_params) { - enStatus = ST_INACTIVE; sRecord.index = -1; sRecord.magic = 0; sRecord.version = 0; @@ -262,7 +261,7 @@ namespace lsp stream_t *st = sStream.current(); if (st == NULL) return -1; - return (st->pStream != NULL) ? st->sParams.nChannels : -1; + return (st->pStream != NULL) ? ssize_t(st->sParams.nChannels) : ssize_t(-1); } ssize_t AudioSend::length() const @@ -270,7 +269,7 @@ namespace lsp stream_t *st = sStream.current(); if (st == NULL) return -1; - return (st->pStream != NULL) ? st->sParams.nLength : -1; + return (st->pStream != NULL) ? ssize_t(st->sParams.nLength) : ssize_t(-1); } status_t AudioSend::begin(ssize_t block_size) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/core/SamplePlayer.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/SamplePlayer.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/core/SamplePlayer.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/SamplePlayer.cpp 2025-08-26 18:15:48.093960899 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -222,12 +223,18 @@ namespace lsp lsp_finally { destroy_sample(source); }; // Load sample + IF_TRACE(system::time_millis_t ctime = system::get_time_millis()); status_t res = source->load_ext(sFileName); if (res != STATUS_OK) { lsp_trace("load failed: status=%d (%s)", res, get_status(res)); return res; } + IF_TRACE( + system::time_millis_t delta = system::get_time_millis() - ctime; + lsp_trace("Load time: %d", int(delta)); + ctime = system::get_time_millis() + ); // Resample if ((res = source->resample(nSampleRate)) != STATUS_OK) @@ -236,6 +243,11 @@ namespace lsp return res; } + IF_TRACE( + delta = system::get_time_millis() - ctime; + lsp_trace("Resample time: %d", int(delta)); + ); + // Commit the result lsp_trace("file successfully loaded: %s", sFileName); lsp::swap(pLoaded, source); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/core/ShmClient.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/ShmClient.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/core/ShmClient.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/ShmClient.cpp 2025-08-26 18:15:48.093960899 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 9 авг. 2024 г. @@ -560,7 +560,9 @@ namespace lsp for (size_t i=0, n=vSends.size(); ipSend != NULL) && (s->bActive)) + if (s == NULL) + continue; + if ((s->pSend != NULL) && (s->bActive)) { s->pSend->end(); s->bActive = false; @@ -570,7 +572,10 @@ namespace lsp for (size_t i=0, n=vReturns.size(); ipReturn != NULL)) + if (r == NULL) + continue; + + if (r->pReturn != NULL) r->pReturn->end(); r->bActive = false; } @@ -579,6 +584,15 @@ namespace lsp bool ShmClient::update_catalog(dspu::Catalog *catalog) { lltl::parray records; + lsp_finally { + for (size_t i=0, n=records.size(); ienumerate(&records); if (res != STATUS_OK) return false; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/core/osc_buffer.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/osc_buffer.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/core/osc_buffer.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/osc_buffer.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 1 мар. 2023 г. @@ -56,7 +56,7 @@ namespace lsp osc_buffer_t *res = reinterpret_cast(ptr); ptr += align_size(sizeof(osc_buffer_t), DEFAULT_ALIGN); - atomic_store(&res->nSize, 0); + atomic_store(&res->nSize, size_t(0)); res->nCapacity = capacity; res->nHead = 0; res->nTail = 0; @@ -143,7 +143,7 @@ namespace lsp void osc_buffer_t::clear() { - atomic_store(&nSize, 0); + atomic_store(&nSize, size_t(0)); nHead = 0; nTail = 0; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/core/presets.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/presets.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/core/presets.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/core/presets.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2024 Linux Studio Plugins Project + * (C) 2024 Vladimir Sadovnikov + * + * This file is part of lsp-pluginfw + * Created on: 2 апр. 2024 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include +#include + +namespace lsp +{ + namespace core + { + static ssize_t compare_presets_asc(const resource::resource_t *a, const resource::resource_t *b) + { + return strcmp(a->name, b->name); + } + + static ssize_t compare_presets_desc(const resource::resource_t *a, const resource::resource_t *b) + { + return strcmp(b->name, a->name); + } + + status_t scan_presets(lltl::darray *presets, resource::ILoader *loader, const char *location) + { + if ((presets == NULL) || (loader == NULL) || (location == NULL)) + return STATUS_BAD_ARGUMENTS; + + io::Path path; + LSPString tmp; + resource::resource_t *resources = NULL; + + if (!location) + return STATUS_NOT_FOUND; + + if (tmp.fmt_utf8(LSP_BUILTIN_PREFIX "presets/%s", location) < 0) + return STATUS_BAD_STATE; + + ssize_t count = loader->enumerate(&tmp, &resources); + if (!resources) + return STATUS_NOT_FOUND; + + // Process all resources and form the final list of preset files + for (ssize_t i=0; itype != resource::RES_FILE) + continue; + if (path.set(item->name) != STATUS_OK) + { + free(resources); + return STATUS_NO_MEM; + } + if (path.get_ext(&tmp) != STATUS_OK) + { + free(resources); + return STATUS_BAD_STATE; + } + + if ((!tmp.equals_ascii("patch")) && (!tmp.equals_ascii("preset"))) + continue; + + // Add preset file to result + strncpy(item->name, path.get(), resource::RESOURCE_NAME_MAX); + item->name[resource::RESOURCE_NAME_MAX-1] = '\0'; + if (!presets->add(item)) + { + free(resources); + return STATUS_NO_MEM; + } + } + + free(resources); + + return STATUS_OK; + } + + void sort_presets(lltl::darray *presets, bool ascending) + { + if (presets == NULL) + return; + + presets->qsort( + (ascending) ? + compare_presets_asc : + compare_presets_desc); + } + + void init_preset_state(preset_state_t *state) + { + state->flags = PRESET_FLAG_NONE; + state->tab = 0; + state->name[0] = '\0'; + } + + void copy_preset_state(preset_state_t *dst, const preset_state_t *src) + { + dst->flags = src->flags; + dst->tab = src->tab; + strcpy(dst->name, src->name); + } + + } /* namespace core */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Controller.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Controller.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Controller.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Controller.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 24 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include +#include +#include +#include + +namespace lsp +{ + namespace ctl + { + const ctl_class_t Controller::metadata = { "Controller", NULL }; + + Controller::Controller(ui::IWrapper *wrapper): + ui::IPortListener() + { + pClass = &metadata; + pWrapper = wrapper; + } + + Controller::~Controller() + { + } + + status_t Controller::init() + { + return STATUS_OK; + } + + void Controller::destroy() + { + } + + bool Controller::instance_of(const ctl_class_t *wclass) const + { + const ctl_class_t *wc = pClass; + while (wc != NULL) + { + if (wc == wclass) + return true; + wc = wc->parent; + } + + return false; + } + + bool Controller::link_port(ui::IPort **port, const char *id) + { + if (port == NULL) + return false; + + ui::IPort *oldp = *port; + ui::IPort *newp = pWrapper->port(id); + if (oldp == newp) + return true; + + if (oldp != NULL) + oldp->unbind(this); + if (newp != NULL) + newp->bind(this); + + *port = newp; + + return true; + } + + bool Controller::bind_port(ui::IPort **port, const char *param, const char *name, const char *value) + { + if (strcmp(param, name)) + return false; + + return link_port(port, value); + } + + bool Controller::set_value(bool *v, const char *param, const char *name, const char *value) + { + if (v == NULL) + return false; + if (strcmp(param, name)) + return false; + PARSE_BOOL(value, *v = __); + return true; + } + + bool Controller::set_value(ssize_t *v, const char *param, const char *name, const char *value) + { + if (v == NULL) + return false; + if (strcmp(param, name)) + return false; + PARSE_INT(value, *v = __); + return true; + } + + bool Controller::set_value(size_t *v, const char *param, const char *name, const char *value) + { + if (v == NULL) + return false; + if (strcmp(param, name)) + return false; + PARSE_UINT(value, *v = __); + return true; + } + + bool Controller::set_value(float *v, const char *param, const char *name, const char *value) + { + if (v == NULL) + return false; + if (strcmp(param, name)) + return false; + PARSE_FLOAT(value, *v = __); + return true; + } + + bool Controller::set_value(LSPString *v, const char *param, const char *name, const char *value) + { + if (v == NULL) + return false; + if (strcmp(param, name)) + return false; + + v->set_utf8(value); + return true; + } + + bool Controller::set_expr(ctl::Expression *expr, const char *param, const char *name, const char *value) + { + if (expr == NULL) + return false; + if (strcmp(name, param)) + return false; + + if (!expr->parse(value)) + lsp_warn("Failed to parse expression for attribute '%s': %s", name, value); + return true; + } + + } /* namespace ctl */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/DOMController.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/DOMController.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/DOMController.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/DOMController.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 24 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +namespace lsp +{ + namespace ctl + { + const ctl_class_t DOMController::metadata = { "Controller", &Controller::metadata }; + + DOMController::DOMController(ui::IWrapper *wrapper): + Controller(wrapper) + { + pClass = &metadata; + } + + DOMController::~DOMController() + { + } + + void DOMController::set(ui::UIContext *ctx, const char *name, const char *value) + { + } + + void DOMController::begin(ui::UIContext *ctx) + { + } + + void DOMController::end(ui::UIContext *ctx) + { + } + + } /* namespace ctl */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Factory.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Factory.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Factory.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Factory.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 апр. 2021 г. @@ -39,11 +39,11 @@ namespace lsp pNext = NULL; } - status_t Factory::create(Widget **ctl, ui::UIContext *context, const LSPString *name) + status_t Factory::create(Controller **ctl, ui::UIContext *context, const LSPString *name) { return STATUS_NOT_FOUND; } - } -} + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/PluginWindow.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -22,11 +22,10 @@ #include #include #include +#include #include #include #include -#include -#include #include #include @@ -47,25 +46,17 @@ namespace lsp namespace ctl { //----------------------------------------------------------------- - PluginWindow::ConfigSink::ConfigSink(ui::IWrapper *wrapper) - { - pWrapper = wrapper; - } - - void PluginWindow::ConfigSink::unbind() - { - pWrapper = NULL; - } - - status_t PluginWindow::ConfigSink::receive(const LSPString *text, const char *mime) + static const char * manual_prefixes[] = { - ui::IWrapper *wrapper = pWrapper; - if (wrapper == NULL) - return STATUS_NOT_BOUND; - - io::InStringSequence is(text); - return wrapper->import_settings(&is, ui::IMPORT_FLAG_NONE); - } + #ifdef LSP_LIB_PREFIX + LSP_LIB_PREFIX("/share"), + LSP_LIB_PREFIX("/local/share"), + #endif /* LSP_LIB_PREFIX */ + "/usr/share", + "/usr/local/share", + "/share", + NULL + }; //----------------------------------------------------------------- // Plugin window @@ -90,18 +81,17 @@ namespace lsp bResizable = false; pUserPaths = NULL; + pPresetsWindow = NULL; wContent = NULL; wGreeting = NULL; wAbout = NULL; wUserPaths = NULL; wMenu = NULL; + wPresets = NULL; wUIScaling = NULL; wBundleScaling = NULL; wFontScaling = NULL; - wResetSettings = NULL; - wExport = NULL; - wImport = NULL; wPreferHost = NULL; wRelPaths = NULL; wInvertVScroll = NULL; @@ -109,11 +99,8 @@ namespace lsp pPVersion = NULL; pPBypass = NULL; - pPath = NULL; - pFileType = NULL; pR3DBackend = NULL; pLanguage = NULL; - pRelPaths = NULL; pUIScaling = NULL; pUIScalingHost = NULL; pUIBundleScaling = NULL; @@ -124,8 +111,6 @@ namespace lsp init_enum_menu(&sFilterPointThickness); - pConfigSink = NULL; - sWndScale.nMFlags = 0; sWndScale.sSize.nLeft = 0; sWndScale.sSize.nTop = 0; @@ -152,14 +137,6 @@ namespace lsp // Cancel greeting timer wGreetingTimer.cancel(); - // Unbind configuration sink - if (pConfigSink != NULL) - { - pConfigSink->unbind(); - pConfigSink->release(); - pConfigSink = NULL; - } - // Delete UI rendering backend bindings for (size_t i=0, n=vBackendSel.size(); i(widgets()->find("trg_presets_menu")); + + if (presetButton != NULL) + { + presetButton->text()->set_raw(text); + } + } + status_t PluginWindow::init() { Window::init(); @@ -284,12 +271,9 @@ namespace lsp // Bind ports BIND_PORT(pWrapper, pPVersion, VERSION_PORT); - BIND_PORT(pWrapper, pPath, CONFIG_PATH_PORT); - BIND_PORT(pWrapper, pFileType, CONFIG_FTYPE_PORT); BIND_PORT(pWrapper, pPBypass, meta::PORT_NAME_BYPASS); BIND_PORT(pWrapper, pR3DBackend, R3D_BACKEND_PORT); BIND_PORT(pWrapper, pLanguage, LANGUAGE_PORT); - BIND_PORT(pWrapper, pRelPaths, REL_PATHS_PORT); BIND_PORT(pWrapper, pUIScaling, UI_SCALING_PORT); BIND_PORT(pWrapper, pUIScalingHost, UI_SCALING_HOST_PORT); BIND_PORT(pWrapper, pUIBundleScaling, UI_BUNDLE_SCALING_PORT); @@ -311,7 +295,7 @@ namespace lsp wnd->actions()->deny(ws::WA_RESIZE); LSP_STATUS_ASSERT(create_main_menu()); - LSP_STATUS_ASSERT(create_reset_settings_menu()); + LSP_STATUS_ASSERT(create_presets_window()); // Bind event handlers wnd->slots()->bind(tk::SLOT_CLOSE, slot_window_close, this); @@ -321,6 +305,16 @@ namespace lsp return STATUS_OK; } + status_t PluginWindow::post_init() + { + // Bind as preset listener to the wrapper + pWrapper->add_preset_listener(this); + bind_slot("trg_prev_preset", tk::SLOT_SUBMIT, slot_select_next_preset); + bind_slot("trg_next_preset", tk::SLOT_SUBMIT, slot_select_next_preset); + + return STATUS_OK; + } + i18n::IDictionary *PluginWindow::get_default_dict(tk::Widget *src) { i18n::IDictionary *dict = src->display()->dictionary(); @@ -344,6 +338,11 @@ namespace lsp widgets()->add(WUID_MAIN_MENU, wMenu); wMenu->init(); + // TODO: Move to a separate method + wPresets = new tk::Menu(dpy); + widgets()->add(WUID_PRESETS_MENU, wPresets); + wPresets->init(); + // Initialize menu items { // Add 'Plugin manual' menu item @@ -362,6 +361,9 @@ namespace lsp itm->slots()->bind(tk::SLOT_SUBMIT, slot_show_ui_manual, this); wMenu->add(itm); + // init_presets(wMenu, true); + init_presets(wPresets, false); + // Add separator itm = new tk::MenuItem(dpy); widgets()->add(itm); @@ -430,15 +432,15 @@ namespace lsp itm = new tk::MenuItem(dpy); widgets()->add(itm); itm->init(); - itm->text()->set("actions.user_paths"); - itm->slots()->bind(tk::SLOT_SUBMIT, slot_show_user_paths_dialog, this); + itm->text()->set("actions.reset_settings"); + itm->slots()->bind(tk::SLOT_SUBMIT, slot_reset_settings, this); wMenu->add(itm); - // Add separator itm = new tk::MenuItem(dpy); widgets()->add(itm); itm->init(); - itm->type()->set_separator(); + itm->text()->set("actions.user_paths"); + itm->slots()->bind(tk::SLOT_SUBMIT, slot_show_user_paths_dialog, this); wMenu->add(itm); // Create 'Dump state' menu item if supported @@ -452,11 +454,12 @@ namespace lsp wMenu->add(itm); } - // Create UI behaviour menu - init_ui_behaviour(wMenu); - - // Create language selection menu - init_i18n_support(wMenu); + // Add separator + itm = new tk::MenuItem(dpy); + widgets()->add(itm); + itm->init(); + itm->type()->set_separator(); + wMenu->add(itm); // Create UI scaling menu init_scaling_support(wMenu); @@ -470,37 +473,15 @@ namespace lsp // Create schema selection support menu init_visual_schema_support(wMenu); + // Create language selection menu + init_i18n_support(wMenu); + // Add support of 3D rendering backend switch if (meta->extensions & meta::E_3D_BACKEND) init_r3d_support(wMenu); - init_presets(wMenu); - } - - return STATUS_OK; - } - - status_t PluginWindow::create_reset_settings_menu() - { - tk::Window *wnd = tk::widget_cast(wWidget); - tk::Display *dpy = wnd->display(); - - // Initialize menu - wResetSettings = new tk::Menu(dpy); - widgets()->add(WUID_RESET_SETTINGS_MENU, wResetSettings); - wResetSettings->init(); - inject_style(wResetSettings, "PluginWindow::ResetMenu"); - - // Initialize menu items - { - // Add 'Reset' menu item - tk::MenuItem *itm = new tk::MenuItem(dpy); - widgets()->add(itm); - itm->init(); - itm->text()->set("actions.reset"); - inject_style(itm, "PluginWindow::ResetMenu::Reset"); - itm->slots()->bind(tk::SLOT_SUBMIT, slot_confirm_reset_settings, this); - wResetSettings->add(itm); + // Create UI behaviour menu + init_ui_behaviour(wMenu); } return STATUS_OK; @@ -991,6 +972,9 @@ namespace lsp return STATUS_NO_MEM; item->menu()->set(menu); + // Thickness of the enum menu item + wFilterPointThickness = create_enum_menu(&sFilterPointThickness, menu, "actions.ui_behavior.filter_point_thickness"); + // Create menu items LSP_STATUS_ASSERT( add_ui_flag( menu, @@ -1024,11 +1008,16 @@ namespace lsp LSP_STATUS_ASSERT( add_ui_flag(menu, - UI_FILELIST_NAVIGAION_AUTOLOAD_PORT, + UI_FILELIST_NAVIGATION_AUTOLOAD_PORT, "actions.ui_behavior.file_list_navigation_autoload")); LSP_STATUS_ASSERT( add_ui_flag(menu, + UI_FILELIST_NAVIGATION_AUTOPLAY_PORT, + "actions.ui_behavior.file_list_navigation_autoplay")); + + LSP_STATUS_ASSERT( + add_ui_flag(menu, UI_TAKE_INST_NAME_FROM_FILE_PORT, "actions.ui_behavior.take_instrument_name_from_file")); @@ -1068,85 +1057,70 @@ namespace lsp return strcmp(a->name, b->name); } - status_t PluginWindow::scan_presets(const char *location, lltl::darray *presets) + status_t PluginWindow::init_presets(tk::Menu *menu, bool add_submenu) { - io::Path path; - LSPString tmp; - resource::resource_t *resources = NULL; + status_t res; + if (menu == NULL) + return STATUS_OK; - if (tmp.fmt_utf8(LSP_BUILTIN_PREFIX "presets/%s", location) < 0) - return STATUS_BAD_STATE; - ssize_t count = pWrapper->resources()->enumerate(&tmp, &resources); + // Enumerate presets + lltl::darray presets; + const meta::plugin_t *metadata = pWrapper->ui()->metadata(); + if (metadata == NULL) + return STATUS_OK; - // Process all resources and form the final list of preset files - for (ssize_t i=0; itype != resource::RES_FILE) - continue; - if (path.set(item->name) != STATUS_OK) - { - free(resources); + if (add_submenu) + { + // Create submenu item + item = create_menu_item(menu); + if (item == NULL) return STATUS_NO_MEM; - } - if (path.get_ext(&tmp) != STATUS_OK) - { - free(resources); - return STATUS_BAD_STATE; - } - - if ((!tmp.equals_ascii("patch")) && (!tmp.equals_ascii("preset"))) - continue; + item->text()->set("actions.load_preset"); - // Add preset file to result - strncpy(item->name, path.get(), resource::RESOURCE_NAME_MAX); - item->name[resource::RESOURCE_NAME_MAX-1] = '\0'; - if (!presets->add(item)) - { - free(resources); + // Create submenu + menu = create_menu(); + if (menu == NULL) return STATUS_NO_MEM; - } + item->menu()->set(menu); } - free(resources); - presets->qsort(compare_presets); + preset_sel_t *sel; + io::Path path; + LSPString tmp; - return STATUS_OK; - } + if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; + item->text()->set("actions.reset_settings"); + item->slots()->bind(tk::SLOT_SUBMIT, slot_reset_settings, this); + + if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; + item->text()->set_raw("actions.manage_presets"); + item->slots()->bind(tk::SLOT_SUBMIT, slot_show_presets_window, this); - status_t PluginWindow::init_presets(tk::Menu *menu) - { - status_t res; - if (menu == NULL) - return STATUS_OK; + if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; + item->type()->set_separator(); - // Enumerate presets - lltl::darray presets; - const meta::plugin_t *metadata = pWrapper->ui()->metadata(); - if ((metadata == NULL) || (metadata->ui_presets == NULL)) - return STATUS_OK; - if (scan_presets(metadata->ui_presets, &presets) != STATUS_OK) + if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; + item->text()->set("actions.import_settings_from_file"); + item->slots()->bind(tk::SLOT_SUBMIT, slot_import_settings_from_file, this); + + if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; + item->text()->set("actions.import_settings_from_clipboard"); + item->slots()->bind(tk::SLOT_SUBMIT, slot_import_settings_from_clipboard, this); + + // if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; + // item->text()->set("*Open presets folder*"); + + if (core::scan_presets(&presets, pWrapper->resources(), metadata->ui_presets) != STATUS_OK) return STATUS_OK; if (presets.is_empty()) return STATUS_OK; + core::sort_presets(&presets, true); - // Create submenu item - tk::MenuItem *item = create_menu_item(menu); - if (item == NULL) - return STATUS_NO_MEM; - item->text()->set("actions.load_preset"); - - // Create submenu - menu = create_menu(); - if (menu == NULL) + if ((item = create_menu_item(menu)) == NULL) return STATUS_NO_MEM; - item->menu()->set(menu); - - preset_sel_t *sel; - io::Path path; - LSPString tmp; + item->type()->set_separator(); for (size_t i=0, n=presets.size(); ictl == NULL) || (sel->item == NULL)) return STATUS_BAD_ARGUMENTS; + sel->ctl->set_preset_button_text(sel->item->text()->raw()->get_utf8()); + lsp_trace("Loading preset %s", sel->location.get_native()); size_t flags = ui::IMPORT_FLAG_PRESET; if (sel->patch) @@ -1579,6 +1555,7 @@ namespace lsp // Header menu bind_trigger("trg_main_menu", tk::SLOT_SUBMIT, slot_show_main_menu); + bind_trigger("trg_presets_menu", tk::SLOT_SUBMIT, slot_show_presets_window); bind_trigger("trg_export_settings", tk::SLOT_SUBMIT, slot_export_settings_to_file); bind_trigger("trg_import_settings", tk::SLOT_SUBMIT, slot_import_settings_from_file); bind_trigger("trg_reset_settings", tk::SLOT_SUBMIT, slot_reset_settings); @@ -1658,211 +1635,71 @@ namespace lsp status_t PluginWindow::add(ui::UIContext *ctx, ctl::Widget *child) { - return (wContent != NULL) ? wContent->add(child->widget()) : STATUS_BAD_STATE; - } - - tk::FileFilters *PluginWindow::create_config_filters(tk::FileDialog *dlg) - { - tk::FileFilters *f = dlg->filter(); - if (f == NULL) - return f; - - tk::FileMask *ffi = f->add(); - if (ffi != NULL) - { - ffi->pattern()->set("*.cfg"); - ffi->title()->set("files.config.lsp"); - ffi->extensions()->set_raw(".cfg"); - } - - ffi = f->add(); - if (ffi != NULL) - { - ffi->pattern()->set("*"); - ffi->title()->set("files.all"); - ffi->extensions()->set_raw(""); - } + ctl::Overlay *ov = ctl::ctl_cast(child); + tk::WidgetContainer *target = (ov != NULL) ? tk::widget_cast(wWidget) : wContent; - return f; + return (target != NULL) ? target->add(child->widget()) : STATUS_BAD_STATE; } status_t PluginWindow::slot_export_settings_to_file(tk::Widget *sender, void *ptr, void *data) { - PluginWindow *_this = static_cast(ptr); - tk::Display *dpy = _this->wWidget->display(); - tk::FileDialog *dlg = _this->wExport; - - if (dlg == NULL) - { - dlg = new tk::FileDialog(dpy); - _this->widgets()->add(dlg); - _this->wExport = dlg; - - dlg->init(); - dlg->mode()->set(tk::FDM_SAVE_FILE); - dlg->title()->set("titles.export_settings"); - dlg->action_text()->set("actions.save"); - dlg->use_confirm()->set(true); - dlg->confirm_message()->set("messages.file.confirm_overwrite"); - - create_config_filters(dlg); - - // Add 'Relative paths' option if present - tk::Box *wc = new tk::Box(dpy); - _this->widgets()->add(wc); - wc->init(); - wc->orientation()->set_vertical(); - wc->allocation()->set_hfill(true); - - if (_this->has_path_ports()) - { - tk::Box *op_rpath = new tk::Box(dpy); - _this->widgets()->add(op_rpath); - op_rpath->init(); - op_rpath->orientation()->set_horizontal(); - op_rpath->spacing()->set(4); - - // Add switch button - tk::CheckBox *ck_rpath = new tk::CheckBox(dpy); - _this->widgets()->add(ck_rpath); - ck_rpath->init(); - ck_rpath->slots()->bind(tk::SLOT_SUBMIT, slot_relative_path_changed, _this); - _this->wRelPaths = ck_rpath; - op_rpath->add(ck_rpath); - - // Add label - tk::Label *lbl_rpath = new tk::Label(dpy); - _this->widgets()->add(lbl_rpath); - lbl_rpath->init(); - - lbl_rpath->allocation()->set_hexpand(true); - lbl_rpath->allocation()->set_hfill(true); - lbl_rpath->text_layout()->set_halign(-1.0f); - lbl_rpath->text()->set("labels.relative_paths"); - op_rpath->add(lbl_rpath); - - // Add option to dialog - wc->add(op_rpath); - } - - // Bind actions - if (wc->items()->size() > 0) - dlg->options()->set(wc); - dlg->slots()->bind(tk::SLOT_SUBMIT, slot_call_export_settings_to_file, ptr); - dlg->slots()->bind(tk::SLOT_SHOW, slot_fetch_path, _this); - dlg->slots()->bind(tk::SLOT_HIDE, slot_commit_path, _this); - } + PluginWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->pPresetsWindow != NULL) + self->pPresetsWindow->show_export_settings_dialog(); - // Initialize and show the window - if ((_this->wRelPaths != NULL) && (_this->pRelPaths != NULL)) - { - bool checked = _this->pRelPaths->value() >= 0.5f; - _this->wRelPaths->checked()->set(checked); - } - dlg->show(_this->wWidget); return STATUS_OK; } status_t PluginWindow::slot_export_settings_to_clipboard(tk::Widget *sender, void *ptr, void *data) { - status_t res; - LSPString buf; - PluginWindow *_this = static_cast(ptr); + PluginWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; - // Export settings to text buffer - io::OutStringSequence sq(&buf); - if ((res = _this->pWrapper->export_settings(&sq)) != STATUS_OK) - return STATUS_OK; - sq.close(); - - // Now 'buf' contains serialized configuration, put it to clipboard - tk::TextDataSource *ds = new tk::TextDataSource(); - if (ds == NULL) - return STATUS_NO_MEM; - ds->acquire(); - res = ds->set_text(&buf); - if (res == STATUS_OK) - res = _this->wWidget->display()->set_clipboard(ws::CBUF_CLIPBOARD, ds); - ds->release(); + if (self->pPresetsWindow != NULL) + self->pPresetsWindow->export_settings_to_clipboard(); return STATUS_OK; } status_t PluginWindow::slot_import_settings_from_file(tk::Widget *sender, void *ptr, void *data) { - PluginWindow *_this = static_cast(ptr); - tk::Display *dpy = _this->wWidget->display(); - tk::FileDialog *dlg = _this->wImport; - if (dlg == NULL) - { - dlg = new tk::FileDialog(dpy); - _this->widgets()->add(dlg); - _this->wImport = dlg; - - dlg->init(); - dlg->mode()->set(tk::FDM_OPEN_FILE); - dlg->title()->set("titles.import_settings"); - dlg->action_text()->set("actions.open"); - - create_config_filters(dlg); + PluginWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; - dlg->slots()->bind(tk::SLOT_SUBMIT, slot_call_import_settings_from_file, ptr); - dlg->slots()->bind(tk::SLOT_SHOW, slot_fetch_path, _this); - dlg->slots()->bind(tk::SLOT_HIDE, slot_commit_path, _this); - } + if (self->pPresetsWindow != NULL) + self->pPresetsWindow->show_import_settings_dialog(); - dlg->show(_this->wWidget); return STATUS_OK; } status_t PluginWindow::slot_import_settings_from_clipboard(tk::Widget *sender, void *ptr, void *data) { - PluginWindow *_this = static_cast(ptr); - tk::Display *dpy = _this->wWidget->display(); - - // Create new sink - ConfigSink *ds = new ConfigSink(_this->pWrapper); - if (ds == NULL) - return STATUS_NO_MEM; - ds->acquire(); + PluginWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; - // Release previously used - ConfigSink *old = _this->pConfigSink; - _this->pConfigSink = ds; + if (self->pPresetsWindow != NULL) + self->pPresetsWindow->import_settings_from_clipboard(); - if (old != NULL) - { - old->unbind(); - old->release(); - } - - // Request clipboard data - return dpy->get_clipboard(ws::CBUF_CLIPBOARD, ds); + return STATUS_OK; } status_t PluginWindow::slot_reset_settings(tk::Widget *sender, void *ptr, void *data) { - PluginWindow *__this = static_cast(ptr); - return __this->show_menu(__this->wResetSettings, sender, data); - } + PluginWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; - status_t PluginWindow::slot_confirm_reset_settings(tk::Widget *sender, void *ptr, void *data) - { - PluginWindow *__this = static_cast(ptr); - return __this->pWrapper->reset_settings(); - } + if (self->pPresetsWindow != NULL) + self->pPresetsWindow->reset_settings(); - static const char * manual_prefixes[] = - { - #ifdef LSP_LIB_PREFIX - LSP_LIB_PREFIX("/share"), - LSP_LIB_PREFIX("/local/share"), - #endif /* LSP_LIB_PREFIX */ - "/usr/share", - "/usr/local/share", - "/share", - NULL - }; + return STATUS_OK; + } status_t PluginWindow::slot_show_plugin_manual(tk::Widget *sender, void *ptr, void *data) { @@ -1887,6 +1724,15 @@ namespace lsp return STATUS_OK; } + status_t PluginWindow::slot_show_presets_window(tk::Widget *sender, void *ptr, void *data) + { + PluginWindow *__this = static_cast(ptr); + if (__this != NULL) + __this->show_presets_window(); + + return STATUS_OK; + } + status_t PluginWindow::slot_debug_dump(tk::Widget *sender, void *ptr, void *data) { PluginWindow *__this = static_cast(ptr); @@ -1902,6 +1748,26 @@ namespace lsp return __this->show_menu(__this->wMenu, sender, data); } + status_t PluginWindow::slot_show_presets_menu(tk::Widget *sender, void *ptr, void *data) + { + PluginWindow *__this = static_cast(ptr); + return __this->show_menu(__this->wPresets, sender, data); + } + + status_t PluginWindow::slot_select_next_preset(tk::Widget *sender, void *ptr, void *data) + { + PluginWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->pPresetsWindow == NULL) + return STATUS_OK; + + tk::Widget *w = self->widgets()->find("trg_next_preset"); + self->pPresetsWindow->select_next_preset(sender == w); + return STATUS_OK; + } + status_t PluginWindow::slot_show_ui_scaling_menu(tk::Widget *sender, void *ptr, void *data) { PluginWindow *__this = static_cast(ptr); @@ -1944,34 +1810,6 @@ namespace lsp return STATUS_OK; } - status_t PluginWindow::slot_call_export_settings_to_file(tk::Widget *sender, void *ptr, void *data) - { - LSPString path; - PluginWindow *_this = static_cast(ptr); - status_t res = _this->wExport->selected_file()->format(&path); - - if (res == STATUS_OK) - { - bool relative = (_this->pRelPaths != NULL) ? _this->pRelPaths->value() >= 0.5f : false; - _this->pWrapper->export_settings(&path, relative); - } - - return STATUS_OK; - } - - status_t PluginWindow::slot_call_import_settings_from_file(tk::Widget *sender, void *ptr, void *data) - { - LSPString path; - PluginWindow *_this = static_cast(ptr); - status_t res = _this->wImport->selected_file()->format(&path); - - if (res == STATUS_OK) - _this->pWrapper->import_settings(&path, ui::IMPORT_FLAG_NONE); - - return STATUS_OK; - } - - status_t PluginWindow::slot_greeting_close(tk::Widget *sender, void *ptr, void *data) { PluginWindow *__this = static_cast(ptr); @@ -1988,66 +1826,6 @@ namespace lsp return STATUS_OK; } - status_t PluginWindow::slot_fetch_path(tk::Widget *sender, void *ptr, void *data) - { - PluginWindow *_this = static_cast(ptr); - if (_this == NULL) - return STATUS_BAD_STATE; - - tk::FileDialog *dlg = tk::widget_cast(sender); - if (dlg == NULL) - return STATUS_OK; - - // Set-up path - if (_this->pPath != NULL) - { - dlg->path()->set_raw(_this->pPath->buffer()); - } - // Set-up file type - if (_this->pFileType != NULL) - { - size_t filter = _this->pFileType->value(); - if (filter < dlg->filter()->size()) - dlg->selected_filter()->set(filter); - } - - return STATUS_OK; - } - - status_t PluginWindow::slot_commit_path(tk::Widget *sender, void *ptr, void *data) - { - PluginWindow *_this = static_cast(ptr); - if (_this == NULL) - return STATUS_BAD_STATE; - - tk::FileDialog *dlg = tk::widget_cast(sender); - if (dlg == NULL) - return STATUS_OK; - - // Update file path - if (_this->pPath != NULL) - { - LSPString tmp_path; - if (dlg->path()->format(&tmp_path) == STATUS_OK) - { - const char *path = tmp_path.get_utf8(); - if (path != NULL) - { - _this->pPath->write(path, strlen(path)); - _this->pPath->notify_all(ui::PORT_USER_EDIT); - } - } - } - // Update filter - if (_this->pFileType != NULL) - { - _this->pFileType->set_value(dlg->selected_filter()->get()); - _this->pFileType->notify_all(ui::PORT_USER_EDIT); - } - - return STATUS_OK; - } - tk::Label *PluginWindow::create_label(tk::WidgetContainer *dst, const char *key, const char *style_name) { tk::Label *lbl = new tk::Label(wWidget->display()); @@ -2104,6 +1882,10 @@ namespace lsp if ((v != NULL) && (pkgver.equals_utf8(v))) return STATUS_OK; + // Skip if current version contains "dev" + if (strstr(pkgver.get_utf8(), "dev") != NULL) + return STATUS_OK; + // Set timer to show the greeting window wGreetingTimer.set_handler(timer_show_greeting, this); wGreetingTimer.bind(pWrapper->display()); @@ -2143,6 +1925,21 @@ namespace lsp return STATUS_OK; } + status_t PluginWindow::show_presets_window() + { + tk::Window *wnd = tk::widget_cast(wWidget); + if (wnd == NULL) + return STATUS_BAD_STATE; + + if (pPresetsWindow == NULL) + return STATUS_OK; + + tk::Widget *actor = widgets()->find("trg_presets_menu_area"); + if (actor == NULL) + actor = widgets()->find("trg_presets_menu"); + return pPresetsWindow->toggle_visibility(actor); + } + status_t PluginWindow::show_greeting_window() { status_t res; @@ -2469,6 +2266,142 @@ namespace lsp return STATUS_OK; } + status_t PluginWindow::create_presets_window() + { + status_t res; + + PluginWindow *self = this; + + // Create window + tk::PopupWindow *w = new tk::PopupWindow(wWidget->display()); + if (w == NULL) + return STATUS_NO_MEM; + widgets()->add(w); + w->init(); + w->auto_close()->set(true); + + // Create controller + ctl::PresetsWindow *wc = new ctl::PresetsWindow(pWrapper, w, self); + if (wc == NULL) + return STATUS_NO_MEM; + controllers()->add(wc); + wc->init(); + + ui::UIContext uctx(pWrapper, wc->controllers(), wc->widgets()); + if ((res = init_context(&uctx)) != STATUS_OK) + return res; + + // Parse the XML document + ui::xml::RootNode root(&uctx, "window", wc); + ui::xml::Handler handler(pWrapper->resources()); + if ((res = handler.parse_resource(LSP_BUILTIN_PREFIX "ui/presets.xml", &root)) != STATUS_OK) + return res; + + if ((res = wc->post_init()) != STATUS_OK) + return res; + + pPresetsWindow = wc; + + return STATUS_OK; + } + + void PluginWindow::sync_preset_name() + { + tk::Widget *w = widgets()->find("trg_presets_menu"); + if (w == NULL) + return; + + tk::String *prop = NULL; + tk::Button *btn = NULL; + tk::Label *lbl = NULL; + // Try to cast to button + { + btn = tk::widget_cast(w); + if (btn != NULL) + prop = btn->text(); + } + // Try to cast to label + { + lbl = tk::widget_cast(w); + if (lbl != NULL) + prop = lbl->text(); + } + if (prop == NULL) + return; + + // Set default label if preset is not selected + const ui::preset_t *preset = pWrapper->active_preset(); + expr::Parameters params; + + // If text clipping is enabled, just update text + const bool text_clip = (lbl != NULL) ? lbl->text_clip()->get() : btn->text_clip()->get(); + if (text_clip) + { + if (preset == NULL) + { + prop->set("actions.presets.select"); + return; + } + + // Determine how to format the prest name + const char *key = "labels.presets.name.normal"; + const bool changed = pWrapper->active_preset_dirty(); + if (preset->flags & ui::PRESET_FLAG_USER) + key = (changed) ? "labels.presets.name.user_mod" : "labels.presets.name.user"; + else + key = (changed) ? "labels.presets.name.factory_mod" : "labels.presets.name.factory"; + + params.set_string("name", &preset->name); + prop->set(key, ¶ms); + + return; + } + + // Otherwise, fill esimation list + const ui::preset_t *list = pWrapper->all_presets(); + if (lbl != NULL) + lbl->clear_text_estimations(); + if (btn != NULL) + btn->clear_text_estimations(); + + for (size_t i=0, n=pWrapper->num_presets(); iactive_preset_dirty(); + if (item->flags & ui::PRESET_FLAG_USER) + key = (changed) ? "labels.presets.name.user_mod" : "labels.presets.name.user"; + else + key = (changed) ? "labels.presets.name.factory_mod" : "labels.presets.name.factory"; + + // Fill the text + params.set_string("name", &item->name); + if (item != preset) + { + tk::String *est = (btn != NULL) ? btn->add_text_estimation() : lbl->add_text_estimation(); + if (est != NULL) + est->set(key, ¶ms); + } + else + prop->set(key, ¶ms); + } + + if (preset == NULL) + prop->set("actions.presets.select"); + } + + void PluginWindow::preset_activated(const ui::preset_t *preset) + { + sync_preset_name(); + } + + void PluginWindow::presets_updated() + { + sync_preset_name(); + } + status_t PluginWindow::slot_scaling_toggle_prefer_host(tk::Widget *sender, void *ptr, void *data) { PluginWindow *_this = static_cast(ptr); @@ -2882,25 +2815,6 @@ namespace lsp return STATUS_OK; } - - status_t PluginWindow::slot_relative_path_changed(tk::Widget *sender, void *ptr, void *data) - { - PluginWindow *_this = static_cast(ptr); - if (_this == NULL) - return STATUS_OK; - if (_this->pRelPaths == NULL) - return STATUS_OK; - - tk::CheckBox *ck_box = tk::widget_cast(sender); - if (ck_box == NULL) - return STATUS_OK; - - float value = ck_box->checked()->get() ? 1.0f : 0.0f; - _this->pRelPaths->set_value(value); - _this->pRelPaths->notify_all(ui::PORT_USER_EDIT); - - return STATUS_OK; - } status_t PluginWindow::slot_invert_vscroll_changed(tk::Widget *sender, void *ptr, void *data) { diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/PresetsWindow.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/PresetsWindow.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/PresetsWindow.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/PresetsWindow.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -0,0 +1,1440 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 31 мар. 2024 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include +#include +#include +#include +#include + +#include +#include + +namespace lsp +{ + namespace ctl + { + //----------------------------------------------------------------- + static const char *preset_lists_ids[] = + { + "all_presets_list", + "factory_presets_list", + "user_presets_list", + "favourites_presets_list" + }; + + static const char *preset_management_buttons[] = + { + "btn_save", + "btn_favourite", + "btn_remove" + }; + + static const ui::preset_filter_t preset_filters[] = + { + ui::is_any_preset, + ui::is_factory_preset, + ui::is_user_preset, + ui::is_favourite_preset, + }; + + static const tk::tether_t presets_tether[] = + { + { tk::TF_BOTTOM | tk::TF_LEFT, 1.0f, 1.0f }, + { tk::TF_TOP | tk::TF_LEFT, 1.0f, -1.0f }, + { tk::TF_BOTTOM | tk::TF_RIGHT, -1.0f, 1.0f }, + { tk::TF_TOP | tk::TF_RIGHT, -1.0f, -1.0f }, + }; + + //----------------------------------------------------------------- + PresetsWindow::ConfigSink::ConfigSink(ui::IWrapper *wrapper) + { + pWrapper = wrapper; + } + + void PresetsWindow::ConfigSink::unbind() + { + pWrapper = NULL; + } + + status_t PresetsWindow::ConfigSink::receive(const LSPString *text, const char *mime) + { + ui::IWrapper *wrapper = pWrapper; + if (wrapper == NULL) + return STATUS_NOT_BOUND; + + io::InStringSequence is(text); + return wrapper->import_settings(&is, ui::IMPORT_FLAG_NONE); + } + + //----------------------------------------------------------------- + const ctl_class_t PresetsWindow::metadata = { "PresetsWindow", &Window::metadata }; + + PresetsWindow::PresetsWindow(ui::IWrapper *src, tk::Window *widget, PluginWindow *pluginWindow): + ctl::Window(src, widget) + { + pClass = &metadata; + + pPluginWindow = pluginWindow; + pSavePresetDlg = NULL; + wLastActor = NULL; + wExport = NULL; + wImport = NULL; + wRelPaths = NULL; + wPresetPattern = NULL; + + for (size_t i=0; iwList = NULL; + } + for (size_t i=0; iremove_preset_listener(this); + + // Unbind configuration sink + if (pConfigSink != NULL) + { + pConfigSink->unbind(); + pConfigSink->release(); + pConfigSink = NULL; + } + + // Clear filters + for (size_t i=0; ivPresets.flush(); + + for (size_t i=0, n=list->vItems.size(); ivItems.uget(i); + if (item != NULL) + { + item->destroy(); + delete item; + } + } + list->vItems.flush(); + } + + status_t PresetsWindow::init() + { + status_t res = ctl::Window::init(); + if (res != STATUS_OK) + return res; + + BIND_PORT(pWrapper, pPath, CONFIG_PATH_PORT); + BIND_PORT(pWrapper, pFileType, CONFIG_FTYPE_PORT); + BIND_PORT(pWrapper, pRelPaths, REL_PATHS_PORT); + + return STATUS_OK; + } + + status_t PresetsWindow::post_init() + { + tk::Window *wnd = tk::widget_cast(wWidget); + if (wnd == NULL) + return STATUS_BAD_STATE; + + wPresetPattern = widgets()->get("preset_filter"); + for (size_t i=0; iget(preset_management_buttons[i]); + for (size_t i=0; iget(preset_lists_ids[i]); + + if (vButtons[BTN_FAVOURITE] != NULL) + vButtons[BTN_FAVOURITE]->mode()->set_toggle(); + + wPresetTabs = widgets()->get("preset_category"); + + bind_slot("preset_filter", tk::SLOT_CHANGE, slot_preset_filter_changed); + bind_slot("btn_refresh", tk::SLOT_SUBMIT, slot_refresh_preset_list); + bind_slot("btn_save", tk::SLOT_SUBMIT, slot_preset_save_submit); + bind_slot("btn_favourite", tk::SLOT_SUBMIT, slot_preset_favourite_submit); + bind_slot("btn_reset", tk::SLOT_SUBMIT, slot_reset_settings); + bind_slot("btn_remove", tk::SLOT_SUBMIT, slot_preset_remove_click); + bind_slot("btn_import", tk::SLOT_SUBMIT, slot_submit_import_settings); + bind_slot("btn_export", tk::SLOT_SUBMIT, slot_submit_export_settings); + bind_slot("btn_copy", tk::SLOT_SUBMIT, slot_export_settings_to_clipboard); + bind_slot("btn_paste", tk::SLOT_SUBMIT, slot_import_settings_from_clipboard); + bind_slot("preset_category", tk::SLOT_SUBMIT, slot_preset_tab_selected); + + for (size_t i=0; iadd_preset_listener(this); + sync_preset_button_state(); + sync_preset_tab(); + + return STATUS_OK; + } + + void PresetsWindow::destroy() + { + do_destroy(); + ctl::Window::destroy(); + } + + bool PresetsWindow::need_indication(size_t i) + { + switch (i) + { + case ui::PRESET_TAB_ALL: + case ui::PRESET_TAB_FAVOURITES: + return true; + case ui::PRESET_TAB_USER: + case ui::PRESET_TAB_FACTORY: + default: + break; + } + return false; + } + + void PresetsWindow::make_preset_list(preset_list_t *list, const ui::preset_t *presets, + size_t count, ui::preset_filter_t filter, bool indicate) + { + tk::ListBox *lb = list->wList; + if (lb == NULL) + return; + + status_t res; + io::Path path; + LSPString preset_name; + LSPString preset_pattern; + preset_list_t tmp; + + // Create temporary list + tmp.wList = NULL; + lsp_finally { + destroy_preset_list(&tmp); + }; + + tk::Display *dpy = wWidget->display(); + for (size_t i=0; idestroy(); + delete item; + } + }; + + if ((res = item->init()) != STATUS_OK) + continue; + + // Set name + sync_preset_name(item, p, indicate); + + // Add item to preset list + if (!tmp.vPresets.add(const_cast(p))) + continue; + + // Add item to ListBox + if (!tmp.vItems.add(item)) + { + tmp.vPresets.pop(); + continue; + } + item = NULL; + } + + // Add new items to list + lb->items()->clear(); + for (size_t i=0, n=tmp.vItems.size(); iadd(item); + } + + // Commit result + tmp.vItems.swap(list->vItems); + tmp.vPresets.swap(list->vPresets); + } + + const ui::preset_t *PresetsWindow::current_preset() + { + const ui::preset_tab_t tab = pWrapper->preset_tab(); + preset_list_t *list = (tab < ui::PRESET_TAB_TOTAL) ? &vPresetsLists[tab] : NULL; + + tk::ListBoxItem *item = (list->wList != NULL) ? list->wList->selected()->any() : NULL; + const size_t index = list->vItems.index_of(item); + return list->vPresets.get(index); + } + + void PresetsWindow::sync_preset_button_state() + { + const ui::preset_t *current = current_preset(); + sync_preset_button_state(current); + } + + void PresetsWindow::sync_preset_tab() + { + if (wPresetTabs == NULL) + return; + + tk::Tab *tab = wPresetTabs->widgets()->get(pWrapper->preset_tab()); + wPresetTabs->selected()->set(tab); + } + + void PresetsWindow::sync_preset_button_state(const ui::preset_t *preset) + { + tk::Button *btn = vButtons[BTN_FAVOURITE]; + if (btn != NULL) + { + const bool can_toggle = preset != NULL; + const bool is_favourite = (preset != NULL) && (preset->flags & ui::PRESET_FLAG_FAVOURITE); + btn->editable()->set(can_toggle); + btn->active()->set(can_toggle); + btn->down()->set(is_favourite); + } + + btn = vButtons[BTN_DELETE]; + if (btn != NULL) + { + const bool editable = (preset != NULL) && (preset->flags & ui::PRESET_FLAG_USER); + btn->editable()->set(editable); + btn->active()->set(editable); + } + } + + bool PresetsWindow::has_path_ports() + { + for (size_t i = 0, n = pWrapper->ports(); i < n; ++i) + { + ui::IPort *p = pWrapper->port(i); + const meta::port_t *meta = (p != NULL) ? p->metadata() : NULL; + if ((meta != NULL) && (meta->role == meta::R_PATH)) + return true; + } + return false; + } + + tk::FileFilters *PresetsWindow::create_config_filters(tk::FileDialog *dlg) + { + tk::FileFilters *f = dlg->filter(); + if (f == NULL) + return f; + + tk::FileMask *ffi = f->add(); + if (ffi != NULL) + { + ffi->pattern()->set("*.cfg"); + ffi->title()->set("files.config.lsp"); + ffi->extensions()->set_raw(".cfg"); + } + + ffi = f->add(); + if (ffi != NULL) + { + ffi->pattern()->set("*"); + ffi->title()->set("files.all"); + ffi->extensions()->set_raw(""); + } + + return f; + } + + status_t PresetsWindow::show(tk::Widget *actor) + { + tk::PopupWindow *wnd = tk::widget_cast(wWidget); + if (wnd == NULL) + return STATUS_BAD_STATE; + + wLastActor = actor; + if (actor != NULL) + { + ws::rectangle_t r; + actor->get_screen_rectangle(&r); + + wnd->set_tether(presets_tether, sizeof(presets_tether)/sizeof(tk::tether_t)); + wnd->trigger_widget()->set(actor); + wnd->trigger_area()->set(&r); + } + + wnd->show(); + wnd->grab_events(ws::GRAB_DROPDOWN); + + return STATUS_OK; + } + + bool PresetsWindow::visible() const + { + tk::PopupWindow *wnd = tk::widget_cast(wWidget); + if (wnd == NULL) + return false; + + return wnd->visibility()->get(); + } + + status_t PresetsWindow::hide() + { + if (wWidget == NULL) + return STATUS_BAD_STATE; + + wWidget->hide(); + return STATUS_OK; + } + + status_t PresetsWindow::toggle_visibility(tk::Widget *actor) + { + return (visible()) ? hide() : show(actor); + } + + status_t PresetsWindow::show_export_settings_dialog() + { + if (pPluginWindow == NULL) + return STATUS_BAD_STATE; + + tk::Display *dpy = wWidget->display(); + tk::FileDialog *dlg = wExport; + + if (dlg == NULL) + { + dlg = new tk::FileDialog(dpy); + if (dlg == NULL) + return STATUS_NO_MEM; + + widgets()->add(dlg); + wExport = dlg; + + dlg->init(); + dlg->mode()->set(tk::FDM_SAVE_FILE); + dlg->title()->set("titles.export_settings"); + dlg->action_text()->set("actions.save"); + dlg->use_confirm()->set(true); + dlg->confirm_message()->set("messages.file.confirm_overwrite"); + + create_config_filters(dlg); + + // Add 'Relative paths' option if present + tk::Box *wc = new tk::Box(dpy); + if (wc == NULL) + return STATUS_NO_MEM; + + widgets()->add(wc); + wc->init(); + wc->orientation()->set_vertical(); + wc->allocation()->set_hfill(true); + + if (has_path_ports()) + { + tk::Box *op_rpath = new tk::Box(dpy); + widgets()->add(op_rpath); + op_rpath->init(); + op_rpath->orientation()->set_horizontal(); + op_rpath->spacing()->set(4); + + // Add switch button + tk::CheckBox *ck_rpath = new tk::CheckBox(dpy); + widgets()->add(ck_rpath); + ck_rpath->init(); + ck_rpath->slots()->bind(tk::SLOT_SUBMIT, slot_relative_path_changed, self()); + wRelPaths = ck_rpath; + op_rpath->add(ck_rpath); + + // Add label + tk::Label *lbl_rpath = new tk::Label(dpy); + widgets()->add(lbl_rpath); + lbl_rpath->init(); + + lbl_rpath->allocation()->set_hexpand(true); + lbl_rpath->allocation()->set_hfill(true); + lbl_rpath->text_layout()->set_halign(-1.0f); + lbl_rpath->text()->set("labels.relative_paths"); + op_rpath->add(lbl_rpath); + + // Add option to dialog + wc->add(op_rpath); + } + + // Bind actions + if (wc->items()->size() > 0) + dlg->options()->set(wc); + dlg->slots()->bind(tk::SLOT_SUBMIT, slot_exec_export_settings_to_file, self()); + dlg->slots()->bind(tk::SLOT_SHOW, slot_fetch_path, self()); + dlg->slots()->bind(tk::SLOT_HIDE, slot_commit_path, self()); + } + + // Initialize and show the window + if ((wRelPaths != NULL) && (pRelPaths != NULL)) + { + bool checked = pRelPaths->value() >= 0.5f; + wRelPaths->checked()->set(checked); + } + + dlg->show(pPluginWindow->widget()); + return STATUS_OK; + } + + status_t PresetsWindow::show_import_settings_dialog() + { + if (pPluginWindow == NULL) + return STATUS_BAD_STATE; + + tk::Display *dpy = wWidget->display(); + tk::FileDialog *dlg = wImport; + + if (dlg == NULL) + { + dlg = new tk::FileDialog(dpy); + if (dlg == NULL) + return STATUS_NO_MEM; + + widgets()->add(dlg); + wImport = dlg; + + dlg->init(); + dlg->mode()->set(tk::FDM_OPEN_FILE); + dlg->title()->set("titles.import_settings"); + dlg->action_text()->set("actions.open"); + + create_config_filters(dlg); + + dlg->slots()->bind(tk::SLOT_SUBMIT, slot_exec_import_settings_from_file, self()); + dlg->slots()->bind(tk::SLOT_SHOW, slot_fetch_path, self()); + dlg->slots()->bind(tk::SLOT_HIDE, slot_commit_path, self()); + } + + dlg->show(pPluginWindow->widget()); + return STATUS_OK; + } + + status_t PresetsWindow::import_settings_from_clipboard() + { + tk::Display *dpy = wWidget->display(); + + // Create new sink + ConfigSink *ds = new ConfigSink(pWrapper); + if (ds == NULL) + return STATUS_NO_MEM; + ds->acquire(); + + // Release previously used + ConfigSink *old = pConfigSink; + pConfigSink = ds; + + if (old != NULL) + { + old->unbind(); + old->release(); + } + + // Request clipboard data + return dpy->get_clipboard(ws::CBUF_CLIPBOARD, ds); + } + + status_t PresetsWindow::export_settings_to_clipboard() + { + status_t res; + LSPString buf; + + // Export settings to text buffer + io::OutStringSequence sq(&buf); + if ((res = pWrapper->export_settings(&sq)) != STATUS_OK) + return STATUS_OK; + sq.close(); + + // Now 'buf' contains serialized configuration, put it to clipboard + tk::TextDataSource *ds = new tk::TextDataSource(); + if (ds == NULL) + return STATUS_NO_MEM; + ds->acquire(); + lsp_finally { ds->release(); }; + + res = ds->set_text(&buf); + if (res == STATUS_OK) + res = wWidget->display()->set_clipboard(ws::CBUF_CLIPBOARD, ds); + + return STATUS_OK; + } + + status_t PresetsWindow::reset_settings() + { + pWrapper->reset_settings(); + return STATUS_OK; + } + + void PresetsWindow::sync_preset_lists() + { + LSPString filter; + if (wPresetPattern != NULL) + wPresetPattern->text()->format(&filter); + + // Set selection for each list + const ui::preset_t *active = pWrapper->active_preset(); + for (size_t i=0; iwList == NULL) + continue; + + // Update visibility of preset items + tk::ListBoxItem *selected = NULL; + for (size_t j=0, n=list->vPresets.size(); jvPresets.get(j); + tk::ListBoxItem *item = list->vItems.get(j); + if ((preset == NULL) || (item == NULL)) + continue; + + const bool visible = preset->name.index_of_nocase(&filter) >= 0; + item->visibility()->set(visible); + if (preset == active) + selected = item; + } + + // Make item being selected + list->wList->selected()->clear(); + if (selected != NULL) + list->wList->selected()->add(selected); + } + } + + void PresetsWindow::sync_preset_name(tk::ListBoxItem *item, const ui::preset_t *preset, bool indicate) + { + // Determine how to format the prest name + const ui::preset_t *active = pWrapper->active_preset(); + const char *key = "labels.presets.name.normal"; + const bool changed = (preset == active) && (pWrapper->active_preset_dirty()); + if (indicate) + { + if (preset->flags & ui::PRESET_FLAG_USER) + key = (changed) ? "labels.presets.name.user_mod" : "labels.presets.name.user"; + else + key = (changed) ? "labels.presets.name.factory_mod" : "labels.presets.name.factory"; + } + + // Fill the item + expr::Parameters params; + params.set_string("name", &preset->name); + item->text()->set(key, ¶ms); + + lsp_trace("set name for preset %s to %s", preset->name.get_utf8(), key); + } + + void PresetsWindow::preset_deactivated(const ui::preset_t *preset) + { + lsp_trace("preset deactivated: %s", preset->name.get_utf8()); + + // Set selection for each list + for (size_t i=0; iwList; + if (lbox == NULL) + continue; + + lbox->selected()->clear(); + const ssize_t index = list->vPresets.index_of(preset); + if (index < 0) + continue; + + // Synchronize state + tk::ListBoxItem *item = list->vItems.get(index); + if (item != NULL) + sync_preset_name(item, preset, need_indication(i)); + } + + sync_preset_button_state(preset); + } + + void PresetsWindow::preset_activated(const ui::preset_t *preset) + { + lsp_trace("preset activated: %s", preset->name.get_utf8()); + + // Set selection for each list + for (size_t i=0; iwList; + if (lbox == NULL) + continue; + + lbox->selected()->clear(); + const ssize_t index = list->vPresets.index_of(preset); + if (index < 0) + continue; + + // Synchronize state + tk::ListBoxItem *item = list->vItems.get(index); + if (item == NULL) + continue; + + sync_preset_name(item, preset, need_indication(i)); + if (!item->visibility()->get()) + continue; + + lbox->selected()->add(item); + } + + sync_preset_button_state(preset); + } + + void PresetsWindow::presets_updated() + { + lsp_trace("presets updated"); + + const ui::preset_t *presets = pWrapper->all_presets(); + const size_t count = pWrapper->num_presets(); + + for (size_t i=0; idisplay()); + if (dialog == NULL) + return false; + lsp_finally { + if (dialog != NULL) + { + dialog->destroy(); + delete dialog; + } + }; + + status_t res = dialog->init(); + if (res != STATUS_OK) + return false; + + dialog->title()->set("titles.confirmation"); + dialog->heading()->set("headings.confirmation"); + dialog->add("actions.confirm.yes", slot_accept_preset_selection, self()); + dialog->add("actions.confirm.no", slot_reject_preset_selection, self()); + + dialog->buttons()->get(0)->constraints()->set_min_width(96); + dialog->buttons()->get(1)->constraints()->set_min_width(96); + + bind_shortcut(dialog, ws::WSK_ESCAPE, tk::KM_NONE, slot_reject_preset_selection); + bind_shortcut(dialog, 'n', tk::KM_NONE, slot_reject_preset_selection); + bind_shortcut(dialog, 'N', tk::KM_NONE, slot_reject_preset_selection); + bind_shortcut(dialog, ws::WSK_RETURN, tk::KM_NONE, slot_accept_preset_selection); + bind_shortcut(dialog, ws::WSK_KEYPAD_ENTER, tk::KM_NONE, slot_accept_preset_selection); + bind_shortcut(dialog, 'y', tk::KM_NONE, slot_accept_preset_selection); + bind_shortcut(dialog, 'Y', tk::KM_NONE, slot_accept_preset_selection); + + // Commit dialog + if (widgets()->add(dialog) != STATUS_OK) + return false; + wWConfirm = release_ptr(dialog); + } + + // Update text + expr::Parameters params; + params.set_string("name", &preset->name); + wWConfirm->message()->set( + (preset->flags & ui::PRESET_FLAG_USER) ? + "messages.presets.factory_preset_changed" : + "messages.presets.user_preset_changed", + ¶ms); + + // Hide self and show the nested window + bWasVisible = wWidget->visibility()->get(); + if (bWasVisible) + hide(); + wWConfirm->show(wLastActor); + + return true; + } + + bool PresetsWindow::request_reset_state_confirmation() + { + if (wRstConfirm == NULL) + { + // Create and initialize dialog object + tk::MessageBox *dialog = new tk::MessageBox(wWidget->display()); + if (dialog == NULL) + return false; + lsp_finally { + if (dialog != NULL) + { + dialog->destroy(); + delete dialog; + } + }; + + status_t res = dialog->init(); + if (res != STATUS_OK) + return false; + + dialog->title()->set("titles.confirmation"); + dialog->heading()->set("headings.confirmation"); + dialog->add("actions.confirm.yes", slot_accept_reset_state, self()); + dialog->add("actions.confirm.no", slot_reject_reset_state, self()); + + dialog->buttons()->get(0)->constraints()->set_min_width(96); + dialog->buttons()->get(1)->constraints()->set_min_width(96); + + bind_shortcut(dialog, ws::WSK_ESCAPE, tk::KM_NONE, slot_reject_reset_state); + bind_shortcut(dialog, 'n', tk::KM_NONE, slot_reject_reset_state); + bind_shortcut(dialog, 'N', tk::KM_NONE, slot_reject_reset_state); + bind_shortcut(dialog, ws::WSK_RETURN, tk::KM_NONE, slot_accept_reset_state); + bind_shortcut(dialog, ws::WSK_KEYPAD_ENTER, tk::KM_NONE, slot_accept_reset_state); + bind_shortcut(dialog, 'y', tk::KM_NONE, slot_accept_reset_state); + bind_shortcut(dialog, 'Y', tk::KM_NONE, slot_accept_reset_state); + + // Commit dialog + if (widgets()->add(dialog) != STATUS_OK) + return false; + wRstConfirm = release_ptr(dialog); + + wRstConfirm->message()->set("messages.presets.confirm_reset_state"); + } + + // Hide self and show the nested window + hide(); + wRstConfirm->show(wLastActor); + + return true; + } + + bool PresetsWindow::request_remove_preset_confirmation() + { + // Get current preset + const ui::preset_t *current = current_preset(); + if ((current == NULL) || (!(current->flags & ui::PRESET_FLAG_USER))) + return false; + + if (wRemoveConfirm == NULL) + { + // Create and initialize dialog object + tk::MessageBox *dialog = new tk::MessageBox(wWidget->display()); + if (dialog == NULL) + return false; + lsp_finally { + if (dialog != NULL) + { + dialog->destroy(); + delete dialog; + } + }; + + status_t res = dialog->init(); + if (res != STATUS_OK) + return false; + + dialog->title()->set("titles.confirmation"); + dialog->heading()->set("headings.confirmation"); + dialog->add("actions.confirm.yes", slot_accept_remove_preset, self()); + dialog->add("actions.confirm.no", slot_reject_remove_preset, self()); + + dialog->buttons()->get(0)->constraints()->set_min_width(96); + dialog->buttons()->get(1)->constraints()->set_min_width(96); + + bind_shortcut(dialog, ws::WSK_ESCAPE, tk::KM_NONE, slot_reject_remove_preset); + bind_shortcut(dialog, 'n', tk::KM_NONE, slot_reject_remove_preset); + bind_shortcut(dialog, 'N', tk::KM_NONE, slot_reject_remove_preset); + bind_shortcut(dialog, ws::WSK_RETURN, tk::KM_NONE, slot_accept_remove_preset); + bind_shortcut(dialog, ws::WSK_KEYPAD_ENTER, tk::KM_NONE, slot_accept_remove_preset); + bind_shortcut(dialog, 'y', tk::KM_NONE, slot_accept_remove_preset); + bind_shortcut(dialog, 'Y', tk::KM_NONE, slot_accept_remove_preset); + + // Commit dialog + if (widgets()->add(dialog) != STATUS_OK) + return false; + wRemoveConfirm = release_ptr(dialog); + } + + // Initialize dialog + expr::Parameters params; + params.set_string("name", ¤t->name); + wRemoveConfirm->message()->set("messages.presets.confirm_remove_preset", ¶ms); + + // Hide self and show the nested window + hide(); + wRemoveConfirm->show(wLastActor); + + return true; + } + + void PresetsWindow::select_active_preset(const ui::preset_t *preset) + { + const ui::preset_t *dirty = (pWrapper->active_preset_dirty()) ? pWrapper->active_preset() : NULL; + + // Check that we need to confirm changes + if ((dirty != NULL) && (dirty != preset)) + { + pNewPreset = preset; + + if (!request_change_preset_conrifmation(dirty)) + preset_activated(dirty); + } + else + { + pNewPreset = NULL; + pWrapper->select_active_preset(preset); + } + } + + status_t PresetsWindow::create_save_preset_dialog() + { + if (pSavePresetDlg != NULL) + return STATUS_OK; + + status_t res; + + // Create window + tk::Window *w = new tk::Window(wWidget->display()); + if (w == NULL) + return STATUS_NO_MEM; + widgets()->add(w); + w->init(); + + // Create controller + ctl::SavePresetDialog *wc = new ctl::SavePresetDialog(pWrapper, w); + if (wc == NULL) + return STATUS_NO_MEM; + controllers()->add(wc); + wc->init(); + + // Initialize context + ui::UIContext uctx(pWrapper, wc->controllers(), wc->widgets()); + if ((res = uctx.init()) != STATUS_OK) + return res; + + // Parse the XML document + ui::xml::RootNode root(&uctx, "window", wc); + ui::xml::Handler handler(pWrapper->resources()); + if ((res = handler.parse_resource(LSP_BUILTIN_PREFIX "ui/save_preset.xml", &root)) != STATUS_OK) + return res; + + // Initialize the window + if ((res = wc->post_init()) != STATUS_OK) + return res; + + pSavePresetDlg = wc; + w->slots()->bind(tk::SLOT_SUBMIT, slot_create_preset_window_closed, self()); + w->slots()->bind(tk::SLOT_CANCEL, slot_create_preset_window_closed, self()); + + return STATUS_OK; + } + + void PresetsWindow::select_next_preset(bool forward) + { + // Obtain the current list of presets + const ui::preset_tab_t tab = pWrapper->preset_tab(); + preset_list_t *list = (tab < ui::PRESET_TAB_TOTAL) ? &vPresetsLists[tab] : NULL; + if (list == NULL) + return; + const ssize_t num_presets = list->vPresets.size(); + if (num_presets <= 0) + return; + + // We need to ensure that current preset is in the list + const ui::preset_t *preset = pWrapper->active_preset(); + ssize_t preset_index = (preset != NULL) ? list->vPresets.index_of(preset) : -1; + + // Obtain the index of the next preset + if (preset_index >= 0) + { + const ssize_t direction = (forward) ? 1 : num_presets - 1; + preset_index = (preset_index + direction) % num_presets; + } + else + preset_index = 0; + + // Obtain new preset + preset = list->vPresets.get(preset_index); + if (preset == NULL) + return; + + // Select new active preset + select_active_preset(preset); + } + + //----------------------------------------------------------------- + // Slots + + status_t PresetsWindow::slot_fetch_path(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_BAD_STATE; + + tk::FileDialog *dlg = tk::widget_cast(sender); + if (dlg == NULL) + return STATUS_OK; + + // Set-up path + if (self->pPath != NULL) + { + dlg->path()->set_raw(self->pPath->buffer()); + } + // Set-up file type + if (self->pFileType != NULL) + { + size_t filter = self->pFileType->value(); + if (filter < dlg->filter()->size()) + dlg->selected_filter()->set(filter); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_commit_path(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_BAD_STATE; + + tk::FileDialog *dlg = tk::widget_cast(sender); + if (dlg == NULL) + return STATUS_OK; + + // Update file path + if (self->pPath != NULL) + { + LSPString tmp_path; + if (dlg->path()->format(&tmp_path) == STATUS_OK) + { + const char *path = tmp_path.get_utf8(); + if (path != NULL) + { + self->pPath->write(path, strlen(path)); + self->pPath->notify_all(ui::PORT_USER_EDIT); + } + } + } + // Update filter + if (self->pFileType != NULL) + { + self->pFileType->set_value(dlg->selected_filter()->get()); + self->pFileType->notify_all(ui::PORT_USER_EDIT); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_relative_path_changed(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + if (self->pRelPaths == NULL) + return STATUS_OK; + + tk::CheckBox *ck_box = tk::widget_cast(sender); + if (ck_box == NULL) + return STATUS_OK; + + const float value = ck_box->checked()->get() ? 1.0f : 0.0f; + self->pRelPaths->set_value(value); + self->pRelPaths->notify_all(ui::PORT_USER_EDIT); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_exec_export_settings_to_file(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + if (self->wExport == NULL) + return STATUS_OK; + + LSPString path; + status_t res = self->wExport->selected_file()->format(&path); + if (res == STATUS_OK) + { + bool relative = (self->pRelPaths != NULL) ? self->pRelPaths->value() >= 0.5f : false; + self->pWrapper->export_settings(&path, relative); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_exec_import_settings_from_file(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + if (self->wImport == NULL) + return STATUS_OK; + + LSPString path; + status_t res = self->wImport->selected_file()->format(&path); + if (res == STATUS_OK) + self->pWrapper->import_settings(&path, ui::IMPORT_FLAG_NONE); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_window_close(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + tk::Window *wnd = tk::widget_cast(self->wWidget); + if (wnd != NULL) + wnd->visibility()->set(false); + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_remove_click(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + self->request_remove_preset_confirmation(); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_save_submit(tk::Widget *sender, void *ptr, void *data) + { + lsp_trace("slot_preset_save_submit"); + + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + const ui::preset_t *active = self->pWrapper->active_preset(); + status_t res = self->create_save_preset_dialog(); + if (res == STATUS_OK) + { + self->wWidget->hide(); + self->pSavePresetDlg->show( + self->wLastActor, + (active != NULL) ? &active->name : NULL, + (active != NULL) ? (active->flags & ui::PRESET_FLAG_FAVOURITE) : false); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_favourite_submit(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + const ui::preset_t *current = self->current_preset(); + if (current != NULL) + self->pWrapper->mark_preset_favourite( + current, + !(current->flags & ui::PRESET_FLAG_FAVOURITE)); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_submit_import_settings(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wWidget != NULL) + self->hide(); + self->show_import_settings_dialog(); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_submit_export_settings(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wWidget != NULL) + self->hide(); + self->show_export_settings_dialog(); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_export_settings_to_clipboard(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wWidget != NULL) + self->hide(); + self->export_settings_to_clipboard(); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_import_settings_from_clipboard(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wWidget != NULL) + self->hide(); + self->import_settings_from_clipboard(); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_refresh_preset_list(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + self->pWrapper->scan_presets(); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_reset_settings(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + self->request_reset_state_confirmation(); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_accept_reset_state(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wRstConfirm != NULL) + self->wRstConfirm->hide(); + self->reset_settings(); + } + return STATUS_OK; + } + + status_t PresetsWindow::slot_reject_reset_state(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wRstConfirm != NULL) + self->wRstConfirm->hide(); + self->show(self->wLastActor); + } + return STATUS_OK; + } + + status_t PresetsWindow::slot_accept_remove_preset(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wRemoveConfirm != NULL) + self->wRemoveConfirm->hide(); + + const ui::preset_t *current = self->current_preset(); + if (current != NULL) + self->pWrapper->remove_preset(current); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_reject_remove_preset(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self != NULL) + { + if (self->wRemoveConfirm != NULL) + self->wRemoveConfirm->hide(); + self->show(self->wLastActor); + } + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_select(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + // Find the related list and select the preset + for (size_t i=0; ivPresetsLists[i]; + if (list->wList != sender) + continue; + + // Determine new preset + tk::ListBoxItem *item = (list->wList != NULL) ? list->wList->selected()->any() : NULL; + const size_t index = list->vItems.index_of(item); + const ui::preset_t *preset = list->vPresets.get(index); + + self->select_active_preset(preset); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_dbl_click(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + const ws::event_t *ev = static_cast(data); + + if (ev->nCode == ws::MCB_LEFT) + self->hide(); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_filter_changed(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + self->sync_preset_lists(); + return STATUS_OK; + } + + status_t PresetsWindow::slot_accept_preset_selection(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + self->pWrapper->select_active_preset(self->pNewPreset); + self->pNewPreset = NULL; + if (self->wWConfirm != NULL) + self->wWConfirm->hide(); + tk::Window *wnd = tk::widget_cast(self->wWidget); + if ((wnd != NULL) && (self->bWasVisible)) + { + self->bWasVisible = false; + self->show(self->wLastActor); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_reject_preset_selection(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + self->preset_activated(self->pWrapper->active_preset()); + if (self->wWConfirm != NULL) + self->wWConfirm->hide(); + tk::Window *wnd = tk::widget_cast(self->wWidget); + if ((wnd != NULL) && (self->bWasVisible)) + { + self->bWasVisible = false; + self->show(self->wLastActor); + } + + return STATUS_OK; + } + + status_t PresetsWindow::slot_create_preset_window_closed(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + tk::Window *wnd = tk::widget_cast(self->wWidget); + if (wnd != NULL) + self->show(self->wLastActor); + + return STATUS_OK; + } + + status_t PresetsWindow::slot_preset_tab_selected(tk::Widget *sender, void *ptr, void *data) + { + PresetsWindow *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->wPresetTabs == NULL) + return STATUS_OK; + + tk::Tab *tab = self->wPresetTabs->selected()->get(); + const ssize_t index = (tab != NULL) ? self->wPresetTabs->widgets()->index_of(tab) : ui::PRESET_TAB_ALL; + if (self->pWrapper != NULL) + self->pWrapper->set_preset_tab(ui::preset_tab_t(lsp_min(index, ui::PRESET_TAB_TOTAL - 1))); + + return STATUS_OK; + } + + } /* namespace ctl */ +} /* namespace lsp */ + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Registry.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Registry.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Registry.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Registry.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 июн. 2021 г. @@ -41,34 +41,33 @@ namespace lsp void Registry::do_destroy() { - // Destroy all widgets in reverse order + // Destroy all controllers in reverse order for (size_t i=vControllers.size(); (i--) > 0;) { - ctl::Widget *w = vControllers.uget(i); -// lsp_trace("c = %p", w); + ctl::Controller *ctl = vControllers.uget(i); - if (w != NULL) + if (ctl != NULL) { - w->destroy(); - delete w; + ctl->destroy(); + delete ctl; } } vControllers.flush(); } - status_t Registry::add(ctl::Widget *w) + status_t Registry::add(ctl::Controller *ctl) { // lsp_trace("c = %p", w); - if (w == NULL) + if (ctl == NULL) return STATUS_BAD_ARGUMENTS; - if (vControllers.contains(w)) + if (vControllers.contains(ctl)) return STATUS_ALREADY_EXISTS; - return (vControllers.add(w)) ? STATUS_OK : STATUS_NO_MEM; + return (vControllers.add(ctl)) ? STATUS_OK : STATUS_NO_MEM; } - } -} + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/SavePresetDialog.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/SavePresetDialog.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/SavePresetDialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/SavePresetDialog.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -0,0 +1,403 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugins + * Created on: 27 июн. 2025 г. + * + * lsp-plugins is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugins 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugins. If not, see . + */ + +#include +#include + +namespace lsp +{ + namespace ctl + { + //----------------------------------------------------------------- + const ctl_class_t SavePresetDialog::metadata = { "SavePresetDialog", &Window::metadata }; + + SavePresetDialog::SavePresetDialog(ui::IWrapper *src, tk::Window *widget): + ctl::Window(src, widget) + { + wPresetName = NULL; + wConfirmation = NULL; + wNotification = NULL; + wFavourites = NULL; + wSaveButton = NULL; + } + + SavePresetDialog::~SavePresetDialog() + { + } + + void SavePresetDialog::destroy() + { + ctl::Window::destroy(); + } + + status_t SavePresetDialog::init() + { + LSP_STATUS_ASSERT(ctl::Window::init()); + + return STATUS_OK; + } + + status_t SavePresetDialog::post_init() + { + tk::Window *wnd = tk::widget_cast(wWidget); + if (wnd == NULL) + return STATUS_BAD_STATE; + + wnd->actions()->set(ws::WA_DIALOG); + if (wnd->border_style()->get() != ws::BS_DIALOG) + lsp_trace("Not a dialog"); + + wPresetName = widgets()->get("preset_name"); + wFavourites = widgets()->get("favourites_check"); + wSaveButton = widgets()->get("btn_save"); + + wWidget->slots()->add(tk::SLOT_SUBMIT); + wWidget->slots()->add(tk::SLOT_CANCEL); + wWidget->slots()->bind(tk::SLOT_CLOSE, slot_cancel_save_preset, self()); + + bind_slot("preset_name", tk::SLOT_CHANGE, slot_preset_name_change); + bind_slot("btn_save", tk::SLOT_SUBMIT, slot_save_button_submit); + bind_slot("btn_cancel", tk::SLOT_SUBMIT, slot_cancel_save_preset); + bind_slot("favourites_label", tk::SLOT_MOUSE_CLICK, slot_favourites_click); + bind_shortcut(wnd, ws::WSK_ESCAPE, tk::KM_NONE, slot_cancel_save_preset); + bind_shortcut(wnd, ws::WSK_RETURN, tk::KM_NONE, slot_save_button_submit); + bind_shortcut(wnd, ws::WSK_KEYPAD_ENTER, tk::KM_NONE, slot_save_button_submit); + + return STATUS_OK; + } + + status_t SavePresetDialog::show(tk::Widget *actor, const LSPString *name, bool favourite) + { + tk::Window *wnd = tk::widget_cast(wWidget); + if (wnd == NULL) + return STATUS_BAD_STATE; + + // Set preset name + if (wPresetName != NULL) + { + wPresetName->text()->set_raw(name); + wPresetName->selection()->set_all(); + } + + // Set favourites check + if (wFavourites != NULL) + wFavourites->checked()->set(favourite); + + sync_save_button_state(); + wnd->show(actor); + + if (wPresetName != NULL) + wPresetName->take_focus(); + + return STATUS_OK; + } + + void SavePresetDialog::sync_save_button_state() + { + if (wSaveButton == NULL) + return; + + LSPString name; + status_t res = wPresetName->text()->format(&name); + name.trim(); + + const bool active = (res == STATUS_OK) && (name.length() > 0); + wSaveButton->active()->set(active); + wSaveButton->editable()->set(active); + } + + const ui::preset_t *SavePresetDialog::find_user_preset_by_name(const LSPString *name) + { + if (wPresetName == NULL) + return NULL; + + const ui::preset_t *list = pWrapper->all_presets(); + const size_t count = pWrapper->num_presets(); + + for (size_t i=0; iflags & ui::PRESET_FLAG_USER)) + continue; + if (preset->name.equals_nocase(name)) + return preset; + } + + return NULL; + } + + //----------------------------------------------------------------- + // Slots + status_t SavePresetDialog::slot_preset_name_change(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self != NULL) + self->sync_save_button_state(); + + return STATUS_OK; + } + + bool SavePresetDialog::request_confirmation(const LSPString *name) + { + // Create confirmation dialog if needed + if (wConfirmation == NULL) + { + // Create and initialize dialog object + tk::MessageBox *dialog = new tk::MessageBox(wWidget->display()); + if (dialog == NULL) + return false; + lsp_finally { + if (dialog != NULL) + { + dialog->destroy(); + delete dialog; + } + }; + + status_t res = dialog->init(); + if (res != STATUS_OK) + { + lsp_trace("init failed"); + return false; + } + + dialog->title()->set("titles.confirmation"); + dialog->heading()->set("headings.confirmation"); + dialog->add("actions.confirm.yes", slot_accept_save_preset, self()); + dialog->add("actions.confirm.no", slot_reject_save_preset, self()); + dialog->add("actions.cancel", slot_cancel_save_preset, self()); + + dialog->buttons()->get(0)->constraints()->set_min_width(96); + dialog->buttons()->get(1)->constraints()->set_min_width(96); + dialog->buttons()->get(2)->constraints()->set_min_width(96); + + bind_shortcut(dialog, ws::WSK_ESCAPE, tk::KM_NONE, slot_cancel_save_preset); + bind_shortcut(dialog, 'c', tk::KM_NONE, slot_cancel_save_preset); + bind_shortcut(dialog, 'C', tk::KM_NONE, slot_cancel_save_preset); + bind_shortcut(dialog, ws::WSK_BACKSPACE, tk::KM_NONE, slot_reject_save_preset); + bind_shortcut(dialog, 'n', tk::KM_NONE, slot_reject_save_preset); + bind_shortcut(dialog, 'N', tk::KM_NONE, slot_reject_save_preset); + bind_shortcut(dialog, ws::WSK_RETURN, tk::KM_NONE, slot_accept_save_preset); + bind_shortcut(dialog, ws::WSK_KEYPAD_ENTER, tk::KM_NONE, slot_accept_save_preset); + bind_shortcut(dialog, 'y', tk::KM_NONE, slot_accept_save_preset); + bind_shortcut(dialog, 'Y', tk::KM_NONE, slot_accept_save_preset); + + // Commit dialog + if (widgets()->add(dialog) != STATUS_OK) + return false; + wConfirmation = release_ptr(dialog); + } + + // Update text + expr::Parameters params; + params.set_string("name", name); + wConfirmation->message()->set( + "messages.presets.confirm_overwrite", + ¶ms); + + wConfirmation->show(wWidget); + + return true; + } + + bool SavePresetDialog::show_show_save_error(const LSPString *name, status_t code) + { + // Create confirmation dialog if needed + if (wNotification == NULL) + { + // Create and initialize dialog object + tk::MessageBox *dialog = new tk::MessageBox(wWidget->display()); + if (dialog == NULL) + return false; + lsp_finally { + if (dialog != NULL) + { + dialog->destroy(); + delete dialog; + } + }; + + status_t res = dialog->init(); + if (res != STATUS_OK) + return false; + + dialog->title()->set("titles.attention"); + dialog->heading()->set("headings.attention"); + dialog->add("actions.ok", slot_close_notification, self()); + dialog->add("actions.cancel", slot_cancel_save_preset, self()); + + dialog->buttons()->get(0)->constraints()->set_min_width(96); + dialog->buttons()->get(1)->constraints()->set_min_width(96); + + bind_shortcut(dialog, ws::WSK_ESCAPE, tk::KM_NONE, slot_cancel_save_preset); + bind_shortcut(dialog, ws::WSK_RETURN, tk::KM_NONE, slot_close_notification); + bind_shortcut(dialog, ws::WSK_KEYPAD_ENTER, tk::KM_NONE, slot_close_notification); + bind_shortcut(dialog, ws::WSK_BACKSPACE, tk::KM_NONE, slot_close_notification); + + // Commit dialog + if (widgets()->add(dialog) != STATUS_OK) + return false; + wNotification = release_ptr(dialog); + } + + // Update text + expr::Parameters params; + params.set_string("name", name); + params.set_int("code", code); + wNotification->message()->set( + "messages.presets.save_preset_failed", + ¶ms); + + wNotification->show(wWidget); + + return true; + } + + void SavePresetDialog::save_preset(const LSPString *name) + { + const bool favourite = (wFavourites != NULL) ? wFavourites->checked()->get() : false; + + size_t flags = ui::PRESET_FLAG_USER; + if (favourite) + flags |= ui::PRESET_FLAG_FAVOURITE; + + status_t res = pWrapper->save_preset(name, flags); + if (res == STATUS_OK) + { + wWidget->hide(); + wWidget->slots()->execute(tk::SLOT_SUBMIT, wWidget); + } + else + show_show_save_error(name, res); + } + + status_t SavePresetDialog::slot_save_button_submit(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + if ((self->wSaveButton == NULL) || (!self->wSaveButton->editable())) + return STATUS_OK; + + // Check that we need confirmation + LSPString name; + if (self->wPresetName->text()->format(&name) != STATUS_OK) + return STATUS_OK; + + const ui::preset_t *active = self->pWrapper->active_preset(); + const ui::preset_t *save = self->find_user_preset_by_name(&name); + if (save != NULL) + { + const bool need_confirm = (active != save); + if (need_confirm) + { + self->request_confirmation(&name); + return STATUS_OK; + } + } + + self->save_preset(&name); + + return STATUS_OK; + } + + status_t SavePresetDialog::slot_accept_save_preset(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->wConfirmation != NULL) + self->wConfirmation->hide(); + + LSPString name; + if (self->wPresetName->text()->format(&name) != STATUS_OK) + return STATUS_OK; + + self->save_preset(&name); + + return STATUS_OK; + } + + status_t SavePresetDialog::slot_reject_save_preset(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->wConfirmation != NULL) + self->wConfirmation->hide(); + + return STATUS_OK; + } + + status_t SavePresetDialog::slot_cancel_save_preset(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->wNotification != NULL) + self->wNotification->hide(); + if (self->wConfirmation != NULL) + self->wConfirmation->hide(); + + self->wWidget->hide(); + self->wWidget->slots()->execute(tk::SLOT_CANCEL, self->wWidget); + + return STATUS_OK; + } + + status_t SavePresetDialog::slot_close_notification(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->wNotification != NULL) + self->wNotification->hide(); + + return STATUS_OK; + } + + status_t SavePresetDialog::slot_favourites_click(tk::Widget *sender, void *ptr, void *data) + { + SavePresetDialog *self = static_cast(ptr); + if (self == NULL) + return STATUS_OK; + + if (self->wFavourites == NULL) + return STATUS_OK; + + const ws::event_t *ev = static_cast(data); + if (ev == NULL) + return STATUS_OK; + + if (ev->nCode == ws::MCB_LEFT) + self->wFavourites->checked()->toggle(); + + return STATUS_OK; + } + + } /* namespace ctl */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Widget.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Widget.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Widget.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Widget.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 10 апр. 2021 г. @@ -34,14 +34,13 @@ namespace lsp } //--------------------------------------------------------------------- - const ctl_class_t Widget::metadata = { "Widget", NULL }; + const ctl_class_t Widget::metadata = { "Widget", &DOMController::metadata }; Widget::Widget(ui::IWrapper *wrapper, tk::Widget *widget): - ui::IPortListener(), + ctl::DOMController(wrapper), sProperties(this) { pClass = &metadata; - pWrapper = wrapper; wWidget = widget; } @@ -53,6 +52,7 @@ namespace lsp void Widget::destroy() { do_destroy(); + ctl::DOMController::destroy(); } void Widget::do_destroy() @@ -65,19 +65,6 @@ namespace lsp wWidget = NULL; } - bool Widget::instance_of(const ctl_class_t *wclass) const - { - const ctl_class_t *wc = pClass; - while (wc != NULL) - { - if (wc == wclass) - return true; - wc = wc->parent; - } - - return false; - } - tk::Widget *Widget::widget() { return wWidget; @@ -291,18 +278,6 @@ namespace lsp return true; } - bool Widget::set_expr(ctl::Expression *expr, const char *param, const char *name, const char *value) - { - if (expr == NULL) - return false; - if (strcmp(name, param)) - return false; - - if (!expr->parse(value)) - lsp_warn("Failed to parse expression for attribute '%s': %s", name, value); - return true; - } - bool Widget::set_param(tk::Boolean *b, const char *param, const char *name, const char *value) { if (b == NULL) @@ -340,96 +315,6 @@ namespace lsp return e->parse(value) == STATUS_OK; } - bool Widget::set_value(bool *v, const char *param, const char *name, const char *value) - { - if (v == NULL) - return false; - if (strcmp(param, name)) - return false; - PARSE_BOOL(value, *v = __); - return true; - } - - bool Widget::set_value(ssize_t *v, const char *param, const char *name, const char *value) - { - if (v == NULL) - return false; - if (strcmp(param, name)) - return false; - PARSE_INT(value, *v = __); - return true; - } - - bool Widget::set_value(size_t *v, const char *param, const char *name, const char *value) - { - if (v == NULL) - return false; - if (strcmp(param, name)) - return false; - PARSE_UINT(value, *v = __); - return true; - } - - bool Widget::set_value(float *v, const char *param, const char *name, const char *value) - { - if (v == NULL) - return false; - if (strcmp(param, name)) - return false; - PARSE_FLOAT(value, *v = __); - return true; - } - - bool Widget::set_value(LSPString *v, const char *param, const char *name, const char *value) - { - if (v == NULL) - return false; - if (strcmp(param, name)) - return false; - - v->set_utf8(value); - return true; - } - - bool Widget::link_port(ui::IPort **port, const char *id) - { - ui::IPort *oldp = *port; - ui::IPort *newp = pWrapper->port(id); - if (oldp == newp) - return true; - - if (oldp != NULL) - oldp->unbind(this); - if (newp != NULL) - newp->bind(this); - - *port = newp; - - return true; - } - - bool Widget::bind_port(ui::IPort **port, const char *param, const char *name, const char *value) - { - if (strcmp(param, name)) - return false; - if (port == NULL) - return false; - - ui::IPort *oldp = *port; - ui::IPort *newp = pWrapper->port(value); - if (oldp == newp) - return true; - - if (oldp != NULL) - oldp->unbind(this); - if (newp != NULL) - newp->bind(this); - - *port = newp; - - return true; - } - bool Widget::set_embedding(tk::Embedding *e, const char *name, const char *value) { if (e == NULL) @@ -478,16 +363,24 @@ namespace lsp status_t Widget::init() { + status_t res = ctl::DOMController::init(); + if (res != STATUS_OK) + return res; + pWrapper->add_schema_listener(this); if (wWidget != NULL) { + sActivity.init(pWrapper, wWidget->active()); sBgColor.init(pWrapper, wWidget->bg_color()); + sInactiveBgColor.init(pWrapper, wWidget->inactive_bg_color()); sBgInherit.init(pWrapper, wWidget->bg_inherit()); sPadding.init(pWrapper, wWidget->padding()); sVisibility.init(pWrapper, wWidget->visibility()); sBrightness.init(pWrapper, wWidget->brightness()); + sInactiveBrightness.init(pWrapper, wWidget->inactive_brightness()); sBgBrightness.init(pWrapper, wWidget->bg_brightness()); + sInactiveBgBrightness.init(pWrapper, wWidget->inactive_bg_brightness()); sPointer.init(pWrapper, wWidget->pointer()); } @@ -497,6 +390,8 @@ namespace lsp void Widget::set(ui::UIContext *ctx, const char *name, const char *value) { + ctl::DOMController::set(ctx, name, value); + if (wWidget != NULL) { set_param(wWidget->scaling(), "scaling", name, value); @@ -515,12 +410,17 @@ namespace lsp assign_styles(wWidget, value, false); } + sActivity.set("activity", name, value); sVisibility.set("visibility", name, value); sVisibility.set("visible", name, value); sBrightness.set("brightness", name, value); sBrightness.set("bright", name, value); + sInactiveBrightness.set("inactive.brightness", name, value); + sInactiveBrightness.set("inactive.bright", name, value); sBgBrightness.set("bg.brightness", name, value); sBgBrightness.set("bg.bright", name, value); + sInactiveBgBrightness.set("inactive.bg.brightness", name, value); + sInactiveBgBrightness.set("inactive.bg.bright", name, value); sPointer.set("pointer", name, value); sPadding.set("pad", name, value); @@ -535,26 +435,12 @@ namespace lsp if (wWidget != NULL) wWidget->bg_inherit()->set(false); } + sInactiveBgColor.set("inactive.bg", name, value); + sInactiveBgColor.set("inactive.bg.color", name, value); sBgInherit.set("bg.inherit", name, value); sBgInherit.set("ibg", name, value); } - void Widget::begin(ui::UIContext *ctx) - { - } - - void Widget::end(ui::UIContext *ctx) - { - } - - void Widget::notify(ui::IPort *port, size_t flags) - { - } - - void Widget::reloaded(const tk::StyleSheet *sheet) - { - } - void Widget::property_changed(tk::Property *prop) { } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Window.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Window.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/Window.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/Window.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 июн. 2021 г. @@ -20,6 +20,7 @@ */ #include +#include namespace lsp { @@ -90,6 +91,26 @@ namespace lsp Widget::end(ctx); } + tk::handler_id_t Window::bind_slot(const char *widget_id, tk::slot_t id, tk::event_handler_t handler) + { + tk::Widget *w = sWidgets.find(widget_id); + if (w == NULL) + { + lsp_warn("Not found widget: ui:id=%s", widget_id); + return -STATUS_NOT_FOUND; + } + + return w->slots()->bind(id, handler, self()); + } + + tk::handler_id_t Window::bind_shortcut(tk::Window *wnd, ws::code_t key, size_t mod, tk::event_handler_t handler) + { + tk::Shortcut *scut = wnd->shortcuts()->append(key, mod); + if (scut == NULL) + return -STATUS_NO_MEM; + return scut->slot()->bind(handler, self()); + } + void Window::reloaded(const tk::StyleSheet *sheet) { Widget::reloaded(sheet); @@ -98,7 +119,8 @@ namespace lsp if (wWidget != NULL) wWidget->query_resize(); } - } -} + + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/compound/ComboBox.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/compound/ComboBox.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/compound/ComboBox.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/compound/ComboBox.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -113,7 +113,6 @@ namespace lsp sInactiveBorderColor.init(pWrapper, cbox->inactive_border_color()); sInactiveBorderGapColor.init(pWrapper, cbox->inactive_border_gap_color()); - sActivity.init(pWrapper, cbox->active()); sEmptyText.init(pWrapper, cbox->empty_text()); // Bind slots @@ -162,8 +161,6 @@ namespace lsp sInactiveBorderGapColor.set("inactive.border.gap.color", name, value); sInactiveBorderGapColor.set("inactive.bgap.color", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sEmptyText.set("text.empty", name, value); set_text_fitness(cbox->text_fit(), "text.fitness", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/compound/ComboGroup.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/compound/ComboGroup.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/compound/ComboGroup.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/compound/ComboGroup.cpp 2025-08-26 18:15:48.097960860 +0000 @@ -179,7 +179,7 @@ namespace lsp ssize_t index = (sActive.valid()) ? sActive.evaluate_int() : -1; tk::Widget *w = (index >= 0) ? cgrp->widgets()->get(index) : NULL; - cgrp->active()->set(w); + cgrp->active_group()->set(w); } status_t ComboGroup::slot_combo_submit(tk::Widget *sender, void *ptr, void *data) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/Align.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/Align.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/Align.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/Align.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -144,7 +144,8 @@ namespace lsp Widget::reloaded(sheet); update_alignment(); } - } -} + + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/Overlay.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/Overlay.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/Overlay.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/Overlay.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -0,0 +1,359 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 3 апр. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +namespace lsp +{ + namespace ctl + { + //--------------------------------------------------------------------- + CTL_FACTORY_IMPL_START(Overlay) + status_t res; + + if (!name->equals_ascii("overlay")) + return STATUS_NOT_FOUND; + + tk::Overlay *w = new tk::Overlay(context->display()); + if (w == NULL) + return STATUS_NO_MEM; + if ((res = context->widgets()->add(w)) != STATUS_OK) + { + delete w; + return res; + } + + if ((res = w->init()) != STATUS_OK) + return res; + + ctl::Overlay *wc = new ctl::Overlay(context->wrapper(), w); + if (wc == NULL) + return STATUS_NO_MEM; + + *ctl = wc; + return STATUS_OK; + CTL_FACTORY_IMPL_END(Overlay) + + //----------------------------------------------------------------- + const ctl_class_t Overlay::metadata = { "Overlay", &Widget::metadata }; + + Overlay::Overlay(ui::IWrapper *wrapper, tk::Overlay *widget): + Widget(wrapper, widget) + { + pClass = &metadata; + + pPort = NULL; + fHOrigin = 0.5f; + fVOrigin = 0.5f; + fHAlign = 0.0f; + fVAlign = 0.0f; + } + + Overlay::~Overlay() + { + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov != NULL) + ov->set_position_function(NULL, NULL); + } + + status_t Overlay::init() + { + LSP_STATUS_ASSERT(Widget::init()); + + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov != NULL) + { + sTransparency.init(pWrapper, ov->transparency()); + sPriority.init(pWrapper, ov->priority()); + sAutoClose.init(pWrapper, ov->auto_close()); + sBorderRadius.init(pWrapper, ov->border_radius()); + sBorderSize.init(pWrapper, ov->border_size()); + sBorderColor.init(pWrapper, ov->border_color()); + sIPadding.init(pWrapper, ov->ipadding()); + + sHOrigin.init(pWrapper, this); + sVOrigin.init(pWrapper, this); + sHAlign.init(pWrapper, this); + sVAlign.init(pWrapper, this); + + sLayoutHAlign.init(pWrapper, this); + sLayoutVAlign.init(pWrapper, this); + sLayoutHScale.init(pWrapper, this); + sLayoutVScale.init(pWrapper, this); + + ov->set_position_function(calc_position, this); + ov->set_filter_function(filter_event, this); + ov->slots()->bind(tk::SLOT_HIDE, slot_on_hide, this); + } + + return STATUS_OK; + } + + void Overlay::set(ui::UIContext *ctx, const char *name, const char *value) + { + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov != NULL) + { + bind_port(&pPort, "id", name, value); + + sTransparency.set("transparency", name, value); + sTransparency.set("alpha", name, value); + + sPriority.set("priority", name, value); + + sAutoClose.set("auto_close", name, value); + sAutoClose.set("close.auto", name, value); + sAutoClose.set("aclose", name, value); + + sBorderRadius.set("border.radius", name, value); + sBorderRadius.set("bradius", name, value); + + sBorderSize.set("border.size", name, value); + sBorderSize.set("bsize", name, value); + + sBorderColor.set("border.color", name, value); + sBorderColor.set("bcolor", name, value); + + sIPadding.set("ipadding", name, value); + + set_expr(&sHOrigin, "origin.hpos", name, value); + set_expr(&sHOrigin, "hpos", name, value); + set_expr(&sVOrigin, "origin.vpos", name, value); + set_expr(&sVOrigin, "vpos", name, value); + set_expr(&sHAlign, "halign", name, value); + set_expr(&sVAlign, "valign", name, value); + + set_expr(&sLayoutHAlign, "layout.align", name, value); + set_expr(&sLayoutVAlign, "layout.align", name, value); + set_expr(&sLayoutHAlign, "layout.halign", name, value); + set_expr(&sLayoutVAlign, "layout.valign", name, value); + + set_expr(&sLayoutHScale, "layout.scale", name, value); + set_expr(&sLayoutVScale, "layout.scale", name, value); + set_expr(&sLayoutHScale, "layout.hscale", name, value); + set_expr(&sLayoutVScale, "layout.vscale", name, value); + + set_constraints(ov->constraints(), name, value); + + if (!strcmp(name, "trigger")) + sTriggerWID.set_utf8(value); + if (!strcmp(name, "area")) + sAreaWID.set_utf8(value); + } + + return Widget::set(ctx, name, value); + } + + void Overlay::notify(ui::IPort *port, size_t flags) + { + Widget::notify(port, flags); + + // Internal layout + if ((sLayoutHAlign.depends(port)) || + (sLayoutVAlign.depends(port)) || + (sLayoutHScale.depends(port)) || + (sLayoutVScale.depends(port))) + update_layout_alignment(); + + // Position layout + if ((sHOrigin.depends(port)) || + (sVOrigin.depends(port)) || + (sHAlign.depends(port)) || + (sVAlign.depends(port))) + update_alignment(); + + // Visibility + if (port == pPort) + { + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov != NULL) + ov->visibility()->set(pPort->value() >= 0.5f); + } + } + + status_t Overlay::add(ui::UIContext *ctx, ctl::Widget *child) + { + tk::Overlay *ov = tk::widget_cast(wWidget); + return (ov != NULL) ? ov->add(child->widget()) : STATUS_BAD_STATE; + } + + void Overlay::end(ui::UIContext *ctx) + { + update_layout_alignment(); + update_alignment(); + Widget::end(ctx); + } + + void Overlay::reloaded(const tk::StyleSheet *sheet) + { + Widget::reloaded(sheet); + update_layout_alignment(); + update_alignment(); + } + + void Overlay::update_layout_alignment() + { + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov == NULL) + return; + + if (sLayoutHAlign.valid()) + ov->layout()->set_halign(sLayoutHAlign.evaluate()); + if (sLayoutVAlign.valid()) + ov->layout()->set_valign(sLayoutVAlign.evaluate()); + if (sLayoutHScale.valid()) + ov->layout()->set_hscale(sLayoutHScale.evaluate()); + if (sLayoutVScale.valid()) + ov->layout()->set_vscale(sLayoutVScale.evaluate()); + } + + bool Overlay::update_float(float & value, ctl::Expression & expr) + { + if (!expr.valid()) + return false; + const float new_value = expr.evaluate(); + if (new_value == value) + return false; + + value = new_value; + return true; + } + + void Overlay::update_alignment() + { + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov == NULL) + return; + + size_t changes = 0; + if (update_float(fHAlign, sHAlign)) + ++changes; + if (update_float(fVAlign, sVAlign)) + ++changes; + if (update_float(fHOrigin, sHOrigin)) + ++changes; + if (update_float(fVOrigin, sVOrigin)) + ++changes; + + if (changes > 0) + ov->query_resize(); + } + + bool Overlay::calc_position(ws::rectangle_t *rect, tk::Overlay *overlay, void *data) + { + Overlay *self = static_cast(data); + return (self != NULL) ? self->calc_position(rect, overlay) : false; + } + + bool Overlay::filter_event(const ws::event_t *ev, tk::Overlay *overlay, void *data) + { + Overlay *self = static_cast(data); + return (self != NULL) ? self->filter_event(ev, overlay) : false; + } + + bool Overlay::calc_position(ws::rectangle_t *rect, tk::Overlay *ov) + { + // Get trigger and area rectangles + ws::rectangle_t trigger, area, pad_area; + if (!get_area(&trigger, &sTriggerWID)) + return false; + if (!get_area(&area, &sAreaWID)) + return false; + + // Compute origin + const float scaling = lsp_max(ov->scaling()->get(), 0.0f); + const ssize_t origin_x = trigger.nLeft + trigger.nWidth * fHOrigin; + const ssize_t origin_y = trigger.nTop + trigger.nHeight * fVOrigin; + + ov->padding()->enter(&pad_area, &area, scaling); + + // Compute position + rect->nLeft = origin_x + rect->nWidth * ((fHAlign - 1.0f) * 0.5f); + rect->nTop = origin_y + rect->nHeight * ((fVAlign - 1.0f) * 0.5f); + + // Constraint position + rect->nLeft = lsp_max(rect->nLeft, pad_area.nLeft); + rect->nTop = lsp_max(rect->nTop, pad_area.nTop); + rect->nLeft -= lsp_max((rect->nLeft + rect->nWidth) - (pad_area.nLeft + pad_area.nWidth), 0); + rect->nTop -= lsp_max((rect->nTop + rect->nHeight) - (pad_area.nTop + pad_area.nHeight), 0); + + return true; + } + + bool Overlay::filter_event(const ws::event_t *ev, tk::Overlay *overlay) + { + // Get trigger and area rectangles + ws::rectangle_t trigger; + if (!get_area(&trigger, &sTriggerWID)) + return false; + + return tk::Position::inside(&trigger, ev->nLeft, ev->nTop); + } + + bool Overlay::get_area(ws::rectangle_t *rect, const LSPString *wid) + { + // Check if widget name was passed + tk::Widget *w = NULL; + if ((wid != NULL) && (!wid->is_empty())) + w = pWrapper->controller()->widgets()->find(wid); + + // Fall-back to default widget name + if (w == NULL) + w = pWrapper->controller()->widgets()->find("plugin_window"); + if (w == NULL) + w = pWrapper->controller()->widgets()->find("plugin_content"); + + // Obtain widget size + if (w != NULL) + w->get_rectangle(rect); + + return w != NULL; + } + + status_t Overlay::slot_on_hide(tk::Widget *sender, void *ptr, void *data) + { + ctl::Overlay *self = static_cast(ptr); + if (self != NULL) + self->on_hide_overlay(); + return STATUS_OK; + } + + void Overlay::on_hide_overlay() + { + if (pPort == NULL) + return; + + tk::Overlay *ov = tk::widget_cast(wWidget); + if (ov == NULL) + return; + + // Reset related port to default value + if (ov->auto_close()->get()) + { + pPort->set_default(); + pPort->notify_all(ui::PORT_USER_EDIT); + } + } + + } /* namespace ctl */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/Tab.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/Tab.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/Tab.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/Tab.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 22 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +namespace lsp +{ + namespace ctl + { + //--------------------------------------------------------------------- + CTL_FACTORY_IMPL_START(Tab) + status_t res; + + if (!name->equals_ascii("tab")) + return STATUS_NOT_FOUND; + + tk::Tab *w = new tk::Tab(context->display()); + if (w == NULL) + return STATUS_NO_MEM; + if ((res = context->widgets()->add(w)) != STATUS_OK) + { + delete w; + return res; + } + + if ((res = w->init()) != STATUS_OK) + return res; + + ctl::Tab *wc = new ctl::Tab(context->wrapper(), w); + if (ctl == NULL) + return STATUS_NO_MEM; + + *ctl = wc; + return STATUS_OK; + CTL_FACTORY_IMPL_END(Tab) + + //----------------------------------------------------------------- + const ctl_class_t Tab::metadata = { "Tab", &Widget::metadata }; + + Tab::Tab(ui::IWrapper *wrapper, tk::Tab *tab): + Widget(wrapper, tab) + { + pClass = &metadata; + } + + Tab::~Tab() + { + } + + status_t Tab::init() + { + LSP_STATUS_ASSERT(Widget::init()); + + tk::Tab *tab = tk::widget_cast(wWidget); + if (tab != NULL) + { + sText.init(pWrapper, tab->text()); + } + + return STATUS_OK; + } + + void Tab::set(ui::UIContext *ctx, const char *name, const char *value) + { + tk::Tab *tab = tk::widget_cast(wWidget); + if (tab != NULL) + { + sText.set("text", name, value); + } + + return Widget::set(ctx, name, value); + } + + status_t Tab::add(ui::UIContext *ctx, ctl::Widget *child) + { + tk::Tab *tab = tk::widget_cast(wWidget); + return (tab != NULL) ? tab->add(child->widget()) : STATUS_BAD_STATE; + } + + } /* namespace ctl */ +} /* namespace lsp */ + + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/TabGroup.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/TabGroup.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/containers/TabGroup.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/containers/TabGroup.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -193,7 +193,7 @@ namespace lsp ssize_t index = (sActive.valid()) ? sActive.evaluate_int() : -1; tk::Widget *w = (index >= 0) ? tg->widgets()->get(index) : NULL; - tg->active()->set(w); + tg->active_tab()->set(w); } status_t TabGroup::slot_tab_submit(tk::Widget *sender, void *ptr, void *data) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/graph/Axis.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/graph/Axis.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/graph/Axis.cpp 2025-03-01 12:42:57.448644449 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/graph/Axis.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -61,7 +61,6 @@ namespace lsp pClass = &metadata; pPort = NULL; - bLogSet = false; } Axis::~Axis() @@ -79,6 +78,7 @@ namespace lsp sMin.init(pWrapper, ga->min()); sMax.init(pWrapper, ga->max()); sZero.init(pWrapper, ga->zero()); + sLogScale.init(pWrapper, ga->log_scale()); sDx.init(pWrapper, this); sDy.init(pWrapper, this); sAngle.init(pWrapper, this); @@ -112,11 +112,8 @@ namespace lsp set_param(ga->priority_group(), "priority_group", name, value); set_param(ga->priority_group(), "pgroup", name, value); - if (set_param(ga->log_scale(), "log", name, value)) - bLogSet = true; - if (set_param(ga->log_scale(), "logarithmic", name, value)) - bLogSet = true; - + sLogScale.set("log", name, value); + sLogScale.set("logarithmic", name, value); sWidth.set("width", name, value); sColor.set("color", name, value); sSmooth.set("smooth", name, value); @@ -207,7 +204,7 @@ namespace lsp ga->min()->set(mdata->min); if (!sMax.valid()) ga->max()->set(mdata->max); - if (!bLogSet) + if (!sLogScale.valid()) ga->log_scale()->set(meta::is_log_rule(mdata)); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/headless/PortLink.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/headless/PortLink.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/headless/PortLink.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/headless/PortLink.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -0,0 +1,243 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 25 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include +#include + +namespace lsp +{ + namespace ctl + { + //--------------------------------------------------------------------- + CTL_FACTORY_IMPL_START(PortLink) + if (!name->equals_ascii("ctl:link")) + return STATUS_NOT_FOUND; + + ctl::PortLink *c = new ctl::PortLink(context->wrapper()); + if (c == NULL) + return STATUS_NO_MEM; + + *ctl = c; + return STATUS_OK; + CTL_FACTORY_IMPL_END(PortLink) + + //--------------------------------------------------------------------- + PortLink::PortLink(ui::IWrapper *wrapper): + DOMController(wrapper) + { + bEnabled = false; + bChanging = false; + } + + PortLink::~PortLink() + { + // Drop all bindings + for (lltl::iterator it = vBindings.values(); it; ++it) + destroy_binding(it.get()); + + vBindings.flush(); + } + + status_t PortLink::init() + { + status_t res = DOMController::init(); + if (res != STATUS_OK) + return res; + + sActivity.init(pWrapper, this); + + return STATUS_OK; + } + + void PortLink::destroy_binding(binding_t *b) + { + if (b == NULL) + return; + + if (b->pId != NULL) + free(b->pId); + delete b; + } + + PortLink::binding_t *PortLink::get_binding(const char *id) + { + binding_t *b; + + // Lookup for matching binding + for (lltl::iterator it=vBindings.values(); it; ++it) + { + b = it.get(); + if ((b != NULL) && (strcmp(b->pId, id) == 0)) + return b; + } + + // Create and initialize new binding + b = new binding_t; + if (b == NULL) + return NULL; + lsp_finally { destroy_binding(b); }; + + b->pId = NULL; + b->pPort = NULL; + + b->pId = strdup(id); + if (b->pId == NULL) + return NULL; + b->sValue.init(pWrapper, this, this); + + // Put binding to the list + if (!vBindings.add(b)) + return NULL; + + return release_ptr(b); + } + + void PortLink::set(ui::UIContext *ctx, const char *name, const char *value) + { + if (strncmp(name, "id.", 3) == 0) + { + binding_t *b = get_binding(&name[3]); + if (b != NULL) + link_port(&b->pPort, value); + } + else if (strncmp(name, "value.", 6) == 0) + { + binding_t *b = get_binding(&name[6]); + if (b != NULL) + b->sValue.parse(value); + } + else if (strcmp(name, "activity") == 0) + sActivity.parse(value); + } + + void PortLink::end(ui::UIContext *ctx) + { + // Update activity + if (sActivity.valid()) + bEnabled = sActivity.evaluate() >= 0.5f; + + // Initialize current values + for (lltl::iterator it = vBindings.values(); it; ++it) + { + binding_t *b = it.get(); + if (b->pPort != NULL) + { + const float value = b->pPort->value(); + b->fOldValue = value; + b->fNewValue = value; + } + } + } + + void PortLink::notify(ui::IPort *port, size_t flags) + { + // Skip recursive calls. + if (bChanging) + return; + + // Update activity and skip other events if not active + if (sActivity.depends(port)) + bEnabled = sActivity.evaluate() >= 0.5f; + if ((!bEnabled) || (!(flags & ui::PORT_USER_EDIT))) + { + for (lltl::iterator it = vBindings.values(); it; ++it) + { + binding_t *b = it.get(); + if (b->pPort == port) + { + const float value = b->pPort->value(); + b->fOldValue = value; + b->fNewValue = value; + } + } + return; + } + + // Now we're ready to apply changes to all ports + bChanging = true; + lsp_finally { bChanging = false; }; + + // Compute new value for each binding depending on it's port's role + for (lltl::iterator it = vBindings.values(); it; ++it) + { + binding_t *b = it.get(); + if ((b->pPort != NULL) && (b->pPort == port)) + b->fNewValue = b->pPort->value(); + else if (b->sValue.depends(port)) + b->fNewValue = b->sValue.evaluate(); + } + + // Update port values without notification + for (lltl::iterator it = vBindings.values(); it; ++it) + { + binding_t *b = it.get(); + + if ((b->pPort != NULL) && (b->pPort != port)) + { + b->pPort->set_value(b->fNewValue); + b->fNewValue = b->pPort->value(); + lsp_trace("set %s = %f", b->pPort->id(), b->fNewValue); + } + b->fOldValue = b->fNewValue; + } + + // Notify changed ports + for (lltl::iterator it = vBindings.values(); it; ++it) + { + binding_t *b = it.get(); + if ((b->pPort != NULL) && (b->pPort != port)) + b->pPort->notify_all(flags); + } + } + + status_t PortLink::resolve(expr::value_t *value, const char *name, size_t num_indexes, const ssize_t *indexes) + { + if (num_indexes > 0) + return STATUS_NOT_FOUND; + if (strncmp(name, "_old_", 5) != 0) + return STATUS_NOT_FOUND; + + // Lookup for previous values + name += 5; + for (lltl::iterator it = vBindings.values(); it; ++it) + { + binding_t *b = it.get(); + if ((b->pId != NULL) && (strcmp(b->pId, name) == 0)) + { + expr::set_value_float(value, b->fOldValue); + lsp_trace("resolve _old_%s -> %f", b->pId, b->fOldValue); + return STATUS_OK; + } + } + + return STATUS_NOT_FOUND; + } + + status_t PortLink::resolve(expr::value_t *value, const LSPString *name, size_t num_indexes, const ssize_t *indexes) + { + return resolve(value, name->get_utf8(), num_indexes, indexes); + } + + } /* namespace ctl */ +} /* namespace lsp */ + + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Bevel.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Bevel.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Bevel.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Bevel.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 14 июн. 2021 г. @@ -72,7 +72,7 @@ namespace lsp if (bv != NULL) { sColor.init(pWrapper, bv->color()); - sBorderColor.init(pWrapper, bv->bg_color()); + sBorderColor.init(pWrapper, bv->border_color()); sDirection.init(pWrapper, bv->direction()); sBorder.init(pWrapper, bv->border()); } @@ -99,8 +99,9 @@ namespace lsp return Widget::set(ctx, name, value); } - } -} + + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Button.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Button.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Button.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Button.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -107,9 +107,9 @@ namespace lsp sHoleColor.init(pWrapper, btn->hole_color()); sEditable.init(pWrapper, btn->editable()); - sActivity.init(pWrapper, btn->active()); sTextPad.init(pWrapper, btn->text_padding()); sText.init(pWrapper, btn->text()); + sTextClip.init(pWrapper, btn->text_clip()); // Bind slots btn->slots()->bind(tk::SLOT_CHANGE, slot_change, this); @@ -176,14 +176,13 @@ namespace lsp sHoleColor.set("hole.color", name, value); sEditable.set("editable", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sTextPad.set("text.padding", name, value); sTextPad.set("text.pad", name, value); sTextPad.set("tpadding", name, value); sTextPad.set("tpad", name, value); sHover.set("hover", name, value); sText.set("text", name, value); + sTextClip.set("text.clip", name, value); set_font(btn->font(), "font", name, value); set_constraints(btn->constraints(), name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/CheckBox.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/CheckBox.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/CheckBox.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/CheckBox.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -83,7 +83,6 @@ namespace lsp sCheckRadius.init(pWrapper, ck->check_radius()); sCheckGapSize.init(pWrapper, ck->check_gap_size()); sCheckMinSize.init(pWrapper, ck->check_min_size()); - sActivity.init(pWrapper, ck->active()); sColor.init(pWrapper, ck->color()); sFillColor.init(pWrapper, ck->fill_color()); @@ -127,8 +126,6 @@ namespace lsp sCheckGapSize.set("check.gap.size", name, value); sCheckGapSize.set("cgap.size", name, value); sCheckMinSize.set("check.min.size", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sColor.set("color", name, value); sFillColor.set("fill.color", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Edit.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Edit.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Edit.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Edit.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -97,7 +97,6 @@ namespace lsp inject_style(ed, INPUT_STYLE_VALID); sEmptyText.init(pWrapper, ed->empty_text()); - sActivity.init(pWrapper, ed->active()); sColor.init(pWrapper, ed->color()); sBorderColor.init(pWrapper, ed->border_color()); @@ -135,8 +134,6 @@ namespace lsp sEmptyText.set("text.empty", name, value); sEmptyText.set("etext", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sColor.set("color", name, value); sBorderColor.set("border.color", name, value); @@ -213,11 +210,14 @@ namespace lsp if (meta::is_path_port(meta)) { const char *path = value.get_utf8(); - const size_t length = strlen(path); - if ((path != NULL) && (length < PATH_MAX)) + if (path != NULL) { - pPort->write(path, length); - pPort->notify_all(ui::PORT_USER_EDIT); + const size_t length = strlen(path); + if (length < PATH_MAX) + { + pPort->write(path, length); + pPort->notify_all(ui::PORT_USER_EDIT); + } } } else if (meta::is_string_port(meta)) @@ -242,16 +242,16 @@ namespace lsp void Edit::commit_value() { + sTimer.cancel(); if (pPort == NULL) return; - sTimer.cancel(); const meta::port_t *meta = pPort->metadata(); if (meta == NULL) return; tk::Edit *ed = tk::widget_cast(wWidget); - if ((ed == NULL) || (pPort == NULL)) + if (ed == NULL) return; // Do the stuff depending on the metadata diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Fader.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Fader.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Fader.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Fader.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -95,8 +95,6 @@ namespace lsp sInactiveScaleBorderColor.init(pWrapper, fdr->inactive_scale_border_color()); sInactiveBalanceColor.init(pWrapper, fdr->inactive_balance_color()); - sActivity.init(pWrapper, fdr->active()); - sMin.init(pWrapper, this); sMax.init(pWrapper, this); @@ -139,9 +137,6 @@ namespace lsp sInactiveBalanceColor.set("inactive.balance.color", name, value); sInactiveBalanceColor.set("inactive.bcolor", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); - if (!strcmp(name, "min")) { sMin.parse(value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Hyperlink.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Hyperlink.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Hyperlink.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Hyperlink.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 12 июн. 2021 г. @@ -75,6 +75,8 @@ namespace lsp sUrl.init(pWrapper, lnk->url()); sColor.init(pWrapper, lnk->color()); sHoverColor.init(pWrapper, lnk->hover_color()); + sInactiveColor.init(pWrapper, lnk->inactive_color()); + sInactiveHoverColor.init(pWrapper, lnk->inactive_hover_color()); } return STATUS_OK; @@ -90,6 +92,9 @@ namespace lsp sColor.set("color", name, value); sHoverColor.set("hover.color", name, value); sHoverColor.set("hcolor", name, value); + sInactiveColor.set("inactive.color", name, value); + sInactiveHoverColor.set("inactive.hover.color", name, value); + sInactiveHoverColor.set("inactive.hcolor", name, value); set_constraints(lnk->constraints(), name, value); set_font(lnk->font(), "font", name, value); @@ -101,7 +106,8 @@ namespace lsp return Widget::set(ctx, name, value); } - } -} + + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Indicator.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Indicator.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Indicator.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Indicator.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -106,7 +106,6 @@ namespace lsp sInactiveColor.init(pWrapper, ind->inactive_color()); sInactiveTextColor.init(pWrapper, ind->inactive_text_color()); - sActivity.init(pWrapper, ind->active()); sIPadding.init(pWrapper, ind->ipadding()); parse_format(); @@ -131,8 +130,6 @@ namespace lsp sInactiveTextColor.set("inactive.text.color", name, value); sInactiveTextColor.set("inactive.tcolor", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sIPadding.set("ipadding", name, value); sIPadding.set("ipad", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Knob.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Knob.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Knob.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Knob.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -103,7 +103,6 @@ namespace lsp sMeterVisible.init(pWrapper, knob->meter_active()); sEditable.init(pWrapper, knob->editable()); - sActivity.init(pWrapper, knob->editable()); sMin.init(pWrapper, this); sMax.init(pWrapper, this); @@ -168,8 +167,6 @@ namespace lsp sMeterVisible.set("mvisibility", name, value); sEditable.set("editable", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); if (!strcmp(name, "min")) { diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Label.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Label.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Label.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Label.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 6 мая 2021 г. @@ -19,6 +19,7 @@ * along with lsp-plugin-fw. If not, see . */ +#include #include #include @@ -188,7 +189,11 @@ namespace lsp { sColor.init(pWrapper, lbl->color()); sHoverColor.init(pWrapper, lbl->hover_color()); + sInactiveColor.init(pWrapper, lbl->inactive_color()); + sInactiveHoverColor.init(pWrapper, lbl->inactive_hover_color()); + sText.init(pWrapper, lbl->text()); + sTextClip.init(pWrapper, lbl->text_clip()); sIPadding.init(pWrapper, lbl->ipadding()); lbl->slot(tk::SLOT_MOUSE_DBL_CLICK)->bind(slot_dbl_click, this); @@ -354,6 +359,7 @@ namespace lsp bind_port(&pPort, "id", name, value); set_text_layout(lbl->text_layout(), name, value); + set_text_layout(lbl->clip_text_layout(), "text.clip", name, value); set_font(lbl->font(), "font", name, value); set_constraints(lbl->constraints(), name, value); set_param(lbl->text_adjust(), "text.adjust", name, value); @@ -377,8 +383,12 @@ namespace lsp sColor.set("color", name, value); sHoverColor.set("hover.color", name, value); sHoverColor.set("hcolor", name, value); + sInactiveColor.set("inactive.color", name, value); + sInactiveHoverColor.set("inactive.hover.color", name, value); + sInactiveHoverColor.set("inactive.hcolor", name, value); sIPadding.set("ipadding", name, value); sIPadding.set("ipad", name, value); + sTextClip.set("text.clip", name, value); } Widget::set(ctx, name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Led.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Led.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/Led.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/Led.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -87,8 +87,6 @@ namespace lsp sHoleColor.init(pWrapper, led->hole_color()); - sActivity.init(pWrapper, led->active()); - sLight.init(pWrapper, this); } @@ -125,8 +123,6 @@ namespace lsp sHoleColor.set("hole.color", name, value); sHoleColor.set("hcolor", name, value); - sActivity.set("active", name, value); - sActivity.set("activity", name, value); set_expr(&sLight, "light", name, value); set_constraints(led->constraints(), name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/ProgressBar.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/ProgressBar.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/simple/ProgressBar.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/simple/ProgressBar.cpp 2025-08-26 18:15:48.101960821 +0000 @@ -95,7 +95,6 @@ namespace lsp sBorderRadius.init(pWrapper, pb->border_radius()); sText.init(pWrapper, pb->text()); - sActivity.init(pWrapper, pb->active()); sShowText.init(pWrapper, pb->show_text()); sValue.init(pWrapper, this); @@ -145,8 +144,6 @@ namespace lsp sText.set("text", name, value); sShowText.set("text.visibility", name, value); sShowText.set("tvisibility", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sBorderSize.set("border.size", name, value); sBorderSize.set("bsize", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioEnvelope.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioEnvelope.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioEnvelope.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioEnvelope.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -0,0 +1,407 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugins + * Created on: 9 июн. 2025 г. + * + * lsp-plugins is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugins 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugins. If not, see . + */ + +#include +#include + +namespace lsp +{ + namespace ctl + { + //--------------------------------------------------------------------- + CTL_FACTORY_IMPL_START(AudioEnvelope) + status_t res; + + if (!name->equals_ascii("aenvelope")) + return STATUS_NOT_FOUND; + + tk::AudioEnvelope *w = new tk::AudioEnvelope(context->display()); + if (w == NULL) + return STATUS_NO_MEM; + if ((res = context->widgets()->add(w)) != STATUS_OK) + { + delete w; + return res; + } + + if ((res = w->init()) != STATUS_OK) + return res; + + ctl::AudioEnvelope *wc = new ctl::AudioEnvelope(context->wrapper(), w); + if (ctl == NULL) + return STATUS_NO_MEM; + + *ctl = wc; + return STATUS_OK; + CTL_FACTORY_IMPL_END(AudioEnvelope) + + //----------------------------------------------------------------- + const ctl_class_t AudioEnvelope::metadata = { "AudioEnvelope", &Widget::metadata }; + + AudioEnvelope::AudioEnvelope(ui::IWrapper *wrapper, tk::AudioEnvelope *widget): ctl::Widget(wrapper, widget) + { + pClass = &metadata; + + for (size_t i=0; ipPort = NULL; + p->pValue = NULL; + p->fOldValue = 0.0f; + p->fNewValue = 0.0f; + } + + vTypes[i] = NULL; + } + + bCommitting = false; + bSubmitting = false; + } + + AudioEnvelope::~AudioEnvelope() + { + } + + status_t AudioEnvelope::init() + { + LSP_STATUS_ASSERT(Widget::init()); + + tk::AudioEnvelope *ae = tk::widget_cast(wWidget); + if (ae != NULL) + { + vPoints[P_ATTACK][R_TIME].pValue = ae->attack_time(); + vPoints[P_ATTACK][R_CURVE].pValue = ae->attack_curvature(); + vPoints[P_HOLD][R_TIME].pValue = ae->hold_time(); + vPoints[P_DECAY][R_TIME].pValue = ae->decay_time(); + vPoints[P_DECAY][R_CURVE].pValue = ae->decay_curvature(); + vPoints[P_BREAK][R_LEVEL].pValue = ae->break_level(); + vPoints[P_SLOPE][R_TIME].pValue = ae->slope_time(); + vPoints[P_SLOPE][R_CURVE].pValue = ae->slope_curvature(); + vPoints[P_SUSTAIN][R_LEVEL].pValue = ae->sustain_level(); + vPoints[P_RELEASE][R_TIME].pValue = ae->release_time(); + vPoints[P_RELEASE][R_CURVE].pValue = ae->release_curvature(); + + sHoldEnabled.init(pWrapper, ae->hold_enabled()); + sBreakEnabled.init(pWrapper, ae->break_enabled()); + sQuadPoint.init(pWrapper, ae->quad_point()); + sFill.init(pWrapper, ae->fill()); + sWire.init(pWrapper, ae->wire()); + sEditable.init(pWrapper, ae->editable()); + sLineWidth.init(pWrapper, ae->line_width()); + sLineColor.init(pWrapper, ae->line_color()); + sFillColor.init(pWrapper, ae->fill_color()); + sPointSize.init(pWrapper, ae->point_size()); + sPointColor.init(pWrapper, ae->point_color()); + sPointHoverColor.init(pWrapper, ae->point_hover_color()); + sColor.init(pWrapper, ae->color()); + sBorderFlat.init(pWrapper, ae->border_flat()); + sGlass.init(pWrapper, ae->glass()); + sGlassColor.init(pWrapper, ae->glass_color()); + sIPadding.init(pWrapper, ae->ipadding()); + sBorderColor.init(pWrapper, ae->border_color()); + + ae->slots()->bind(tk::SLOT_CHANGE, slot_change, this); + ae->set_curve_function(curve_function, this); + } + + return STATUS_OK; + } + + void AudioEnvelope::destroy() + { + ctl::Widget::destroy(); + } + + void AudioEnvelope::set(ui::UIContext *ctx, const char *name, const char *value) + { + tk::AudioEnvelope *ae = tk::widget_cast(wWidget); + if (ae != NULL) + { + bind_port(&vPoints[P_ATTACK][R_TIME].pPort, "attack.time.id", name, value); + bind_port(&vPoints[P_ATTACK][R_CURVE].pPort, "attack.curve.id", name, value); + bind_port(&vPoints[P_HOLD][R_TIME].pPort, "hold.time.id", name, value); + bind_port(&vPoints[P_DECAY][R_TIME].pPort, "decay.time.id", name, value); + bind_port(&vPoints[P_DECAY][R_CURVE].pPort, "decay.curve.id", name, value); + bind_port(&vPoints[P_BREAK][R_LEVEL].pPort, "break.level.id", name, value); + bind_port(&vPoints[P_SLOPE][R_TIME].pPort, "slope.time.id", name, value); + bind_port(&vPoints[P_SLOPE][R_CURVE].pPort, "slope.curve.id", name, value); + bind_port(&vPoints[P_SUSTAIN][R_LEVEL].pPort, "sustain.level.id", name, value); + bind_port(&vPoints[P_RELEASE][R_TIME].pPort, "release.time.id", name, value); + bind_port(&vPoints[P_RELEASE][R_CURVE].pPort, "release.curve.id", name, value); + + bind_port(&vTypes[P_ATTACK], "attack.type.id", name, value); + bind_port(&vTypes[P_DECAY], "decay.type.id", name, value); + bind_port(&vTypes[P_SLOPE], "slope.type.id", name, value); + bind_port(&vTypes[P_RELEASE], "release.type.id", name, value); + + sHoldEnabled.set("hold.enabled", name, value); + sBreakEnabled.set("break.enabled", name, value); + sQuadPoint.set("point.quad", name, value); + sFill.set("fill", name, value); + sWire.set("wire", name, value); + sEditable.set("editable", name, value); + sLineWidth.set("line.width", name, value); + sLineColor.set("line.color", name, value); + sFillColor.set("fill.color", name, value); + sPointSize.set("point.size", name, value); + sPointColor.set("point.color", name, value); + sPointHoverColor.set("point.hover.color", name, value); + sColor.set("color", name, value); + sBorderFlat.set("border.flat", name, value); + sGlass.set("glass", name, value); + sGlassColor.set("glass.color", name, value); + sBorderColor.set("border.color", name, value); + + set_constraints(ae->constraints(), name, value); + } + + return ctl::Widget::set(ctx, name, value); + } + + float AudioEnvelope::get_normalized(ui::IPort *port) + { + if (port == NULL) + return 0.0f; + + const meta::port_t *meta = port->metadata(); + if (meta == NULL) + return 0.0f; + + if ((meta->flags & (meta::F_UPPER | meta::F_LOWER)) != (meta::F_UPPER | meta::F_LOWER)) + return 0.0f; + + const float value = port->value(); + return (value - meta->min) / (meta->max - meta->min); + } + + void AudioEnvelope::set_normalized(ui::IPort *port, float value) + { + if (port == NULL) + return; + + const meta::port_t *meta = port->metadata(); + if (meta == NULL) + return; + + if ((meta->flags & (meta::F_UPPER | meta::F_LOWER)) != (meta::F_UPPER | meta::F_LOWER)) + return; + + port->set_value(meta->min + value * (meta->max - meta->min)); + } + + void AudioEnvelope::end(ui::UIContext *ctx) + { + // Synchronize port values + for (size_t i=0; ipPort == NULL) || (p->pValue == NULL)) + continue; + + const float value = get_normalized(p->pPort); + p->fOldValue = value; + p->fNewValue = value; + } + + // Align time points + arrange_time_values(); + commit_values(); + + ctl::Widget::end(ctx); + } + + void AudioEnvelope::arrange_time_values() + { + point_t *prev = NULL; + for (size_t i=0; ipPort == NULL) + continue; + + p->fNewValue = lsp_limit(p->fNewValue, 0.0f, 1.0f); + if ((prev != NULL) && (p->fNewValue < prev->fNewValue)) + p->fNewValue = prev->fNewValue; + + prev = p; + } + } + + void AudioEnvelope::commit_values() + { + // Avoid recursive calls + if (bCommitting) + return; + bCommitting = true; + lsp_finally { bCommitting = false; }; + + // Update values on the widget + for (size_t i=0; ipPort == NULL) || (p->pValue == NULL)) + continue; + + if (p->fNewValue != p->pValue->get()) + p->pValue->set(p->fNewValue); + } + } + + void AudioEnvelope::sync_time_values(point_t *actor) + { + for (size_t i=0; ipPort == NULL) + continue; + + if ((dst < actor) && (dst->fNewValue > actor->fNewValue)) + dst->fNewValue = actor->fNewValue; + else if ((dst > actor) && (dst->fNewValue < actor->fNewValue)) + dst->fNewValue = actor->fNewValue; + } + } + + void AudioEnvelope::notify(ui::IPort *port, size_t flags) + { + // Update state of points + for (size_t i=0; ipPort != port) || (p->pValue == NULL)) + continue; + + p->fNewValue = get_normalized(p->pPort); + if (j == R_TIME) + sync_time_values(p); + } + + // Query curve redraw if curve segment type port has changed + if ((vTypes[i] != NULL) && (vTypes[i] == port)) + wWidget->query_draw(); + } + + // Commit changes for points + commit_values(); + submit_ports(); + } + + void AudioEnvelope::submit_ports() + { + // Avoid recursive calls + if (bSubmitting) + return; + bSubmitting = true; + lsp_finally { bSubmitting = false; }; + + // Update port values + for (size_t i=0; ipPort == NULL) || (p->pValue == NULL)) + continue; + + p->fNewValue = p->pValue->get(); + if (p->fNewValue != p->fOldValue) + set_normalized(p->pPort, p->fNewValue); + } + + // Commit new values and notify about changes + for (size_t i=0; ipPort == NULL) || (p->pValue == NULL)) + continue; + + if (p->fNewValue != p->fOldValue) + { + const float value = get_normalized(p->pPort); + p->fNewValue = value; + p->fOldValue = value; + + p->pPort->notify_all(ui::PORT_USER_EDIT); + } + } + } + + size_t AudioEnvelope::get_function(points_t point) + { + ui::IPort *port = vTypes[point]; + return (port != NULL) ? port->value() : dspu::ADSREnvelope::ADSR_NONE; + } + + void AudioEnvelope::curve_function(float *y, const float *x, size_t count, const tk::AudioEnvelope *sender, void *data) + { + if (sender == NULL) + return; + + AudioEnvelope *self = static_cast(data); + if (self == NULL) + return; + + dspu::ADSREnvelope e; + + e.set_attack( + sender->attack_time()->get(), + sender->attack_curvature()->get(), + dspu::ADSREnvelope::function_t(self->get_function(P_ATTACK))); + e.set_hold( + sender->hold_time()->get(), + sender->hold_enabled()->get()); + e.set_decay( + sender->decay_time()->get(), + sender->decay_curvature()->get(), + dspu::ADSREnvelope::function_t(self->get_function(P_DECAY))); + e.set_break( + sender->break_level()->get(), + sender->break_enabled()->get()); + e.set_slope( + sender->slope_time()->get(), + sender->slope_curvature()->get(), + dspu::ADSREnvelope::function_t(self->get_function(P_SLOPE))); + e.set_sustain_level(sender->sustain_level()->get()); + e.set_release( + sender->release_time()->get(), + sender->release_curvature()->get(), + dspu::ADSREnvelope::function_t(self->get_function(P_RELEASE))); + + e.process(y, x, count); + } + + status_t AudioEnvelope::slot_change(tk::Widget *sender, void *ptr, void *data) + { + ctl::AudioEnvelope *self = static_cast(ptr); + if (self != NULL) + self->submit_ports(); + return STATUS_OK; + } + + } /* namespace ctl */ +} /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFilePreview.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFilePreview.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFilePreview.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFilePreview.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2022 Linux Studio Plugins Project - * (C) 2022 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 16 дек. 2022 г. @@ -263,7 +263,7 @@ namespace lsp set_localized("sample_format", sfmt_key.get_utf8()); set_localized("duration", lc_key, &tparams); - // Check the auyo-play option and trigger DSP backend for the file playback + // Check the auto-play option and trigger DSP backend for the file playback ui::IPort *p = pWrapper->port(UI_PREVIEW_AUTO_PLAY_PORT); nPlayPosition = 0; nFileLength = info.frames; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFolder.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFolder.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFolder.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioFolder.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -68,10 +68,11 @@ namespace lsp pClass = &metadata; pPort = NULL; - pAutoload = NULL; wActive = NULL; bActive = false; + bAutoLoad = false; + bAutoPlay = false; } AudioFolder::~AudioFolder() @@ -87,13 +88,16 @@ namespace lsp { sHScroll.init(pWrapper, lbox->hscroll_mode()); sVScroll.init(pWrapper, lbox->vscroll_mode()); + sAutoLoad.init(pWrapper, this); + sAutoPlay.init(pWrapper, this); // Bind slots lbox->slots()->bind(tk::SLOT_SUBMIT, slot_submit, this); lbox->slots()->bind(tk::SLOT_CHANGE, slot_change, this); - } - link_port(&pAutoload, UI_FILELIST_NAVIGAION_AUTOLOAD_PORT); + sAutoLoad.parse(":" UI_FILELIST_NAVIGATION_AUTOLOAD_PORT); + sAutoPlay.parse(":" UI_FILELIST_NAVIGATION_AUTOPLAY_PORT); + } return STATUS_OK; } @@ -104,7 +108,6 @@ namespace lsp if (lbox != NULL) { bind_port(&pPort, "id", name, value); - bind_port(&pAutoload, "autoload_id", name, value); set_param(lbox->border_size(), "border.size", name, value); set_param(lbox->border_size(), "bsize", name, value); @@ -113,6 +116,9 @@ namespace lsp set_param(lbox->border_radius(), "border.radius", name, value); set_param(lbox->border_radius(), "bradius", name, value); + set_expr(&sAutoLoad, "autoload", name, value); + set_expr(&sAutoPlay, "autoplay", name, value); + sHScroll.set(name, "hscroll", value); sVScroll.set(name, "vscroll", value); @@ -129,6 +135,8 @@ namespace lsp { update_styles(); sync_state(); + sync_auto_load(); + sync_auto_play(); Widget::end(ctx); } @@ -176,6 +184,16 @@ namespace lsp return true; } + void AudioFolder::sync_auto_play() + { + bAutoPlay = (sAutoPlay.valid()) ? sAutoPlay.evaluate() >= 0.5f : false; + } + + void AudioFolder::sync_auto_load() + { + bAutoLoad = (sAutoLoad.valid()) ? sAutoLoad.evaluate() >= 0.5f : false; + } + void AudioFolder::sync_state() { tk::ListBox *lbox = tk::widget_cast(wWidget); @@ -284,14 +302,25 @@ namespace lsp return; // Apply changes - pPort->write(buf, strlen(buf)); - pPort->notify_all(ui::PORT_USER_EDIT); + pWrapper->play_file(NULL, 0, false); + if (bAutoPlay) + pWrapper->play_file(buf, 0, true); + + if (bAutoLoad) + { + pPort->write(buf, strlen(buf)); + pPort->notify_all(ui::PORT_USER_EDIT); + } } void AudioFolder::notify(ui::IPort *port, size_t flags) { if ((pPort != NULL) && (port == pPort)) sync_state(); + if (sAutoLoad.depends(port)) + sync_auto_load(); + if (sAutoPlay.depends(port)) + sync_auto_play(); } status_t AudioFolder::slot_submit(tk::Widget *sender, void *ptr, void *data) @@ -300,7 +329,7 @@ namespace lsp if (self == NULL) return STATUS_OK; - if ((self->pAutoload == NULL) || (self->pAutoload->value() < 0.5f)) + if ((self->bAutoLoad) || (self->bAutoPlay)) self->apply_action(); return STATUS_OK; } @@ -311,7 +340,7 @@ namespace lsp if (self == NULL) return STATUS_OK; - if ((self->pAutoload != NULL) && (self->pAutoload->value() >= 0.5f)) + if ((self->bAutoLoad) || (self->bAutoPlay)) self->apply_action(); return STATUS_OK; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioNavigator.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioNavigator.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioNavigator.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioNavigator.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -69,6 +69,7 @@ namespace lsp pPort = NULL; bActive = false; + bAutoPlay = false; enAction = A_NEXT; } @@ -94,9 +95,13 @@ namespace lsp sEditable.init(pWrapper, btn->editable()); sTextPad.init(pWrapper, btn->text_padding()); sText.init(pWrapper, btn->text()); + sAutoPlay.init(pWrapper, this); // Bind slots btn->slots()->bind(tk::SLOT_CHANGE, slot_change, this); + + // Set default auto-play flag + sAutoPlay.parse(":" UI_FILELIST_NAVIGATION_AUTOPLAY_PORT); } return STATUS_OK; @@ -171,6 +176,7 @@ namespace lsp sTextPad.set("tpad", name, value); sHover.set("hover", name, value); sText.set("text", name, value); + set_expr(&sAutoPlay, "autoplay", name, value); set_font(btn->font(), "font", name, value); set_constraints(btn->constraints(), name, value); @@ -237,8 +243,14 @@ namespace lsp set_activity(sDirController.valid()); } + void AudioNavigator::sync_auto_play() + { + bAutoPlay = (sAutoPlay.valid()) ? sAutoPlay.evaluate() >= 0.5f : false; + } + void AudioNavigator::end(ui::UIContext *ctx) { + sync_auto_play(); update_styles(); sync_state(); Widget::end(ctx); @@ -301,7 +313,10 @@ namespace lsp if (buf == NULL) return; + pWrapper->play_file(NULL, 0, false); pPort->write(buf, strlen(buf)); + if (bAutoPlay) + pWrapper->play_file(buf, 0, true); } else pPort->write("", 0); @@ -312,6 +327,8 @@ namespace lsp { if ((pPort != NULL) && (port == pPort)) sync_state(); + if (sAutoPlay.depends(port)) + sync_auto_play(); } status_t AudioNavigator::slot_change(tk::Widget *sender, void *ptr, void *data) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioSample.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioSample.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/AudioSample.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/AudioSample.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 20 июл. 2021 г. @@ -188,7 +188,6 @@ namespace lsp pMenu = NULL; pDataSink = NULL; pDragInSink = NULL; - bFullSample = false; bLoadPreview = false; } @@ -287,6 +286,7 @@ namespace lsp sPlayPosition.init(pWrapper, this); sLength.init(pWrapper, this); sActualLength.init(pWrapper, this); + sFullSample.init(pWrapper, this); sColor.init(pWrapper, as->color()); sBorderColor.init(pWrapper, as->border_color()); @@ -436,6 +436,7 @@ namespace lsp set_expr(&sPlayPosition, "play.position", name, value); set_expr(&sLength, "length", name, value); set_expr(&sActualLength, "length.actual", name, value); + set_expr(&sFullSample, "sample.full", name, value); sWaveBorder.set("wave.border", name, value); sWaveBorder.set("wborder", name, value); @@ -458,7 +459,6 @@ namespace lsp sIPadding.set("ipadding", name, value); - set_value(&bFullSample, "sample.full", name, value); set_value(&bLoadPreview, "load.preview", name, value); set_constraints(as->constraints(), name, value); set_text_layout(as->main_text_layout(), "text.layout.main", name, value); @@ -558,6 +558,19 @@ namespace lsp Widget::end(ctx); } + status_t AudioSample::add(ui::UIContext *ctx, ctl::Widget *child) + { + tk::AudioSample *as = tk::widget_cast(wWidget); + if (as == NULL) + return STATUS_BAD_STATE; + + ctl::AudioEnvelope *ae = ctl::ctl_cast(child); + if (ae != NULL) + return as->add(ae->widget()); + + return STATUS_INVALID_VALUE; + } + void AudioSample::notify(ui::IPort *port, size_t flags) { Widget::notify(port, flags); @@ -584,7 +597,8 @@ namespace lsp (sHeadCut.depends(port)) || (sTailCut.depends(port)) || (sLength.depends(port)) || - (sActualLength.depends(port))) + (sActualLength.depends(port)) || + (sFullSample.depends(port))) { sync_labels(); sync_markers(); @@ -721,11 +735,12 @@ namespace lsp float fade_in = 0.0f, fade_out = 0.0f; float s_begin = -1.0f, s_end = -1.0f; float l_begin = -1.0f, l_end = -1.0f; - float pp = sPlayPosition.evaluate_float(-1.0f); - bool s_on = sStretch.evaluate_bool(false); - bool l_on = sLoop.evaluate_bool(false); + float pp = sPlayPosition.evaluate_float(-1.0f); + const bool s_on = sStretch.evaluate_bool(false); + const bool l_on = sLoop.evaluate_bool(false); + const bool full_sample = sFullSample.evaluate_bool(false); - if (bFullSample) + if (full_sample) { length = sLength.evaluate_float(); act_length = (sActualLength.valid()) ? sActualLength.evaluate_float() : sLength.evaluate_float(); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/FileButton.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/FileButton.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/FileButton.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/FileButton.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -189,7 +189,6 @@ namespace lsp sProgress.init(pWrapper, this); sTextPadding.init(pWrapper, fb->text_padding()); sGradient.init(pWrapper, fb->gradient()); - sActivity.init(pWrapper, fb->active()); sBorderSize.init(pWrapper, fb->border_size()); sBorderPressedSize.init(pWrapper, fb->border_pressed_size()); @@ -250,8 +249,6 @@ namespace lsp sTextPadding.set("text.pad", name, value); sTextPadding.set("tpad", name, value); sGradient.set("gradient", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sBorderSize.set("border.size", name, value); sBorderSize.set("bsize", name, value); sBorderPressedSize.set("border.pressed.size", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/Fraction.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/Fraction.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/Fraction.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/Fraction.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -87,7 +87,6 @@ namespace lsp sAngle.init(pWrapper, fr->angle()); sTextPad.init(pWrapper, fr->text_pad()); sThick.init(pWrapper, fr->thickness()); - sActivity.init(pWrapper, fr->active()); sColor.init(pWrapper, fr->color()); sNumColor.init(pWrapper, fr->num_color()); @@ -125,8 +124,6 @@ namespace lsp sTextPad.set("tpad", name, value); sThick.set("thickness", name, value); sThick.set("thick", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sColor.set("color", name, value); sNumColor.set("numerator.color", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/LedChannel.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/LedChannel.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/LedChannel.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/LedChannel.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -93,7 +93,6 @@ namespace lsp tk::LedMeterChannel *lmc = tk::widget_cast(wWidget); if (lmc != NULL) { - sActivity.init(pWrapper, lmc->active()); sReversive.init(pWrapper, lmc->reversive()); sPeakVisible.init(pWrapper, lmc->peak_visible()); sBalanceVisible.init(pWrapper, lmc->balance_visible()); @@ -138,8 +137,6 @@ namespace lsp { bind_port(&pPort, "id", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sReversive.set("reversive", name, value); sPeakVisible.set("peak.visibility", name, value); sBalanceVisible.set("balance.visibility", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/MidiNote.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/MidiNote.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/specific/MidiNote.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/specific/MidiNote.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -185,7 +185,6 @@ namespace lsp sInactiveColor.init(pWrapper, ind->inactive_color()); sInactiveTextColor.init(pWrapper, ind->inactive_text_color()); - sActivity.init(pWrapper, ind->active()); sIPadding.init(pWrapper, ind->ipadding()); ind->slot(tk::SLOT_MOUSE_DBL_CLICK)->bind(slot_dbl_click, this); @@ -221,8 +220,6 @@ namespace lsp sInactiveTextColor.set("inactive.text.color", name, value); sInactiveTextColor.set("inactive.tcolor", name, value); - sActivity.set("activity", name, value); - sActivity.set("active", name, value); sIPadding.set("ipadding", name, value); sIPadding.set("ipad", name, value); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Boolean.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Boolean.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Boolean.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Boolean.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 апр. 2021 г. @@ -36,7 +36,7 @@ namespace lsp pWrapper->remove_schema_listener(this); } - void Boolean::on_updated(ui::IPort *port) + void Boolean::on_updated(ui::IPort *port, size_t flags) { apply_changes(); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Enum.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Enum.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Enum.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Enum.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 авг. 2021 г. @@ -36,7 +36,7 @@ namespace lsp pWrapper->remove_schema_listener(this); } - void Enum::on_updated(ui::IPort *port) + void Enum::on_updated(ui::IPort *port, size_t flags) { apply_changes(); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Expression.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Expression.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Expression.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Expression.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -35,16 +35,16 @@ namespace lsp pListener = NULL; } - void Expression::init(ui::IWrapper *wrapper, ui::IPortListener *listener) + void Expression::init(ui::IWrapper *wrapper, ui::IPortListener *listener, expr::Resolver *resolver) { - Property::init(wrapper); + Property::init(wrapper, resolver); pListener = listener; } - void Expression::on_updated(ui::IPort *port) + void Expression::on_updated(ui::IPort *port, size_t flags) { if (pListener != NULL) - pListener->notify(port, ui::PORT_NONE); + pListener->notify(port, flags); } float Expression::evaluate_float(float dfl) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Float.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Float.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Float.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Float.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 апр. 2021 г. @@ -36,7 +36,7 @@ namespace lsp pWrapper->remove_schema_listener(this); } - void Float::on_updated(ui::IPort *port) + void Float::on_updated(ui::IPort *port, size_t flags) { apply_changes(); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Integer.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Integer.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Integer.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Integer.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 26 апр. 2021 г. @@ -36,7 +36,7 @@ namespace lsp pWrapper->remove_schema_listener(this); } - void Integer::on_updated(ui::IPort *port) + void Integer::on_updated(ui::IPort *port, size_t flags) { apply_changes(); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/LCString.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/LCString.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/LCString.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/LCString.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 23 мая 2021 г. @@ -264,6 +264,7 @@ namespace lsp params->set_cstring("meta_plugin_vst3ui_uid", meta::uid_meta_to_vst3(vst3_uid, plugin->uids.vst3ui)); params->set_cstring("meta_plugin_format", meta::plugin_format_name(pWrapper->plugin_format())); + params->set_cstring("meta_ui_graphics_library", pWrapper->graphics_backend()); tmp.fmt_utf8("%d.%d.%d", int(LSP_MODULE_VERSION_MAJOR(plugin->version)), diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Property.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Property.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ctl/util/Property.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ctl/util/Property.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -40,6 +40,8 @@ namespace lsp status_t res = pProp->sParams.resolve(value, name, num_indexes, indexes); if (res != STATUS_OK) res = PortResolver::resolve(value, name, num_indexes, indexes); + if ((res != STATUS_OK) && (pProp->pResolver != NULL)) + res = pProp->pResolver->resolve(value, name, num_indexes, indexes); if (res != STATUS_OK) { expr::Resolver *vars = (pProp->pWrapper != NULL) ? pProp->pWrapper->global_variables() : NULL; @@ -54,6 +56,8 @@ namespace lsp status_t res = pProp->sParams.resolve(value, name, num_indexes, indexes); if (res != STATUS_OK) res = PortResolver::resolve(value, name, num_indexes, indexes); + if ((res != STATUS_OK) && (pProp->pResolver != NULL)) + res = pProp->pResolver->resolve(value, name, num_indexes, indexes); if (res != STATUS_OK) { expr::Resolver *vars = (pProp->pWrapper != NULL) ? pProp->pWrapper->global_variables() : NULL; @@ -67,6 +71,7 @@ namespace lsp sResolver(this) { pWrapper = NULL; + pResolver = NULL; } Property::~Property() @@ -74,9 +79,10 @@ namespace lsp do_destroy(); } - void Property::init(ui::IWrapper *wrapper) + void Property::init(ui::IWrapper *wrapper, expr::Resolver *resolver) { pWrapper = wrapper; + pResolver = resolver; // Bind expression stuff sResolver.init(wrapper); @@ -112,7 +118,7 @@ namespace lsp if (!depends(port)) return; - on_updated(port); + on_updated(port, flags); } status_t Property::evaluate(expr::value_t *value) @@ -179,7 +185,7 @@ namespace lsp return STATUS_OK; } - void Property::on_updated(ui::IPort *port) + void Property::on_updated(ui::IPort *port, size_t flags) { // Nothing } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/meta/func.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/meta/func.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/meta/func.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/meta/func.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 24 нояб. 2020 г. @@ -304,6 +304,7 @@ namespace lsp size_t id_bytes = strlen(metadata->id) + 1; size_t name_bytes = strlen(metadata->name) + 1; + size_t sname_bytes = (metadata->short_name) ? strlen(metadata->short_name) + 1 : 0; // Calculate the overall allocation size size_t to_copy = sizeof(port_t); @@ -319,12 +320,14 @@ namespace lsp ptr += to_copy; ::memcpy(meta, metadata, to_copy); - meta->id = reinterpret_cast(ptr); - ptr += id_bytes; - meta->name = reinterpret_cast(ptr); + meta->id = advance_ptr_bytes(ptr, id_bytes); + meta->name = advance_ptr_bytes(ptr, name_bytes); + meta->short_name = (sname_bytes > 0) ? advance_ptr_bytes(ptr, sname_bytes) : NULL; memcpy(const_cast(meta->id), metadata->id, id_bytes); memcpy(const_cast(meta->name), metadata->name, name_bytes); + if (metadata->short_name != NULL) + memcpy(const_cast(meta->short_name), metadata->short_name, sname_bytes); return meta; } @@ -1436,16 +1439,16 @@ namespace lsp (int32_t(vst2_uid[4])); const int32_t vstfxid = (for_controller) ? (('V' << 16) | ('S' << 8) | 'E') : (('V' << 16) | ('S' << 8) | 'T'); - sprintf(dst, "%06X", vstfxid); + snprintf(dst, 7, "%06X", vstfxid); dst += 6; - sprintf(dst, "%08X", vst2_cconst); + snprintf(dst, 9, "%08X", vst2_cconst); dst += 8; for (size_t i=0, n=strlen(name); i <= 8; i++) { uint8_t c = (i < n) ? tolower(name[i]) : 0; // the plugin name has to be lower case - sprintf(dst, "%02X", c); + snprintf(dst, 3, "%02X", c); dst += 2; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/plug/data.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/plug/data.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/plug/data.cpp 2025-03-01 12:42:57.452644424 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/plug/data.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -325,7 +325,7 @@ namespace lsp mesh->nBufCap = bcap; mesh->nFrameCap = fcap; - mesh->nFrameId = 0; + atomic_store(&mesh->nFrameId, 0); mesh->vFrames = reinterpret_cast(ptr); ptr += sz_frm; @@ -333,7 +333,7 @@ namespace lsp for (size_t i=0; ivFrames[i]; - f->id = 0; + atomic_store(&f->id, 0); f->head = 0; f->tail = 0; f->size = 0; @@ -359,19 +359,20 @@ namespace lsp for (size_t i=0; iid = 0; + atomic_store(&f->id, 0); f->head = 0; f->tail = 0; f->size = 0; f->length = 0; } - nFrameId = current; + atomic_store(&nFrameId, current); } void stream_t::clear() { - clear(nFrameId + 1); + const uint32_t frame_id = atomic_load(&nFrameId); + clear(frame_id + 1); } void stream_t::destroy(stream_t *buf) @@ -391,21 +392,21 @@ namespace lsp { const frame_t *f = &vFrames[frame & (nFrameCap - 1)]; size_t tail = f->tail; - return (f->id == frame) ? tail : -STATUS_NOT_FOUND; + return (atomic_load(&f->id) == frame) ? tail : -STATUS_NOT_FOUND; } ssize_t stream_t::get_head(uint32_t frame) const { const frame_t *f = &vFrames[frame & (nFrameCap - 1)]; size_t head = f->head; - return (f->id == frame) ? head : -STATUS_NOT_FOUND; + return (atomic_load(&f->id) == frame) ? head : -STATUS_NOT_FOUND; } ssize_t stream_t::get_frame_size(uint32_t frame) const { const frame_t *f = &vFrames[frame & (nFrameCap - 1)]; ssize_t size = f->size; - return (f->id == frame) ? size : -STATUS_NOT_FOUND; + return (atomic_load(&f->id) == frame) ? size : -STATUS_NOT_FOUND; } ssize_t stream_t::get_position(uint32_t frame) const @@ -414,19 +415,19 @@ namespace lsp ssize_t pos = f->tail - f->length; if (pos < 0) pos += nBufCap; - return (f->id == frame) ? pos : -STATUS_NOT_FOUND; + return (atomic_load(&f->id) == frame) ? pos : -STATUS_NOT_FOUND; } ssize_t stream_t::get_length(uint32_t frame) const { const frame_t *f = &vFrames[frame & (nFrameCap - 1)]; size_t size = f->length; - return (f->id == frame) ? size : -STATUS_NOT_FOUND; + return (atomic_load(&f->id) == frame) ? size : -STATUS_NOT_FOUND; } size_t stream_t::add_frame(size_t size) { - size_t prev_id = nFrameId; + size_t prev_id = atomic_load(&nFrameId); size_t frame_id = prev_id + 1; frame_t *curr = &vFrames[prev_id & (nFrameCap - 1)]; frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; @@ -434,7 +435,7 @@ namespace lsp size = lsp_min(size, size_t(STREAM_MAX_FRAME_SIZE)); // Write data for new frame - next->id = frame_id; + atomic_store(&next->id, frame_id); next->head = curr->tail; next->tail = next->head + size; next->size = size; @@ -469,9 +470,9 @@ namespace lsp if (channel >= nChannels) return -STATUS_INVALID_VALUE; - size_t frame_id = nFrameId + 1; - frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; - if (next->id != frame_id) + const size_t frame_id = atomic_load(&nFrameId) + 1; + frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; + if (atomic_load(&next->id) != frame_id) return -STATUS_BAD_STATE; // Estimate number of items to copy @@ -502,9 +503,9 @@ namespace lsp if (channel >= nChannels) return NULL; - size_t frame_id = nFrameId + 1; - frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; - if (next->id != frame_id) + const size_t frame_id = atomic_load(&nFrameId) + 1; + frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; + if (atomic_load(&next->id) != frame_id) return NULL; // Estimate number of items to copy @@ -532,7 +533,7 @@ namespace lsp if (channel >= nChannels) return -STATUS_INVALID_VALUE; frame_t *frame = &vFrames[frame_id & (nFrameCap - 1)]; - if (frame->id != frame_id) + if (atomic_load(&frame->id) != frame_id) return -STATUS_BAD_STATE; // Estimate number of items to copy @@ -564,9 +565,9 @@ namespace lsp return -STATUS_INVALID_VALUE; // Check that we're reading proper frame - size_t frame_id = nFrameId; - frame_t *frm = &vFrames[frame_id & (nFrameCap - 1)]; - if (frm->id != frame_id) + const size_t frame_id = atomic_load(&nFrameId); + frame_t *frm = &vFrames[frame_id & (nFrameCap - 1)]; + if (atomic_load(&frm->id) != frame_id) return -STATUS_BAD_STATE; // Estimate the offset and number of items to read @@ -594,16 +595,16 @@ namespace lsp bool stream_t::commit_frame() { - size_t prev_id = nFrameId; - size_t frame_id = prev_id + 1; - frame_t *curr = &vFrames[prev_id & (nFrameCap - 1)]; - frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; - if (next->id != frame_id) + const size_t prev_id = atomic_load(&nFrameId); + const size_t frame_id = prev_id + 1; + frame_t *curr = &vFrames[prev_id & (nFrameCap - 1)]; + frame_t *next = &vFrames[frame_id & (nFrameCap - 1)]; + if (atomic_load(&next->id) != frame_id) return false; // Commit new frame size and update frame identifier - next->length = lsp_min(curr->length + next->length, nBufMax); - nFrameId = frame_id; + next->length = lsp_min(curr->length + next->length, nBufMax); + atomic_store(&nFrameId, frame_id); return true; } @@ -615,7 +616,8 @@ namespace lsp return false; // Estimate what to do - uint32_t src_frm = src->nFrameId, dst_frm = nFrameId; + uint32_t src_frm = atomic_load(&src->nFrameId); + uint32_t dst_frm = atomic_load(&nFrameId); uint32_t delta = src_frm - dst_frm; if (delta == 0) return false; // No changes @@ -626,7 +628,7 @@ namespace lsp frame_t *df = &vFrames[src_frm & (nFrameCap - 1)]; frame_t sf = src->vFrames[src_frm & (src->nFrameCap - 1)]; - df->id = src_frm; + atomic_store(&df->id, src_frm); df->length = lsp_min(sf.length, nBufMax); df->tail = df->length; @@ -678,7 +680,7 @@ namespace lsp if (fsize < 0) fsize += src->nBufCap; - df->id = dst_frm; + atomic_store(&df->id, dst_frm); df->head = pf->tail; df->tail = df->head; df->length = fsize; @@ -718,7 +720,7 @@ namespace lsp } // Update current frame - nFrameId = src_frm; + atomic_store(&nFrameId, src_frm); return true; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/EvaluatedPort.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/EvaluatedPort.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/EvaluatedPort.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/EvaluatedPort.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -29,7 +29,7 @@ namespace lsp { static const meta::port_t fake_metadata = { - "", "", + "", "", "", meta::U_NONE, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/IPresetListener.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/IPresetListener.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/IPresetListener.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/IPresetListener.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 30 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +namespace lsp +{ + namespace ui + { + IPresetListener::IPresetListener() + { + } + + IPresetListener::~IPresetListener() + { + } + + void IPresetListener::preset_activated(const preset_t *preset) + { + } + + void IPresetListener::preset_deactivated(const preset_t *preset) + { + } + + void IPresetListener::presets_updated() + { + } + + } /* namespace ui */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/IPresetManager.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/IPresetManager.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/IPresetManager.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/IPresetManager.cpp 2025-08-26 18:15:48.105960781 +0000 @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 30 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +namespace lsp +{ + namespace ui + { + IPresetManager::IPresetManager() + { + } + + IPresetManager::~IPresetManager() + { + } + + void IPresetManager::mark_active_preset_dirty() + { + } + + } /* namespace ui */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/IWrapper.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/IWrapper.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/IWrapper.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/IWrapper.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -20,17 +20,23 @@ */ #include +#include +#include +#include #include #include -#include -#include +#include #include #include #include #include +#include #include +#include #include #include +#include +#include #include #include @@ -58,43 +64,44 @@ namespace lsp { PATH(UI_LAST_VERSION_PORT_ID, "Last version of the product installed"), PATH(UI_DLG_SAMPLE_PATH_ID, "Dialog path for selecting sample files"), - INT_CONTROL_RANGE(UI_DLG_SAMPLE_FTYPE_ID, "Dialog file type for selecting sample files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_SAMPLE_FTYPE_ID, "Dialog file type for selecting sample files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_IR_PATH_ID, "Dialog path for selecting impulse response files"), - INT_CONTROL_RANGE(UI_DLG_IR_FTYPE_ID, "Dialog file type for selecting impulse response files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_IR_FTYPE_ID, "Dialog file type for selecting impulse response files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_CONFIG_PATH_ID, "Dialog path for saving/loading configuration files"), - INT_CONTROL_RANGE(UI_DLG_CONFIG_FTYPE_ID, "Dialog file type for saving/loading configuration files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_CONFIG_FTYPE_ID, "Dialog file type for saving/loading configuration files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_REW_PATH_ID, "Dialog path for importing REW settings files"), - INT_CONTROL_RANGE(UI_DLG_REW_FTYPE_ID, "Dialog file type for importing REW settings files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_REW_FTYPE_ID, "Dialog file type for importing REW settings files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_HYDROGEN_PATH_ID, "Dialog path for importing Hydrogen drumkit files"), - INT_CONTROL_RANGE(UI_DLG_HYDROGEN_FTYPE_ID, "Dialog file type for importing Hydrogen drumkit files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_HYDROGEN_FTYPE_ID, "Dialog file type for importing Hydrogen drumkit files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_LSPC_BUNDLE_PATH_ID, "Dialog path for exporting/importing LSPC bundles"), - INT_CONTROL_RANGE(UI_DLG_LSPC_BUNDLE_FTYPE_ID, "Dialog file type for exporting/importing LSPC bundles", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_LSPC_BUNDLE_FTYPE_ID, "Dialog file type for exporting/importing LSPC bundles", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_SFZ_PATH_ID, "Dialog path for exporting/importing SFZ files"), - INT_CONTROL_RANGE(UI_DLG_SFZ_FTYPE_ID, "Dialog file type for exporting/importing SFZ files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_SFZ_FTYPE_ID, "Dialog file type for exporting/importing SFZ files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_MODEL3D_PATH_ID, "Dialog for saving/loading 3D model files"), - INT_CONTROL_RANGE(UI_DLG_MODEL3D_FTYPE_ID, "Dialog file type for saving/loading 3D model files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_MODEL3D_FTYPE_ID, "Dialog file type for saving/loading 3D model files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_DLG_DEFAULT_PATH_ID, "Dialog default path for other files"), - INT_CONTROL_RANGE(UI_DLG_DEFAULT_FTYPE_ID, "Dialog default file type for other files", U_NONE, 0, 100, 0, 1), + INT_CONTROL_ALL(UI_DLG_DEFAULT_FTYPE_ID, "Dialog default file type for other files", NULL, U_NONE, 0, 100, 0, 1), PATH(UI_R3D_BACKEND_PORT_ID, "Identifier of selected backend for 3D rendering"), PATH(UI_LANGUAGE_PORT_ID, "Selected language identifier for the UI interface"), - SWITCH(UI_REL_PATHS_PORT_ID, "Use relative paths when exporting configuration file", 0.0f), - KNOB(UI_SCALING_PORT_ID, "Manual UI scaling factor", U_PERCENT, 25.0f, 400.0f, 100.0f, 1.0f), - SWITCH(UI_SCALING_HOST_PORT_ID, "Prefer host-reported UI scale factor", 1.0f), - KNOB(UI_FONT_SCALING_PORT_ID, "Manual UI font scaling factor", U_PERCENT, 50.0f, 400.0f, 100.0f, 1.0f), - KNOB(UI_BUNDLE_SCALING_PORT_ID, "Manual Bundle UI scaling factor", U_PERCENT, 0.0f, 400.0f, 0.0f, 1.0f), + SWITCH(UI_REL_PATHS_PORT_ID, "Use relative paths when exporting configuration file", NULL, 0.0f), + CONTROL_ALL(UI_SCALING_PORT_ID, "Manual UI scaling factor", NULL, U_PERCENT, 25.0f, 400.0f, 100.0f, 1.0f), + SWITCH(UI_SCALING_HOST_PORT_ID, "Prefer host-reported UI scale factor", NULL, 1.0f), + CONTROL_ALL(UI_FONT_SCALING_PORT_ID, "Manual UI font scaling factor", NULL, U_PERCENT, 50.0f, 400.0f, 100.0f, 1.0f), + CONTROL_ALL(UI_BUNDLE_SCALING_PORT_ID, "Manual Bundle UI scaling factor", NULL, U_PERCENT, 0.0f, 400.0f, 0.0f, 1.0f), PATH(UI_VISUAL_SCHEMA_FILE_ID, "Current visual schema file used by the UI"), - SWITCH(UI_PREVIEW_AUTO_PLAY_ID, "Enable automatic playback of the audio file in the file preview part of the file open dialog", 0.0f), - SWITCH(UI_ENABLE_KNOB_SCALE_ACTIONS_ID, "Enable knob scale mouse actions", 1.0f), + SWITCH(UI_PREVIEW_AUTO_PLAY_ID, "Enable automatic playback of the audio file in the file preview part of the file open dialog", NULL, 0.0f), + SWITCH(UI_ENABLE_KNOB_SCALE_ACTIONS_ID, "Enable setting knob value by clicking on its scale feature", NULL, 1.0f), PATH(UI_USER_HYDROGEN_KIT_PATH_ID, "User Hydrogen kits path"), PATH(UI_OVERRIDE_HYDROGEN_KIT_PATH_ID, "Override Hydrogen kits path"), - SWITCH(UI_OVERRIDE_HYDROGEN_KITS_ID, "Override Hydrogen kits", 1.0f), - SWITCH(UI_INVERT_VSCROLL_ID, "Invert global mouse vertical scroll behaviour", 0.0f), - SWITCH(UI_GRAPH_DOT_INVERT_VSCROLL_ID, "Invert mouse vertical scroll behaviour for graph dot widget", 0.0f), - SWITCH(UI_ZOOMABLE_SPECTRUM_GRAPH_ID, "Enables the automatic scaling mode of the frequency graph", 1.0f), - COMBO(UI_FILTER_POINT_THICK_ID, "Thickness of the filter point", 1.0f, filter_point_thickness_modes), + SWITCH(UI_OVERRIDE_HYDROGEN_KITS_ID, "Override Hydrogen kits", NULL, 1.0f), + SWITCH(UI_INVERT_VSCROLL_ID, "Invert global mouse vertical scroll behaviour", NULL, 0.0f), + SWITCH(UI_GRAPH_DOT_INVERT_VSCROLL_ID, "Invert mouse vertical scroll behaviour for graph dot widget", NULL, 0.0f), + SWITCH(UI_ZOOMABLE_SPECTRUM_GRAPH_ID, "Zoom slider affects the frequency graph", NULL, 1.0f), + COMBO(UI_FILTER_POINT_THICK_ID, "Thickness of the filter point", NULL, 1.0f, filter_point_thickness_modes), PATH(UI_DOCUMENTATION_PATH_ID, "Path to the local documentation installation"), - SWITCH(UI_FILELIST_NAVIGAION_AUTOLOAD_ID, "Automatically load files when navigating over file list", 0.0f), - SWITCH(UI_TAKE_INST_NAME_FROM_FILE_ID, "Take instrument name from the name of loaded file", 0.0f), + SWITCH(UI_FILELIST_NAVIGATION_AUTOLOAD_ID, "Automatically load files when navigating over file list", NULL, 1.0f), + SWITCH(UI_FILELIST_NAVIGATION_AUTOPLAY_ID, "Enable automatic playback of the audio file in the file navigator when selected", NULL, 0.0f), + SWITCH(UI_TAKE_INST_NAME_FROM_FILE_ID, "Take instrument name from the name of loaded file", NULL, 0.0f), PORTS_END }; @@ -115,6 +122,63 @@ namespace lsp namespace ui { + static constexpr ssize_t INVALID_PRESET_INDEX = -1; + + static void mark_presets_as_favourite(lltl::darray *list, json::Array array, bool user) + { + const uint32_t mask = (user) ? PRESET_FLAG_USER : PRESET_FLAG_NONE; + LSPString prest_name; + + for (size_t i=0, n=array.size(); isize(); juget(j); + if (preset == NULL) + continue; + if ((preset->flags & PRESET_FLAG_USER) != mask) + continue; + + if (preset->name.equals_nocase(&prest_name)) + { + preset->flags |= PRESET_FLAG_FAVOURITE; + break; + } + } + } + } + + static status_t save_favourites_list(json::Serializer & json, const char *key, lltl::darray *list, size_t flags) + { + flags |= ui::PRESET_FLAG_FAVOURITE; + + status_t res = json.write_property(key); + if (res != STATUS_OK) + return res; + if ((res = json.start_array()) != STATUS_OK) + return res; + { + for (size_t i=0, n=list->size(); iuget(i); + if (preset == NULL) + continue; + if ((preset->flags & (ui::PRESET_FLAG_FAVOURITE | ui::PRESET_FLAG_USER)) != flags) + continue; + + if ((res = json.write_string(&preset->name)) != STATUS_OK) + return res; + } + } + + return json.end_array(); + } + IWrapper::IWrapper(Module *ui, resource::ILoader *loader) { pDisplay = NULL; @@ -125,6 +189,8 @@ namespace lsp nFlags = 0; nPlayPosition = 0; nPlayLength = 0; + nActivePreset = INVALID_PRESET_INDEX; + enPresetTab = PRESET_TAB_ALL; plug::position_t::init(&sPosition); } @@ -142,6 +208,10 @@ namespace lsp // Flush list of playback listeners vPlayListeners.flush(); + // Flush list of preset listeners + vPresetListeners.flush(); + destroy_presets(&vPresets); + // Flush list of 'Schema reloaded' handlers vSchemaListeners.flush(); @@ -312,10 +382,9 @@ namespace lsp // Load the global configuration file io::Path gconfig; - if ((res = system::get_user_config_path(&gconfig)) == STATUS_OK) + if ((res = get_user_config_path(&gconfig)) == STATUS_OK) { lsp_trace("User config path: %s", gconfig.as_utf8()); - res = gconfig.append_child("lsp-plugins"); if (res == STATUS_OK) res = gconfig.append_child("lsp-plugins.cfg"); if (res == STATUS_OK) @@ -327,6 +396,48 @@ namespace lsp return STATUS_OK; } + status_t IWrapper::get_user_config_path(io::Path *path) + { + io::Path tmp; + status_t res = system::get_user_config_path(&tmp); + if (res == STATUS_OK) + res = tmp.append_child("lsp-plugins"); + if (res == STATUS_OK) + tmp.swap(path); + + return res; + } + + status_t IWrapper::get_user_presets_path(io::Path *path) + { + io::Path tmp; + status_t res = get_user_config_path(&tmp); + if (res == STATUS_OK) + res = tmp.append_child("presets"); + if (res == STATUS_OK) + tmp.swap(path); + + return res; + } + + status_t IWrapper::get_plugin_presets_path(io::Path *path) + { + const meta::plugin_t *meta = (pUI != NULL) ? pUI->metadata() : NULL; + if (meta == NULL) + return STATUS_BAD_STATE; + + // File name format: /presets//.[preset|patch] + io::Path tmp; + status_t res = get_user_presets_path(&tmp); + if (res == STATUS_OK) + res = tmp.append_child(meta->uid); + + if (res == STATUS_OK) + tmp.swap(path); + + return res; + } + void IWrapper::notify_all() { for (size_t i=0, n=vPorts.size(); iname.get_utf8() : NULL; + if (name != NULL) + { + const size_t bytes = lsp_min(strlen(name), core::PRESET_NAME_BYTES - 1); + memcpy(state.name, name, bytes); + state.name[bytes] = '\0'; + + if (preset->flags & ui::PRESET_FLAG_USER) + state.flags |= core::PRESET_FLAG_USER; + if (nFlags & F_PRESET_DIRTY) + state.flags |= core::PRESET_FLAG_DIRTY; + } + else + state.name[0] = '\0'; + + // Commit preset state + send_preset_state(&state); + nFlags &= ~F_PRESET_SYNC; + } } void IWrapper::quit_main_loop() @@ -731,10 +889,10 @@ namespace lsp return res; // Create window controller - pWindow = new ctl::PluginWindow(this, wWindow); - if (pWindow == NULL) + ctl::PluginWindow *wnd = new ctl::PluginWindow(this, wWindow); + if (wnd == NULL) return STATUS_NO_MEM; - if ((res = pWindow->init()) != STATUS_OK) + if ((res = wnd->init()) != STATUS_OK) return res; // Form the location of the resource @@ -743,14 +901,34 @@ namespace lsp return STATUS_NO_MEM; // Create context - UIContext ctx(this, pWindow->controllers(), pWindow->widgets()); + UIContext ctx(this, wnd->controllers(), wnd->widgets()); if ((res = ctx.init()) != STATUS_OK) return res; // Parse the XML document - xml::RootNode root(&ctx, "plugin", pWindow); + xml::RootNode root(&ctx, "plugin", wnd); xml::Handler handler(resources()); - return handler.parse_resource(&xpath, &root); + if ((res = handler.parse_resource(&xpath, &root)) != STATUS_OK) + return res; + + // Append overlays to the window + lltl::parray *overlays = ctx.overlays(); + for (size_t i=0, n=overlays->size(); iuget(i); + if (ov == NULL) + continue; + + if ((res = wnd->add(&ctx, ov)) != STATUS_OK) + return res; + } + + // Call post-initialization + if ((res = wnd->post_init()) != STATUS_OK) + return res; + + pWindow = wnd; + return STATUS_OK; } status_t IWrapper::export_settings(const char *file, bool relative) @@ -1526,7 +1704,7 @@ namespace lsp const meta::bundle_t *bundle = (meta != NULL) ? meta->bundle : NULL; const char *bundle_uid = (bundle != NULL) ? bundle->uid : NULL; - if (bundle->uid != NULL) + if (bundle_uid != NULL) { scaling_key.set_utf8(bundle_uid); scaling_key.replace_all('-', '_'); @@ -1673,7 +1851,7 @@ namespace lsp // Obtain actual versions of all modules lltl::pphash parameters; status_t res = read_parameters(file, ¶meters); - if (res != STATUS_OK) + if ((res != STATUS_OK) && (res != STATUS_NOT_FOUND)) return res; lsp_finally { drop_parameters(¶meters); }; @@ -2098,6 +2276,12 @@ namespace lsp p->notify_all(ui::PORT_NONE); } + // Update preset settings + nActivePreset = -1; + nFlags = (nFlags & ~(F_PRESET_DIRTY)) | F_PRESET_SYNC; + notify_presets_updated(); + + // Notify UI if (pUI != NULL) pUI->reset_settings(); @@ -2173,6 +2357,634 @@ namespace lsp return NULL; } + /** + * Get name of graphics backend + * @return name of graphics backend + */ + const char *IWrapper::graphics_backend() const + { + const ws::surface_type_t stype = (wWindow != NULL) ? wWindow->surface_type() : ws::ST_UNKNOWN; + + switch (stype) + { + case ws::ST_UNKNOWN: + case ws::ST_IMAGE: + case ws::ST_XLIB: + case ws::ST_SIMILAR: + return "Cairo"; + + case ws::ST_DDRAW: + return "Direct2D"; + + case ws::ST_OPENGL: + return "OpenGL"; + + default: + break; + } + + return "Unknown"; + } + + status_t IWrapper::add_preset_listener(IPresetListener *listener) + { + if (listener == NULL) + return STATUS_BAD_ARGUMENTS; + + if (vPresetListeners.contains(listener)) + return STATUS_ALREADY_EXISTS; + + const bool first_listener = vPresetListeners.is_empty(); + if (!vPresetListeners.add(listener)) + return STATUS_NO_MEM; + + if (first_listener) + update_preset_list(); + + // Notify listener about containing presets + listener->presets_updated(); + + return STATUS_OK; + } + + status_t IWrapper::remove_preset_listener(IPresetListener *listener) + { + if (listener == NULL) + return STATUS_BAD_ARGUMENTS; + + return (vPresetListeners.qpremove(listener)) ? STATUS_OK : STATUS_NOT_FOUND; + } + + status_t IWrapper::select_active_preset(const preset_t *preset) + { + const ssize_t preset_id = vPresets.index_of(preset); + if ((preset_id < 0) && (nActivePreset < 0)) + { + nFlags = (nFlags & (~F_PRESET_DIRTY)); + return STATUS_OK; + } + + // Change current preset + preset_t *pold = (nActivePreset >= 0) ? vPresets.get(nActivePreset) : NULL; + preset_t *pnew = const_cast(preset); + if (pold == pnew) + return STATUS_OK; + + // Import preset settings + status_t res = STATUS_OK; + if (preset != NULL) + { + const size_t flags = (preset->flags & ui::PRESET_FLAG_PATCH) ? IMPORT_FLAG_PATCH : IMPORT_FLAG_PRESET; + res = import_settings(&pnew->path, flags); + } + + nActivePreset = (pnew != NULL) ? preset_id : INVALID_PRESET_INDEX; + nFlags = (nFlags & (~F_PRESET_DIRTY)) | F_PRESET_SYNC; + + if (pold != NULL) + notify_preset_deactivated(pold); + if (pnew != NULL) + notify_preset_activated(pnew); + return res; + } + + const preset_t *IWrapper::active_preset() const + { + return (nActivePreset >= 0) ? vPresets.get(nActivePreset) : NULL; + } + + const preset_t *IWrapper::all_presets() const + { + return vPresets.array(); + } + + size_t IWrapper::num_presets() const + { + return vPresets.size(); + } + + void IWrapper::destroy_presets(lltl::darray *list) + { + for (size_t i=0, n=list->size(); iuget(i); + if (preset != NULL) + { + preset->name.~LSPString(); + preset->path.~LSPString(); + } + } + list->flush(); + } + + preset_t *IWrapper::add_preset(lltl::darray *list) + { + preset_t *preset = list->add(); + if (preset == NULL) + return NULL; + + new (&preset->name, inplace_new_tag_t()) LSPString(); + new (&preset->path, inplace_new_tag_t()) LSPString(); + preset->flags = 0; + + return preset; + } + + void IWrapper::scan_factory_presets(lltl::darray *list) + { + const meta::plugin_t *meta = (pUI != NULL) ? pUI->metadata() : NULL; + if ((meta == NULL) || (meta->ui_presets == NULL)) + return; + + lltl::darray presets; + if (core::scan_presets(&presets, resources(), meta->ui_presets) != STATUS_OK) + return; + + io::Path path; + LSPString tmp; + preset_t tmp_preset; + + for (size_t i=0, n=presets.size(); iname) != STATUS_OK) + continue; + + // Get name of the preset/patch without an extension + if (path.get_last_noext(&tmp_preset.name) != STATUS_OK) + continue; + if (tmp_preset.path.fmt_utf8(LSP_BUILTIN_PREFIX "presets/%s/%s", meta->ui_presets, preset->name) <= 0) + continue; + if (path.get_ext(&tmp) != STATUS_OK) + continue; + + // Fill flags + tmp_preset.flags = PRESET_FLAG_NONE; + if (tmp.equals_ascii_nocase("patch")) + tmp_preset.flags |= PRESET_FLAG_PATCH; + else if (!tmp.equals_ascii_nocase("preset")) + continue; + + // Create preset item + preset_t *item = add_preset(list); + if (item == NULL) + continue; + + item->name.swap(tmp_preset.name); + item->path.swap(tmp_preset.path); + item->flags = tmp_preset.flags; + } + } + + void IWrapper::scan_user_presets(lltl::darray *list) + { + // File name format: /presets//.[preset|patch] + io::Path path; + if (get_plugin_presets_path(&path) != STATUS_OK) + return; + + io::Dir dir; + if (dir.open(&path) != STATUS_OK) + return; + lsp_finally { dir.close(); }; + + io::Path preset; + io::fattr_t fattr; + LSPString tmp; + preset_t tmp_preset; + + while (dir.reads(&preset, &fattr, true) == STATUS_OK) + { + // We process only regular files + if (fattr.type != io::fattr_t::FT_REGULAR) + continue; + + // Get name of the preset/patch without an extension + if (preset.get_last_noext(&tmp_preset.name) != STATUS_OK) + continue; + if (preset.get(&tmp_preset.path) != STATUS_OK) + continue; + if (preset.get_ext(&tmp) != STATUS_OK) + continue; + + // Fill flags + tmp_preset.flags = PRESET_FLAG_USER; + if (tmp.equals_ascii_nocase("patch")) + tmp_preset.flags |= PRESET_FLAG_PATCH; + else if (!tmp.equals_ascii_nocase("preset")) + continue; + + // Create preset item + preset_t *item = add_preset(list); + if (item == NULL) + continue; + + item->name.swap(tmp_preset.name); + item->path.swap(tmp_preset.path); + item->flags = tmp_preset.flags; + } + } + + void IWrapper::scan_favourite_presets(lltl::darray *list) + { + const meta::plugin_t *meta = (pUI != NULL) ? pUI->metadata() : NULL; + if ((meta == NULL) || (meta->ui_presets == NULL)) + return; + + // File name format: /presets//favourites.json + io::Path path; + if (get_plugin_presets_path(&path) != STATUS_OK) + return; + if (path.append_child("favourites.json") != STATUS_OK) + return; + + // Load configuration file + json::Object config; + if (json::dom_load(&path, &config, json::JSON_VERSION5) != STATUS_OK) + return; + if (!config.valid()) + return; + + json::Array factory = config.get("factory"); + if (factory.valid()) + mark_presets_as_favourite(list, factory, false); + + json::Array user = config.get("user"); + if (user.valid()) + mark_presets_as_favourite(list, user, true); + } + + status_t IWrapper::save_favourites(const io::Path *path) + { + json::Serializer json; + json::serial_flags_t flags; + + flags.version = json::JSON_VERSION5; + flags.identifiers = false; + flags.ident = ' '; + flags.padding = 4; + flags.separator = true; + flags.multiline = true; + + status_t res = json.open(path, &flags); + if (res != STATUS_OK) + return res; + lsp_finally { + json.close(); + }; + + if ((res = json.start_object()) != STATUS_OK) + return res; + { + if ((res = save_favourites_list(json, "factory", &vPresets, ui::PRESET_FLAG_NONE)) != STATUS_OK) + return res; + if ((res = save_favourites_list(json, "user", &vPresets, ui::PRESET_FLAG_USER)) != STATUS_OK) + return res; + } + if ((res = json.end_object()) != STATUS_OK) + return res; + + return STATUS_OK; + } + + void IWrapper::select_presets(lltl::darray *list, const preset_t *active) + { + list->qsort(preset_compare_function); + nActivePreset = INVALID_PRESET_INDEX; + + for (size_t i=0, n=list->size(); iuget(i); + if ((active != NULL) && (preset_compare_function(preset, active) == 0)) + nActivePreset = i; + } + } + + void IWrapper::update_preset_list() + { + const preset_t *active = active_preset(); + + lltl::darray presets; + lsp_finally { destroy_presets(&presets); }; + + scan_factory_presets(&presets); + scan_user_presets(&presets); + scan_favourite_presets(&presets); + select_presets(&presets, active); + + presets.swap(&vPresets); + } + + void IWrapper::scan_presets() + { + // First, update the list of presets + update_preset_list(); + notify_presets_updated(); + } + + void IWrapper::notify_presets_updated() + { + // Notify listeners about the change of whole list of presets + lltl::parray listeners; + if (listeners.add(vPresetListeners)) + { + for (size_t i=0, n=listeners.size(); ipresets_updated(); + } + } + } + + void IWrapper::notify_preset_deactivated(const ui::preset_t *preset) + { + // Notify listeners about the activation of the preset + lltl::parray listeners; + if (listeners.add(vPresetListeners)) + { + for (size_t i=0, n=listeners.size(); ipreset_deactivated(preset); + } + } + } + + void IWrapper::notify_preset_activated(const ui::preset_t *preset) + { + // Notify listeners about the activation of the preset + lltl::parray listeners; + if (listeners.add(vPresetListeners)) + { + for (size_t i=0, n=listeners.size(); ipreset_activated(preset); + } + } + } + + void IWrapper::mark_active_preset_dirty() + { + // Set flag only when there is an active preset + const preset_t *preset = active_preset(); + if ((preset != NULL) && (!(nFlags & F_PRESET_DIRTY))) + { + nFlags |= F_PRESET_DIRTY | F_PRESET_SYNC; + notify_presets_updated(); + } + } + + bool IWrapper::active_preset_dirty() const + { + if (!(nFlags & F_PRESET_DIRTY)) + return false; + return active_preset() != NULL; + } + + preset_tab_t IWrapper::preset_tab() const + { + return enPresetTab; + } + + void IWrapper::set_preset_tab(preset_tab_t tab) + { + enPresetTab = tab; + nFlags |= F_PRESET_SYNC; + } + + status_t IWrapper::mark_preset_favourite(const preset_t *src_preset, bool favourite) + { + if (!vPresets.contains(src_preset)) + return STATUS_NOT_FOUND; + preset_t *preset = const_cast(src_preset); + if (preset == NULL) + return STATUS_NOT_FOUND; + + const uint32_t new_flags = lsp_setflag(preset->flags, PRESET_FLAG_FAVOURITE, favourite); + if (new_flags == preset->flags) + return STATUS_OK; + + preset->flags = new_flags; + nFlags |= F_FAVOURITES_DIRTY; // Favourites list needs to be synchronized + + notify_presets_updated(); + + return STATUS_OK; + } + + status_t IWrapper::remove_preset(const preset_t *src_preset) + { + ssize_t preset_id = vPresets.index_of(src_preset); + if (preset_id < 0) + return STATUS_NOT_FOUND; + + preset_t *preset = const_cast(src_preset); + if (preset == NULL) + return STATUS_NOT_FOUND; + + if (!(preset->flags & PRESET_FLAG_USER)) + return STATUS_INVALID_VALUE; + + // Delete original file + io::Path path; + status_t res = path.set(&preset->path); + if (res == STATUS_OK) + res = path.remove(); + if (res != STATUS_OK) + return res; + + // Remove preset from list + const uint32_t flags = preset->flags; + if (!vPresets.remove(preset_id)) + return STATUS_NO_MEM; + + // Update related state + if (flags & PRESET_FLAG_FAVOURITE) + nFlags |= F_FAVOURITES_DIRTY; // Favourites list needs to be synchronized + + if (nActivePreset == ssize_t(preset_id)) + { + nActivePreset = INVALID_PRESET_INDEX; + nFlags |= F_PRESET_SYNC; + } + + // Notify listeners + notify_presets_updated(); + return STATUS_OK; + } + + status_t IWrapper::allocate_temp_file(io::Path *dst, const io::Path *src) + { + const char *spath = src->as_utf8(); + for (int i=0; ; ++i) + { + if (dst->fmt("%s.%d", spath, i) <= 0) + return STATUS_NO_MEM; + if (!dst->exists()) + break; + } + + return STATUS_OK; + } + + preset_t *IWrapper::find_preset(const LSPString *name, bool user) + { + const bool mask = (user) ? ui::PRESET_FLAG_USER : ui::PRESET_FLAG_NONE; + for (size_t i=0, n=vPresets.size(); iflags & ui::PRESET_FLAG_USER) == mask) && (p->name.equals_nocase(name))) + return p; + } + + return NULL; + } + + status_t IWrapper::save_preset(const LSPString *name, size_t flags) + { + // Check preset name + if (!(flags & ui::PRESET_FLAG_USER)) + return STATUS_INVALID_VALUE; + + // Get location of presets + io::Path base; + status_t res = get_plugin_presets_path(&base); + if (res != STATUS_OK) + return res; + + res = base.mkdir(true); + if ((res != STATUS_OK) && (res != STATUS_ALREADY_EXISTS)) + return res; + + // Find the previous preset + io::Path old_file, new_file, temp_file; + + preset_t *preset = find_preset(name, true); + bool was_favourite = false; + if (preset != NULL) + { + if ((res = old_file.set(&preset->path)) != STATUS_OK) + return res; + was_favourite = preset->flags & ui::PRESET_FLAG_FAVOURITE; + } + + // Create new preset item + if (new_file.fmt("%s/%s.preset", base.as_utf8(), name->get_utf8()) <= 0) + return STATUS_NO_MEM; + if (!old_file.is_empty()) + { + res = allocate_temp_file(&temp_file, &new_file); + if (res != STATUS_OK) + return res; + } + + ui::preset_t create; + if (!create.name.set(name)) + return STATUS_NO_MEM; + if ((res = new_file.get(&create.path)) != STATUS_OK) + return res; + create.flags = (flags & ui::PRESET_FLAG_FAVOURITE) | ui::PRESET_FLAG_USER; + + // Now we are ready to export configuration + if (!old_file.is_empty()) + { + // Export settings + lsp_trace("Write preset to temporary file %s", temp_file.as_utf8()); + if ((res = export_settings(&temp_file, true)) != STATUS_OK) + return res; + + // Replace previous file with new + lsp_trace("Remove old preset file %s", old_file.as_utf8()); + if ((res = old_file.remove()) != STATUS_OK) + return res; + + lsp_trace("Rename temporary file %s to %s", temp_file.as_utf8(), new_file.as_utf8()); + if ((res = temp_file.rename(&new_file)) != STATUS_OK) + return res; + } + else + { + // Export settings + lsp_trace("Write preset to new file %s", new_file.as_utf8()); + if ((res = export_settings(&new_file, true)) != STATUS_OK) + return res; + + // Allocate new record + const preset_t *base = vPresets.array(); + preset = add_preset(&vPresets); + if (preset == NULL) + { + // The internal data structure of vPresets may change address, + // so we need to notify clients + if (base != vPresets.array()) + notify_presets_updated(); + return STATUS_NO_MEM; + } + } + + // Fill data structure + preset->flags = create.flags; + preset->name.swap(create.name); + preset->path.swap(create.path); + + const bool is_favourite = flags & ui::PRESET_FLAG_FAVOURITE; + if (was_favourite != is_favourite) + nFlags |= F_FAVOURITES_DIRTY; // Favourites list needs to be synchronized + + // Sort list of presets + vPresets.qsort(preset_compare_function); + preset = find_preset(name, true); + if (preset == NULL) + return STATUS_UNKNOWN_ERR; + + nActivePreset = vPresets.index_of(preset); + nFlags = (nFlags & (~F_PRESET_DIRTY)) | F_PRESET_SYNC; + + // Notify listeners about presets changes + notify_presets_updated(); + + return STATUS_OK; + } + + void IWrapper::send_preset_state(const core::preset_state_t *state) + { + // Implement for wrapper + } + + void IWrapper::receive_preset_state(const core::preset_state_t *state) + { + LSPString name; + if (!name.set_utf8(state->name)) + return; + + size_t flags = nFlags & ~(F_PRESET_DIRTY | F_PRESET_SYNC); + if (state->flags & core::PRESET_FLAG_DIRTY) + flags |= F_PRESET_DIRTY; + + const preset_t *preset = (name.is_empty()) ? NULL : find_preset(&name, state->flags & core::PRESET_FLAG_USER); + const ssize_t active = (preset != NULL) ? vPresets.index_of(preset) : INVALID_PRESET_INDEX; + + if ((flags == nFlags) && (active == nActivePreset) && (state->tab == uint32_t(enPresetTab))) + return; + + nFlags = flags; + nActivePreset = active; + enPresetTab = preset_tab_t(lsp_min(state->tab, uint32_t(ui::PRESET_TAB_TOTAL - 1))); + + // Notify listeners about presets changes + notify_presets_updated(); + } + } /* namespace ui */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/PortResolver.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/PortResolver.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/PortResolver.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/PortResolver.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2021 Linux Studio Plugins Project - * (C) 2021 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 9 апр. 2021 г. @@ -97,7 +97,7 @@ namespace lsp return STATUS_OK; } - } /* namespace java */ + } /* namespace ui */ } /* namespace lsp */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/UIContext.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/UIContext.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/UIContext.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/UIContext.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -38,6 +38,9 @@ namespace lsp UIContext::~UIContext() { + // Cleanup list of overlay widgets + vOverlays.flush(); + // Destroy the stack for (size_t i=0, n=vStack.size(); inext()) { @@ -246,7 +249,7 @@ namespace lsp return c; } - status_t UIContext::set_attributes(ctl::Widget *widget, const LSPString * const *atts) + status_t UIContext::set_attributes(ctl::DOMController *ctl, const LSPString * const *atts) { status_t res; @@ -259,7 +262,7 @@ namespace lsp return res; // Set widget attribute - widget->set(this, atts[0]->get_utf8(), avalue.get_utf8()); + ctl->set(this, atts[0]->get_utf8(), avalue.get_utf8()); } return STATUS_OK; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/presets.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/presets.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/presets.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/presets.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 24 июн. 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +namespace lsp +{ + namespace ui + { + ssize_t preset_compare_function(const preset_t *a, const preset_t *b) + { + ssize_t result = a->name.compare_to_nocase(&b->name); + if (result != 0) + return result; + + return ssize_t(a->flags & PRESET_FLAG_USER) - ssize_t(b->flags & PRESET_FLAG_USER); + } + + bool is_any_preset(const ui::preset_t *preset) + { + return true; + } + + bool is_factory_preset(const ui::preset_t *preset) + { + return !(preset->flags & ui::PRESET_FLAG_USER); + } + + bool is_user_preset(const ui::preset_t *preset) + { + return preset->flags & ui::PRESET_FLAG_USER; + } + + bool is_favourite_preset(const ui::preset_t *preset) + { + return preset->flags & ui::PRESET_FLAG_FAVOURITE; + } + + } /* namespace ui */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/xml/DOMControllerNode.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/xml/DOMControllerNode.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/xml/DOMControllerNode.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/xml/DOMControllerNode.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov + * + * This file is part of lsp-plugin-fw + * Created on: 25 мая 2025 г. + * + * lsp-plugin-fw is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * lsp-plugin-fw 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with lsp-plugin-fw. If not, see . + */ + +#include + +#include + +namespace lsp +{ + namespace ui + { + namespace xml + { + DOMControllerNode::DOMControllerNode(UIContext *ctx, Node *parent, ctl::DOMController *ctl): Node(ctx, parent) + { + pController = ctl; + } + + DOMControllerNode::~DOMControllerNode() + { + if (pController != NULL) + pController = NULL; + } + + status_t DOMControllerNode::enter(const LSPString * const *atts) + { + status_t res; + lltl::parray tmp; + + // Build list of overridden attributes + if ((res = pContext->overrides()->build(&tmp, atts)) != STATUS_OK) + { + lsp_error("Error building overridden attributes: %d", int(res)); + return res; + } + atts = tmp.array(); + + // Apply overridden widget attributes + LSPString xvalue; + + pController->begin(pContext); + for ( ; *atts != NULL; atts += 2) + { + // Evaluate attribute value + if ((res = pContext->eval_string(&xvalue, atts[1])) != STATUS_OK) + { + lsp_error( + "Error evaluating expression for attribute '%s': %s", + atts[0]->get_native(), atts[1]->get_native() + ); + return res; + } + + // Set widget attribute + pController->set(pContext, atts[0]->get_utf8(), xvalue.get_utf8()); + } + + // Push the state of overrides + if ((res = pContext->overrides()->push(1)) != STATUS_OK) + { + lsp_error("Error entering new attribute override state: %d", int(res)); + return res; + } + + return STATUS_OK; + } + + status_t DOMControllerNode::leave() + { + status_t res; + + pController->end(pContext); + + // Pop state of overrides + if ((res = pContext->overrides()->pop()) != STATUS_OK) + { + lsp_error("Error restoring override state: %d", int(res)); + return res; + } + + return Node::leave(); + } + + } /* namespac xml */ + } /* namespace ui */ +} /* namespace lsp */ + + diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/xml/RootNode.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/xml/RootNode.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/xml/RootNode.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/xml/RootNode.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 10 апр. 2021 г. @@ -55,7 +55,10 @@ namespace lsp // Create and initialize widget ctl::Widget *widget = pWidget; if (widget == NULL) // If there is no widget, instantiate it - widget = pContext->create_controller(name); + { + ctl::Controller *ctl = pContext->create_controller(name); + widget = ctl::ctl_cast(ctl); + } // No handler? if (widget == NULL) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/xml/WidgetNode.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/xml/WidgetNode.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/main/ui/xml/WidgetNode.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/main/ui/xml/WidgetNode.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 апр. 2021 г. @@ -21,6 +21,7 @@ #include +#include #include namespace lsp @@ -33,7 +34,6 @@ namespace lsp { pWidget = widget; pChild = NULL; - pSpecial = NULL; } WidgetNode::~WidgetNode() @@ -50,17 +50,32 @@ namespace lsp if (*child != NULL) return STATUS_OK; - // Create and initialize widget - ctl::Widget *widget = pContext->create_controller(name); - if (widget == NULL) - return STATUS_OK; // No handler - - // Create handler - pChild = new WidgetNode(pContext, this, widget); - if (pChild == NULL) - return STATUS_NO_MEM; + // Create controller + ctl::Controller *ctl = pContext->create_controller(name); + + // Process it as widget if it is a widget + ctl::Widget *widget = ctl::ctl_cast(ctl); + if (widget != NULL) + { + // Create widget handler + pChild = new WidgetNode(pContext, this, widget); + if (pChild == NULL) + return STATUS_NO_MEM; + + *child = pChild; + return STATUS_OK; + } + + // Process it as a DOM controller if it is a DOM controller + ctl::DOMController *dom_ctl = ctl::ctl_cast(ctl); + if (dom_ctl != NULL) + { + // Create DOM controller handler + DOMControllerNode *node = new DOMControllerNode(pContext, this, dom_ctl); + *child = node; + return (node != NULL) ? STATUS_OK : STATUS_NO_MEM; + } - *child = pChild; return STATUS_OK; } @@ -127,25 +142,37 @@ namespace lsp { status_t res = STATUS_OK; - // Link the child widget togetgher with parent widget - if ((child == pChild) && (pChild != NULL)) - { - ctl::Widget *w = pChild->pWidget; + // Forget the child at exit + lsp_finally { pChild = NULL; }; - if ((pWidget != NULL) && (w != NULL)) - { - res = pWidget->add(pContext, w); - if (res != STATUS_OK) - lsp_error( - "Error while trying to add widget of type '%s' as child for '%s'", - w->get_class()->name, - pWidget->get_class()->name - ); - } - } + // Link the child widget together with parent widget + if ((child != pChild) || (pChild == NULL)) + return res; - // Forget the child - pChild = NULL; + ctl::Widget *w = pChild->pWidget; + if ((pWidget == NULL) || (w == NULL)) + return res; + + ctl::Overlay *ov = ctl::ctl_cast(w); + if (ov != NULL) + { + // Need to add the widget to the list of overlays + res = (pContext->overlays()->add(ov)) ? STATUS_OK : STATUS_NO_MEM; + if (res != STATUS_OK) + lsp_error( + "Error while trying to register overlay widget of type '%s'", + w->get_class()->name, + pWidget->get_class()->name); + } + else + { + res = pWidget->add(pContext, w); + if (res != STATUS_OK) + lsp_error( + "Error while trying to add widget of type '%s' as child for '%s'", + w->get_class()->name, + pWidget->get_class()->name); + } return res; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/test/mtest/standalone.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -209,10 +209,12 @@ MTEST_BEGIN("", standalone) cfg.plugin_id, cfg.args.size(), const_cast(cfg.args.array())); - MTEST_ASSERT_MSG(result == STATUS_OK, "Failed with result=%d", int(result)); - - MTEST_ASSERT(loop->run() == STATUS_OK); - delete loop; + if (result != STATUS_CANCELLED) + { + MTEST_ASSERT_MSG(result == STATUS_OK, "Failed with result=%d", int(result)); + MTEST_ASSERT(loop->run() == STATUS_OK); + delete loop; + } } MTEST_END diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/test/mtest/vst3_modinfo.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/test/mtest/vst3_modinfo.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/test/mtest/vst3_modinfo.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/test/mtest/vst3_modinfo.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 4 февр. 2024 г. @@ -34,17 +34,30 @@ MTEST_BEGIN("", vst3_modinfo) resdir.set(tempdir(), "resources"); system::set_env_var(LSP_RESOURCE_PATH_VAR, resdir.as_string()); - // Call the gen_ttl tool - io::Path outfile; - MTEST_ASSERT(outfile.fmt("%s/mtest-%s-vst3-moduleinfo.json", tempdir(), full_name()) > 0); + // Call the tool + io::Path modinfo; + MTEST_ASSERT(modinfo.fmt("%s/mtest-%s-vst3-moduleinfo.json", tempdir(), full_name()) > 0); + + io::Path plist; + MTEST_ASSERT(plist.fmt("%s/mtest-%s-vst3-info.plist", tempdir(), full_name()) > 0); + + io::Path pkginfo; + MTEST_ASSERT(pkginfo.fmt("%s/mtest-%s-vst3-PkgInfo", tempdir(), full_name()) > 0); const char *data[]= { "vst3_modinfo", - outfile.as_native(), + "-m", + modinfo.as_native(), + "-i", + plist.as_native(), + "-p", + pkginfo.as_native() }; - printf("Writing moduleinfo.json file to %s...\n", outfile.as_native()); + printf("Writing moduleinfo.json file to %s...\n", modinfo.as_native()); + printf("Writing info.plist file to %s...\n", plist.as_native()); + printf("Writing PkgInfo file to %s...\n", pkginfo.as_native()); MTEST_ASSERT(lsp::vst3_modinfo::main(sizeof(data)/sizeof(const char *), data) == 0); } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/test/utest/meta/func/parse.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/test/utest/meta/func/parse.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/test/utest/meta/func/parse.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/test/utest/meta/func/parse.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -31,6 +31,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test BOOL port", + "Test Bool", meta::U_BOOL, meta::R_CONTROL, 0, @@ -109,6 +110,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test ENUM port", + "Test Enum", meta::U_ENUM, meta::R_CONTROL, meta::F_LOWER | meta::F_STEP, @@ -117,6 +119,7 @@ UTEST_BEGIN("meta.func", parse) 2.0f, 3.0f, enum_values, + NULL, NULL }; @@ -179,6 +182,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test GAIN_AMP port", + "Test Gain Amp", meta::U_GAIN_AMP, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -187,6 +191,7 @@ UTEST_BEGIN("meta.func", parse) 1.0f, 0.01f, NULL, + NULL, NULL }; @@ -251,6 +256,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test GAIN_AMP port", + "Test Gain Amp", meta::U_GAIN_POW, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -259,6 +265,7 @@ UTEST_BEGIN("meta.func", parse) 1.0f, 0.01f, NULL, + NULL, NULL }; @@ -324,6 +331,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test DB port", + "Test dB", meta::U_DB, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -332,6 +340,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 0.1f, NULL, + NULL, NULL }; @@ -393,6 +402,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test NEPER port", + "Test Neper", meta::U_NEPER, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -401,6 +411,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 0.1f, NULL, + NULL, NULL }; @@ -462,6 +473,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test FREQUENCY port", + "Test Frequency", meta::U_HZ, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -470,6 +482,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 0.1f, NULL, + NULL, NULL }; @@ -543,6 +556,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test FREQUENCY port", + "Test Frequency", meta::U_KHZ, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -551,6 +565,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 0.1f, NULL, + NULL, NULL }; @@ -712,6 +727,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test BAR port", + "Test Bar", meta::U_BAR, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP | meta::F_INT, @@ -720,6 +736,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 1.0f, NULL, + NULL, NULL }; @@ -790,6 +807,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test BAR port", + "Test Bar", meta::U_BAR, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -798,6 +816,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 1.0f, NULL, + NULL, NULL }; @@ -868,6 +887,7 @@ UTEST_BEGIN("meta.func", parse) static const meta::port_t port = { "test", "Test SEC port", + "Test Seconds", meta::U_SEC, meta::R_CONTROL, meta::F_LOWER | meta::F_UPPER | meta::F_STEP, @@ -876,6 +896,7 @@ UTEST_BEGIN("meta.func", parse) 0.0f, 1.0f, NULL, + NULL, NULL }; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/gst_make/gst_make.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/gst_make/gst_make.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/gst_make/gst_make.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/gst_make/gst_make.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -188,6 +188,9 @@ namespace lsp fprintf(stderr, "Error creating file '%s', code=%d\n", file->as_native(), code); return STATUS_IO_ERROR; } + lsp_finally { + fclose(out); + }; // Write to file fprintf(out, "//------------------------------------------------------------------------------\n"); @@ -294,9 +297,6 @@ namespace lsp if (pos < length) fputs(ftemplate->get_utf8(pos), out); - // Close file - fclose(out); - return STATUS_OK; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/jack_make/jack_make.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/jack_make/jack_make.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/jack_make/jack_make.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/jack_make/jack_make.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -74,6 +74,9 @@ namespace lsp fprintf(stderr, "Error creating file '%s', code=%d\n", file->as_native(), code); return STATUS_IO_ERROR; } + lsp_finally { + fclose(out); + }; // Write to file fprintf(out, "//------------------------------------------------------------------------------\n"); @@ -101,9 +104,6 @@ namespace lsp fprintf(out, " #include \n"); fprintf(out, "#undef LSP_PLUG_IN_JACK_MAIN_IMPL\n"); - // Close file - fclose(out); - return STATUS_OK; } diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/lv2ttl_gen/lv2ttl_gen.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/lv2ttl_gen/lv2ttl_gen.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/lv2ttl_gen/lv2ttl_gen.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/lv2ttl_gen/lv2ttl_gen.cpp 2025-08-26 18:15:48.109960744 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 1 дек. 2021 г. @@ -848,6 +848,8 @@ namespace lsp fprintf(out, "\t\tlv2:index %d ;\n", (int)port_id); fprintf(out, "\t\tlv2:symbol \"%s\" ;\n", (p->role == meta::R_BYPASS) ? "enabled" : p->id); fprintf(out, "\t\tlv2:name \"%s\" ;\n", (p->role == meta::R_BYPASS) ? "Enabled" : p->name); + if (p->short_name != NULL) + fprintf(out, "\t\tlv2:shortName \"%s\" ;\n", p->short_name); if (p->role == meta::R_BYPASS) fprintf(out, "\t\tlv2:designation lv2:enabled ;\n"); diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/repository/repository.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/repository/repository.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/repository/repository.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/repository/repository.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include #include @@ -54,6 +56,7 @@ namespace lsp lltl::pphash other; // Other files lltl::pphash local; // Local files lltl::pphash fonts; // Fonts + lltl::pphash scene3d; // 3D scenec util::checksum_list_t checksums; // Checksums } context_t; @@ -73,6 +76,48 @@ namespace lsp */ typedef status_t (* file_handler_t)(context_t *ctx, const LSPString *relative, const LSPString *full); + /** + * File processing rule + */ + typedef struct file_rule_t + { + io::PathPattern pattern; + file_handler_t handler; + } file_rule_t; + + status_t add_rule(lltl::parray *rules, const char *pattern, file_handler_t handler) + { + file_rule_t *rule = new file_rule_t; + if (rule == NULL) + return STATUS_NO_MEM; + lsp_finally { + if (rule != NULL) + delete rule; + }; + + status_t res = rule->pattern.set(pattern, io::PathPattern::FULL_PATH); + if (res != STATUS_OK) + return res; + + rule->handler = handler; + if (!rules->add(rule)) + return STATUS_NO_MEM; + + release_ptr(rule); + return STATUS_OK; + } + + void clear_rules(lltl::parray *rules) + { + for (size_t i=0, n=rules->size(); iuget(i); + if (rule != NULL) + delete rule; + } + rules->flush(); + } + void drop_paths(lltl::parray *paths) { for (size_t i=0, n=paths->size(); ifonts.flush(); drop_paths(&paths); + // Drop fonts + ctx->scene3d.values(&paths); + ctx->scene3d.flush(); + drop_paths(&paths); + // Drop checksums util::drop_checksums(&ctx->checksums); } @@ -153,6 +203,14 @@ namespace lsp return ext.equals_ascii_nocase("xml"); } + bool is_obj_file(const io::Path *path) + { + LSPString ext; + if (path->get_ext(&ext) != STATUS_OK) + return false; + return ext.equals_ascii_nocase("obj"); + } + status_t add_unique_file(lltl::pphash *dst, const LSPString *relative, const LSPString *full) { LSPString *path = dst->get(relative); @@ -528,6 +586,11 @@ namespace lsp return add_unique_file(&ctx->local, relative, full); } + status_t scene3d_handler(context_t *ctx, const LSPString *relative, const LSPString *full) + { + return add_unique_file(&ctx->scene3d, relative, full); + } + status_t i18n_handler(context_t *ctx, const LSPString *relative, const LSPString *full) { status_t res; @@ -569,10 +632,7 @@ namespace lsp return res; } - status_t scan_files( - const io::Path *base, const LSPString *child, const io::PathPattern *pattern, - context_t *ctx, file_handler_t handler - ) + status_t scan_files(const io::Path *base, const LSPString *child, context_t *ctx, lltl::parray * rules) { status_t res; io::Path path, rel, full; @@ -634,18 +694,30 @@ namespace lsp // printf(" found dir: %s\n", rel.as_native()); } } - else if (pattern->test(&item)) + else { // Build file paths if ((res = rel.set(child, &item)) != STATUS_OK) return res; - if ((res = full.set(base, &rel)) != STATUS_OK) - return res; - // Handle the file - //printf(" found file: %s\n", rel.as_native()); - if ((res = handler(ctx, rel.as_string(), full.as_string())) != STATUS_OK) - return res; + for (size_t i=0, n=rules->size(); iuget(i); + if (rule == NULL) + continue; + if (!rule->pattern.test(&rel)) + continue; + + if ((res = full.set(base, &rel)) != STATUS_OK) + return res; + + // Handle the file + //printf(" found file: %s\n", rel.as_native()); + if ((res = rule->handler(ctx, rel.as_string(), full.as_string())) != STATUS_OK) + return res; + + break; + } } } @@ -653,7 +725,7 @@ namespace lsp for (size_t i=0, n=subdirs.size(); i rules; + lsp_finally { clear_rules(&rules); }; + LSP_STATUS_ASSERT(add_rule(&rules, "schema/**/*.xml", schema_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "ui/**/*.xml", ui_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "presets/**/*.preset", preset_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "presets/**/*.patch", preset_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "i18n/**/*.json", i18n_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "fonts/**/**", font_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "models/**/*.obj", scene3d_handler)); + LSP_STATUS_ASSERT(add_rule(&rules, "**/**", other_handler)); + // Compute the base path io::Path base, full; if ((res = base.set(path, "res/main")) != STATUS_OK) @@ -700,18 +770,7 @@ namespace lsp if (io::Path::is_dots(&child)) continue; - if (child.equals_ascii("schema")) - res = scan_files(&base, &child, "*.xml", ctx, schema_handler); - else if (child.equals_ascii("ui")) - res = scan_files(&base, &child, "*.xml", ctx, ui_handler); - else if (child.equals_ascii("preset")) - res = scan_files(&base, &child, "*.preset", ctx, preset_handler); - else if (child.equals_ascii("i18n")) - res = scan_files(&base, &child, "*.json", ctx, i18n_handler); - else if (child.equals_ascii("fonts")) - res = scan_files(&base, &child, "*", ctx, font_handler); - else - res = scan_files(&base, &child, "*", ctx, other_handler); + scan_files(&base, &child, ctx, &rules); if (res != STATUS_OK) return res; @@ -735,7 +794,11 @@ namespace lsp if ((res = base.set(path)) != STATUS_OK) return res; - return scan_files(&base, &child, "*", ctx, local_handler); + lltl::parray rules; + lsp_finally { clear_rules(&rules); }; + LSP_STATUS_ASSERT(add_rule(&rules, "**/**", local_handler)); + + return scan_files(&base, &child, ctx, &rules); } status_t lookup_path(const char *path, context_t *ctx) @@ -886,6 +949,27 @@ namespace lsp return res; } } + else if (is_obj_file(&df)) + { + // Compress obj file + obj::PushParser parser; + obj::Compressor compressor; + + res = compressor.set_buffer_size(7); + if (res == STATUS_OK) + res = compressor.open(&df, io::File::FM_WRITE_NEW); + if (res == STATUS_OK) + res = parser.parse_file(&compressor, source); + res = update_status(res, compressor.close()); + + if (res != STATUS_OK) + { + fprintf(stderr, "Error compressing OBJ file '%s', error: %d\n", df.as_native(), int(res)); + if (!strict) + continue; + return res; + } + } else { // Copy file @@ -1239,6 +1323,8 @@ namespace lsp if ((res == STATUS_OK) || (!strict)) res = update_status(res, export_files(strict, &ctx, &ctx.fonts)); if ((res == STATUS_OK) || (!strict)) + res = update_status(res, export_files(strict, &ctx, &ctx.scene3d)); + if ((res == STATUS_OK) || (!strict)) res = process_manifest_file(&ctx, cmd); // Export checksums if specified diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/validator/common.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/validator/common.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/validator/common.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/validator/common.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -157,9 +157,7 @@ namespace lsp // Check that port identifier is present if (port->id == NULL) validation_error(ctx, "Not specified port identifier for plugin uid='%s'", meta->uid); - - // Check that port identifier is valid - if (!validate_identifier(port->id)) + else if (!validate_identifier(port->id)) // Check that port identifier is valid validation_error(ctx, "Invalid port identifier '%s' for plugin uid='%s', allowed characters are: a-z, A-Z, _, 0-9", port->id, meta->uid); @@ -171,6 +169,17 @@ namespace lsp else if (!(ctx->port_ids.create(port->id, const_cast(port)))) allocation_error(ctx); + // Ensure that port short name doesn't clash with any othe port name + if (port->short_name != NULL) + { + clash = ctx->port_short_names.get(port->short_name); + if (clash != NULL) + validation_error(ctx, "Port id='%s' short name '%s' clashes short name of port id='%s' for plugin uid='%s'", + clash->id, port->short_name, port->id, meta->uid); + else if (!(ctx->port_short_names.create(port->short_name, const_cast(port)))) + allocation_error(ctx); + } + // Additional checks for specific port types switch (port->role) { @@ -701,6 +710,7 @@ namespace lsp ctx->port_ids.flush(); ctx->clap_port_ids.flush(); ctx->vst3_port_ids.flush(); + ctx->port_short_names.flush(); // Validate name if (meta->name == NULL) diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/validator/lv2.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/validator/lv2.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/validator/lv2.cpp 2025-03-01 12:42:57.456644401 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/validator/lv2.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2023 Linux Studio Plugins Project - * (C) 2023 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 8 янв. 2023 г. @@ -45,6 +45,16 @@ namespace lsp void validate_port(context_t *ctx, const meta::plugin_t *meta, const meta::port_t *port) { + if (port->short_name != NULL) + { + // LV2: This is the same as name, with the additional requirement that the value is shorter than 16 characters. + const size_t len = strlen(port->short_name); + if (len >= 16) + validation_error( + ctx, + "Plugin uid='%s' port id='%s' has short name '%s' of length %d characters but should be shorter than 16 characters", + meta->uid, port->id, port->short_name, int(len)); + } } } /* namespace lv2 */ } /* namespace validator */ diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/util/vst3_modinfo/vst3_modinfo.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/vst3_modinfo/vst3_modinfo.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/util/vst3_modinfo/vst3_modinfo.cpp 2025-03-01 12:42:57.460644376 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/util/vst3_modinfo/vst3_modinfo.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -33,13 +33,307 @@ namespace lsp { namespace vst3_modinfo { - int main(int argc, const char **argv) + typedef struct cmdline_t + { + const char *modinfo; // Path to moduleinfo.json + const char *info_plist; // Path to Info.plist + const char *pkginfo; // Path to PkgInfo + } cmdline_t; + + static status_t parse_cmdline(cmdline_t *cfg, int argc, const char **argv) + { + cfg->modinfo = NULL; + cfg->info_plist = NULL; + cfg->pkginfo = NULL; + + // Parse arguments + int i = 1; + + while (i < argc) + { + const char *arg = argv[i++]; + if ((!::strcmp(arg, "--help")) || (!::strcmp(arg, "-h"))) + { + printf("Usage: %s [parameters] [resource-directories]\n\n", argv[0]); + printf("Available parameters:\n"); + printf(" -h, --help Show help\n"); + printf(" -i, --info-plist Generate Info.plist file contents to the specified file\n"); + printf(" -m, --modinfo Write modinfo.json file contents to the specified file\n"); + printf(" -p, --pkginfo Write PkgInfo file contents to the specified file\n"); + printf("\n"); + + return STATUS_CANCELLED; + } + else if ((!::strcmp(arg, "--info-plist")) || (!::strcmp(arg, "-i"))) + { + if (i >= argc) + { + fprintf(stderr, "Not specified file name for '%s' parameter\n", arg); + return STATUS_BAD_ARGUMENTS; + } + else if (cfg->info_plist) + { + fprintf(stderr, "Duplicate parameter '%s'\n", arg); + return STATUS_BAD_ARGUMENTS; + } + cfg->info_plist = argv[i++]; + } + else if ((!::strcmp(arg, "--modinfo")) || (!::strcmp(arg, "-m"))) + { + if (i >= argc) + { + fprintf(stderr, "Not specified file name for '%s' parameter\n", arg); + return STATUS_BAD_ARGUMENTS; + } + else if (cfg->modinfo) + { + fprintf(stderr, "Duplicate parameter '%s'\n", arg); + return STATUS_BAD_ARGUMENTS; + } + cfg->modinfo = argv[i++]; + } + else if ((!::strcmp(arg, "--pkginfo")) || (!::strcmp(arg, "-p"))) + { + if (i >= argc) + { + fprintf(stderr, "Not specified file name for '%s' parameter\n", arg); + return STATUS_BAD_ARGUMENTS; + } + else if (cfg->pkginfo) + { + fprintf(stderr, "Duplicate parameter '%s'\n", arg); + return STATUS_BAD_ARGUMENTS; + } + cfg->pkginfo = argv[i++]; + } + else + { + fprintf(stderr, "Unknown argument '%s'\n", arg); + return STATUS_BAD_ARGUMENTS; + } + } + + return STATUS_OK; + } + + static status_t write_modinfo(const char *file, const meta::package_t *manifest) + { + // Initialize path + status_t res; + io::Path path; + if ((res = path.set_native(file)) != STATUS_OK) + { + fprintf(stderr, "Error parsing moduleinfo.json path, error=%d\n", int(res)); + return res; + } + + // Make moduleinfo file + if ((res = vst3::make_moduleinfo(&path, manifest)) != STATUS_OK) + { + fprintf(stderr, "Error creating moduleinfo.json file, error=%d\n", int(res)); + return res; + } + + return STATUS_OK; + } + + static status_t write_escaped_string(io::OutSequence *os, const LSPString *string) + { + LSPString out; + + if (!out.reserve(string->length())) + return STATUS_NO_MEM; + if (!out.append_ascii("\t")) + return STATUS_NO_MEM; + + // Escape characters + for (size_t i=0, n=string->length(); ichar_at(i); + if (ch < 0x20u) + { + switch (ch) + { + case '\t': + if (!out.append(ch)) + return STATUS_NO_MEM; + break; + + default: + if (!out.fmt_append_ascii("&x%02x;", int(ch))) + return STATUS_NO_MEM; + break; + } + } + else if (ch < 0x80u) + { + switch (ch) + { + case '&': + if (!out.append_ascii("&")) + return STATUS_NO_MEM; + break; + case '<': + if (!out.append_ascii("<")) + return STATUS_NO_MEM; + break; + case '>': + if (!out.append_ascii(">")) + return STATUS_NO_MEM; + break; + case '\"': + if (!out.append_ascii(""")) + return STATUS_NO_MEM; + break; + case '\'': + if (!out.append_ascii("'")) + return STATUS_NO_MEM; + break; + default: + if (!out.append(ch)) + return STATUS_NO_MEM; + break; + } + } + else + { + if (!out.fmt_append_ascii("&x%04x;", int(ch))) + return STATUS_NO_MEM; + } + } + + // Output string + if (!out.append_ascii("")) + return STATUS_NO_MEM; + + return os->writeln(&out); + } + + static status_t write_escaped_string(io::OutSequence *os, const char *string) + { + LSPString tmp, out; + if (!tmp.set_utf8(string)) + return STATUS_NO_MEM; + + return write_escaped_string(os, &tmp); + } + + static inline status_t write_key(io::OutSequence *os, const char *key) + { + LSP_STATUS_ASSERT(os->write_ascii("\t")); + LSP_STATUS_ASSERT(os->write_ascii(key)); + LSP_STATUS_ASSERT(os->writeln_ascii("")); + return STATUS_OK; + }; + + static status_t write_info_plist(const char *file, const meta::package_t *manifest) { - if (argc < 2) + // Initialize path + status_t res; + io::Path path; + if ((res = path.set_native(file)) != STATUS_OK) + { + fprintf(stderr, "Error parsing Info.plist path, error=%d\n", int(res)); + return res; + } + + // Create output file + io::OutSequence os; + if ((res = os.open(&path, io::File::FM_WRITE_NEW, "UTF-8")) != STATUS_OK) + { + fprintf(stderr, "Error writing Info.plist path, error=%d\n", int(res)); + return res; + } + lsp_finally { + os.close(); + }; + + // Generate Info.plist contents + LSP_STATUS_ASSERT(os.writeln_ascii("")); + LSP_STATUS_ASSERT(os.writeln_ascii("")); + LSP_STATUS_ASSERT(os.writeln_ascii("")); + { + // Generate version string + LSPString version; + if (version.fmt_ascii("%d.%d.%d", + manifest->version.major, + manifest->version.minor, + manifest->version.micro) < 0) + return STATUS_NO_MEM; + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleName")); + LSP_STATUS_ASSERT(write_escaped_string(&os, manifest->artifact)); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleDisplayName")); + LSP_STATUS_ASSERT(write_escaped_string(&os, manifest->artifact_name)); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundlePackageType")); + LSP_STATUS_ASSERT(write_escaped_string(&os, "BNDL")); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleExecutable")); + LSP_STATUS_ASSERT(write_escaped_string(&os, manifest->artifact)); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleVersion")); + LSP_STATUS_ASSERT(write_escaped_string(&os, &version)); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleShortVersionString")); + LSP_STATUS_ASSERT(write_escaped_string(&os, &version)); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleSignature")); + LSP_STATUS_ASSERT(write_escaped_string(&os, "????")); + + LSP_STATUS_ASSERT(write_key(&os, "CFBundleSupportedPlatforms")); + LSP_STATUS_ASSERT(os.writeln_ascii("\t")); + LSP_STATUS_ASSERT(os.writeln_ascii("\t\tMacOSX")); + LSP_STATUS_ASSERT(os.writeln_ascii("\t")); + + LSP_STATUS_ASSERT(write_key(&os, "NSHighResolutionCapable")); + LSP_STATUS_ASSERT(os.writeln_ascii("\t")); + + LSP_STATUS_ASSERT(write_key(&os, "NSHumanReadableCopyright")); + LSP_STATUS_ASSERT(write_escaped_string(&os, manifest->copyright)); + } + LSP_STATUS_ASSERT(os.writeln_ascii("")); + + return STATUS_OK; + } + + + static status_t write_pkginfo(const char *file, const meta::package_t *manifest) + { + // Initialize path + status_t res; + io::Path path; + if ((res = path.set_native(file)) != STATUS_OK) { - fprintf(stderr, "Required destination moduleinfo.json file\n"); - return STATUS_BAD_ARGUMENTS; + fprintf(stderr, "Error parsing PkgInfo path, error=%d\n", int(res)); + return res; + } + + // Create output file + io::OutSequence os; + if ((res = os.open(&path, io::File::FM_WRITE_NEW, "UTF-8")) != STATUS_OK) + { + fprintf(stderr, "Error writing PkgInfo path, error=%d\n", int(res)); + return res; } + lsp_finally { + os.close(); + }; + + // Generate PkgInfo contents + LSP_STATUS_ASSERT(os.writeln_ascii("BNDL????")); + + return STATUS_OK; + } + + int main(int argc, const char **argv) + { + // Parse command line options + cmdline_t cmd; + status_t res = parse_cmdline(&cmd, argc, argv); + if (res != STATUS_OK) + return res; // Create resource loader resource::ILoader *loader = core::create_resource_loader(); @@ -52,7 +346,6 @@ namespace lsp delete loader; }; - status_t res; meta::package_t *manifest = NULL; { // Obtain the manifest file descriptor @@ -84,18 +377,24 @@ namespace lsp }; // Write the moduleinfo.json file - io::Path path; - if ((res = path.set_native(argv[1])) != STATUS_OK) + if (cmd.modinfo != NULL) { - fprintf(stderr, "Error parsing manifest path, error=%d\n", int(res)); - return res; + if ((res = write_modinfo(cmd.modinfo, manifest)) != STATUS_OK) + return res; } - // Make moduleinfo file - if ((res = vst3::make_moduleinfo(&path, manifest)) != STATUS_OK) + // Write the Info.plist file + if (cmd.info_plist != NULL) { - fprintf(stderr, "Error creating moduleinfo.json file, error=%d\n", int(res)); - return res; + if ((res = write_info_plist(cmd.info_plist, manifest)) != STATUS_OK) + return res; + } + + // Write the PkgInfo file + if (cmd.pkginfo != NULL) + { + if ((res = write_pkginfo(cmd.pkginfo, manifest)) != STATUS_OK) + return res; } // All seems to be OK diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/wrap/cairo/CairoCanvas.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/cairo/CairoCanvas.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/wrap/cairo/CairoCanvas.cpp 2025-03-01 12:42:57.460644376 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/cairo/CairoCanvas.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -28,7 +28,11 @@ #include #include -#include +#ifdef PLATFORM_MACOSX + #include +#else + #include +#endif /* PLATFORM_MACOSX */ namespace lsp { diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/wrap/clap.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/clap.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/wrap/clap.cpp 2025-03-01 12:42:57.460644376 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/clap.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -218,20 +218,20 @@ namespace lsp Wrapper *w = static_cast(plugin->plugin_data); -// #ifdef LSP_TRACE -// debug_ostream_t dbg(stream); -// -// status_t res = w->save_state(&dbg); -// if (res == STATUS_OK) -// { -// lsp_dumpb("Output state dump", dbg.data(), dbg.size()); -// res = dbg.flush(); -// } -// -// return res == STATUS_OK; -// #else + #ifdef LSP_TRACE + debug_ostream_t dbg(stream); + + status_t res = w->save_state(&dbg); + if (res == STATUS_OK) + { + lsp_dumpb("Output state dump", dbg.data(), dbg.size()); + res = dbg.flush(); + } + + return res == STATUS_OK; + #else return w->save_state(stream) == STATUS_OK; -// #endif /* LSP_TRACE */ + #endif /* LSP_TRACE */ } bool CLAP_ABI load_state(const clap_plugin_t *plugin, const clap_istream_t *stream) @@ -240,18 +240,18 @@ namespace lsp Wrapper *w = static_cast(plugin->plugin_data); -// #ifdef LSP_TRACE -// debug_istream_t dbg(stream); -// status_t res = dbg.fill(); -// if (res == STATUS_OK) -// { -// lsp_dumpb("Input state dump", dbg.data(), dbg.size()); -// res = w->load_state(&dbg); -// } -// return res == STATUS_OK; -// #else + #ifdef LSP_TRACE + debug_istream_t dbg(stream); + status_t res = dbg.fill(); + if (res == STATUS_OK) + { + lsp_dumpb("Input state dump", dbg.data(), dbg.size()); + res = w->load_state(&dbg); + } + return res == STATUS_OK; + #else return w->load_state(stream) == STATUS_OK; -// #endif /* LSP_TRACE */ + #endif /* LSP_TRACE */ } const clap_plugin_state_t state_extension = @@ -370,7 +370,10 @@ namespace lsp bool CLAP_ABI ui_adjust_size(const clap_plugin_t *plugin, uint32_t *width, uint32_t *height) { - lsp_trace("plugin = %p, width=%p, height=%p", plugin, width, height); + lsp_trace("plugin = %p, width=%p (%d), height=%p (%d)", + plugin, + width, (width != NULL) ? int(*width) : 0, + height, (height != NULL) ? int(*height) : 0); Wrapper *w = static_cast(plugin->plugin_data); UIWrapper *uw = w->ui_wrapper(); return (uw != NULL) ? uw->adjust_size(width, height) : false; diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/wrap/jack.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/jack.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/wrap/jack.cpp 2025-03-01 12:42:57.460644376 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/jack.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugin-fw * Created on: 11 мая 2016 г. @@ -126,10 +126,12 @@ namespace lsp { const char *cfg_file; const char *plugin_id; + const char *client_name; void *parent_id; bool headless; bool list; bool version; + bool minimized; lltl::darray routing; } cmdline_t; @@ -291,6 +293,7 @@ namespace lsp // Initialize config with default values cfg->cfg_file = NULL; cfg->plugin_id = NULL; + cfg->client_name = NULL; cfg->parent_id = NULL; cfg->headless = false; cfg->list = false; @@ -315,6 +318,8 @@ namespace lsp ) printf(" -h, --help Output help\n"); printf(" -hl, --headless Launch in console only, without UI\n"); + printf(" -mw, --minimized Launch UI with minimized window\n"); + printf(" -n, --name Specify the client name for JACK\n"); if (plugin_id == NULL) printf(" -l, --list List available plugin identifiers\n"); printf(" -v, --version Output the version of the software\n"); @@ -336,8 +341,19 @@ namespace lsp } cfg->cfg_file = argv[i++]; } + else if ((!::strcmp(arg, "--name")) || (!::strcmp(arg, "-n"))) + { + if (i >= argc) + { + fprintf(stderr, "Not specified JACK client for '%s' parameter\n", arg); + return STATUS_BAD_ARGUMENTS; + } + cfg->client_name = argv[i++]; + } else if ((!::strcmp(arg, "--headless")) || (!::strcmp(arg, "-hl"))) cfg->headless = true; + else if ((!::strcmp(arg, "--minimized")) || (!::strcmp(arg, "-mw"))) + cfg->minimized = true; else if ((!::strcmp(arg, "--version")) || (!::strcmp(arg, "-v"))) cfg->version = true; else if ((plugin_id == NULL) && ((!::strcmp(arg, "--list")) || (!::strcmp(arg, "-l")))) @@ -447,7 +463,7 @@ namespace lsp // Output sorted plugin list char fmt[0x20]; - sprintf(fmt, " %%%ds %%s\n", -int(maxlen)); + snprintf(fmt, sizeof(fmt), " %%%ds %%s\n", -int(maxlen)); for (size_t i=0, n=list.size(); iinit(NULL)) != STATUS_OK) return res; + + // Minimize window if required + if (sCmdLine.minimized) + { + tk::Window *wnd = pUIWrapper->window(); + if (wnd != NULL) + wnd->state()->set_minimized(); + } } #endif /* WITH_UI_FEATURE */ @@ -939,13 +974,11 @@ extern "C" }; // Initialize loop - status_t res = w->init(plugin_id, argc, argv); - if (res != STATUS_OK) - return res; + status_t res = w->init(plugin_id, argc, argv); + if (res == STATUS_OK) + *loop = release_ptr(w); // Return loop - // Return loop - *loop = release_ptr(w); - return STATUS_OK; + return res; } #ifdef __cplusplus diff -pruN 1.2.21-5/modules/lsp-plugin-fw/src/wrap/vst3.cpp 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/vst3.cpp --- 1.2.21-5/modules/lsp-plugin-fw/src/wrap/vst3.cpp 2025-03-01 12:42:57.460644376 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugin-fw/src/wrap/vst3.cpp 2025-08-26 18:15:48.113960705 +0000 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #include #include #include +#include #include #include diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-plugins-ab-tester/.github/workflows/build.yml 2025-03-01 12:42:55.020659022 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/.github/workflows/build.yml 2025-08-26 18:15:41.298026856 +0000 @@ -147,7 +147,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -164,7 +164,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -221,3 +221,17 @@ jobs: shell: msys2 {0} run: make VERBOSE=1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui' + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/CHANGELOG --- 1.2.21-5/modules/lsp-plugins-ab-tester/CHANGELOG 2025-03-01 12:42:55.020659022 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/CHANGELOG 2025-08-26 18:15:41.298026856 +0000 @@ -2,6 +2,12 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.18 === +* Updated build scripts and dependencies. + +=== 1.0.17 === +* Updated build scripts and dependencies. + === 1.0.16 === * Updated build scripts and dependencies. diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/dependencies.mk 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/dependencies.mk --- 1.2.21-5/modules/lsp-plugins-ab-tester/dependencies.mk 2025-03-01 12:42:55.020659022 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/dependencies.mk 2025-08-26 18:15:41.298026856 +0000 @@ -114,14 +114,35 @@ ifeq ($(PLATFORM),Windows) endif #------------------------------------------------------------------------------ +# MacOS dependencies +MACOS_DEPENDENCIES = \ + LIBAUDIOTOOLBOX \ + LIBCAIRO \ + LIBCOCOA \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBICONV \ + LIBJACK + +MACOS_TEST_DEPENDENCIES = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES += $(MACOS_DEPENDENCIES) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES) \ $(LINUX_DEPENDENCIES) \ $(BSD_DEPENDENCIES) \ $(WINDOWS_DEPENDENCIES) \ + $(MACOS_DEPENDENCIES) \ $(TEST_DEPENDENCIES) \ $(LINUX_TEST_DEPENDENCIES) \ $(BSD_TEST_DEPENDENCIES) \ - $(WINDOWS_TEST_DEPENDENCIES) + $(WINDOWS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES) diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/make/tools.mk --- 1.2.21-5/modules/lsp-plugins-ab-tester/make/tools.mk 2025-03-01 12:42:55.024658998 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/make/tools.mk 2025-08-26 18:15:41.298026856 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/modules.mk 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/modules.mk --- 1.2.21-5/modules/lsp-plugins-ab-tester/modules.mk 2025-03-01 12:42:55.024658998 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/modules.mk 2025-08-26 18:15:41.298026856 +0000 @@ -19,99 +19,114 @@ # # Variables that describe dependencies -LSP_3RD_PARTY_VERSION := 1.0.21 +LSP_3RD_PARTY_VERSION := 1.0.23 LSP_3RD_PARTY_NAME := lsp-3rd-party LSP_3RD_PARTY_TYPE := hdr LSP_3RD_PARTY_INC_OPT := -idirafter LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_DSP_UNITS_VERSION := 1.0.28 +LSP_DSP_UNITS_VERSION := 1.0.30 LSP_DSP_UNITS_NAME := lsp-dsp-units LSP_DSP_UNITS_TYPE := src LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_R3D_BASE_LIB_VERSION := 1.0.23 +LSP_R3D_BASE_LIB_VERSION := 1.0.25 LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib LSP_R3D_BASE_LIB_TYPE := src LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git -LSP_R3D_IFACE_VERSION := 1.0.23 +LSP_R3D_IFACE_VERSION := 1.0.25 LSP_R3D_IFACE_NAME := lsp-r3d-iface LSP_R3D_IFACE_TYPE := src LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git -LSP_R3D_GLX_LIB_VERSION := 1.0.23 +LSP_R3D_GLX_LIB_VERSION := 1.0.25 LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib LSP_R3D_GLX_LIB_TYPE := bin LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git -LSP_R3D_WGL_LIB_VERSION := 1.0.18 +LSP_R3D_WGL_LIB_VERSION := 1.0.20 LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib LSP_R3D_WGL_LIB_TYPE := bin LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git -LSP_TK_LIB_VERSION := 1.0.27 +LSP_TK_LIB_VERSION := 1.0.29 LSP_TK_LIB_NAME := lsp-tk-lib LSP_TK_LIB_TYPE := src LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git -LSP_WS_LIB_VERSION := 1.0.27 +LSP_WS_LIB_VERSION := 1.0.29 LSP_WS_LIB_NAME := lsp-ws-lib LSP_WS_LIB_TYPE := src LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git # Plugin-related module dependencies -LSP_PLUGIN_FW_VERSION := 1.0.29 +LSP_PLUGIN_FW_VERSION := 1.0.31 LSP_PLUGIN_FW_NAME := lsp-plugin-fw LSP_PLUGIN_FW_TYPE := src LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git LSP_PLUGIN_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git -LSP_PLUGINS_SHARED_VERSION := 1.0.28 +LSP_PLUGINS_SHARED_VERSION := 1.0.30 LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared LSP_PLUGINS_SHARED_TYPE := src LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git LSP_PLUGINS_SHARED_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git # System libraries +LIBAUDIOTOOLBOX_VERSION := system +LIBAUDIOTOOLBOX_NAME := libaudiotoolbox +LIBAUDIOTOOLBOX_TYPE := opt +LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox + +LIBCOCOA_VERSION := system +LIBCOCOA_NAME := libcocoa +LIBCOCOA_TYPE := opt +LIBCOCOA_LDFLAGS := -framework Cocoa + +LIBCOREFOUNDATION_VERSION := system +LIBCOREFOUNDATION_NAME := libcorefoundation +LIBCOREFOUNDATION_TYPE := opt +LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation + LIBADVAPI_VERSION := system LIBADVAPI_NAME := libadvapi32 LIBADVAPI_TYPE := opt diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/project.mk 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/project.mk --- 1.2.21-5/modules/lsp-plugins-ab-tester/project.mk 2025-03-01 12:42:55.024658998 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/project.mk 2025-08-26 18:15:41.298026856 +0000 @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Template Plugin ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.16 +ARTIFACT_VERSION = 1.0.18 Binary files 1.2.21-5/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x2_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x2_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x2_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x2_stereo.png differ Binary files 1.2.21-5/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x4_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x4_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x4_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x4_stereo.png differ Binary files 1.2.21-5/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x8_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x8_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x8_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/res/doc/screenshots/ab_tester_x8_stereo.png differ diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/src/doc/manuals/plugins/ab_tester.php 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/src/doc/manuals/plugins/ab_tester.php --- 1.2.21-5/modules/lsp-plugins-ab-tester/src/doc/manuals/plugins/ab_tester.php 2025-03-01 12:42:55.028658975 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/src/doc/manuals/plugins/ab_tester.php 2025-08-26 18:15:41.302026817 +0000 @@ -30,7 +30,7 @@
  • Blind test - toggles the blind test mode.
  • Reset rate - allows to simply reset all ratings values to default values.
    • -
  • Mono - converts stereo output to mono output for testing mono compatiblity.
    • +
  • Mono - converts stereo output to mono output for testing mono compatibility.
  • Mute - mutes the output and deselects any channel as being A/B tested.
    • diff -pruN 1.2.21-5/modules/lsp-plugins-ab-tester/src/main/meta/ab_tester.cpp 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/src/main/meta/ab_tester.cpp --- 1.2.21-5/modules/lsp-plugins-ab-tester/src/main/meta/ab_tester.cpp 2025-03-01 12:42:55.028658975 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-ab-tester/src/main/meta/ab_tester.cpp 2025-08-26 18:15:41.302026817 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-ab-tester * Created on: 25 нояб. 2020 г. @@ -25,7 +25,7 @@ #define LSP_PLUGINS_AB_TESTER_VERSION_MAJOR 1 #define LSP_PLUGINS_AB_TESTER_VERSION_MINOR 0 -#define LSP_PLUGINS_AB_TESTER_VERSION_MICRO 16 +#define LSP_PLUGINS_AB_TESTER_VERSION_MICRO 18 #define LSP_PLUGINS_AB_TESTER_VERSION \ LSP_MODULE_VERSION( \ @@ -41,44 +41,44 @@ namespace lsp //------------------------------------------------------------------------- // Plugin metadata - #define BLIND_SWITCH(id, label, enable) \ - SWITCH("bte" id, "Blind test enable " label, enable), \ + #define BLIND_SWITCH(id, label, alias, enable) \ + SWITCH("bte" id, "Blind test enable " label, "Test on" alias, enable), \ - #define NO_BLIND_SWITCH(id, label, enable) + #define NO_BLIND_SWITCH(id, label, alias, enable) - #define ABTEST_MONO_CHANNEL(id, label, blind_switch, bte) \ + #define ABTEST_MONO_CHANNEL(id, label, alias, blind_switch, bte) \ AUDIO_INPUT("in" id, "Audio input " label), \ OPT_RETURN_MONO("ret" id, "rin" id, "Audio return " label), \ - AMP_GAIN100("g" id, "Input gain " label, 1.0), \ + AMP_GAIN100("g" id, "Input gain " label, "In gain" alias, 1.0), \ METER_GAIN("ism" id, "Input signal meter " label, GAIN_AMP_P_48_DB), \ - blind_switch(id, label, bte) \ - INT_CONTROL("rate" id, "Channel blind test rate " label, U_NONE, meta::ab_tester::RATE) + blind_switch(id, label, alias, bte) \ + INT_CONTROL("rate" id, "Channel blind test rate " label, "Rate" alias, U_NONE, meta::ab_tester::RATE) - #define ABTEST_STEREO_CHANNEL(id, label, blind_switch, bte) \ + #define ABTEST_STEREO_CHANNEL(id, label, alias, blind_switch, bte) \ AUDIO_INPUT("in" id "l", "Audio input " label " Left"), \ AUDIO_INPUT("in" id "r", "Audio input " label " Right"), \ OPT_RETURN_STEREO("ret" id, "rin" id, "Audio return " label), \ - AMP_GAIN100("g" id, "Input gain " label, 1.0), \ + AMP_GAIN100("g" id, "Input gain " label, "In gain" alias, 1.0), \ METER_GAIN("ism" id "l", "Input signal meter " label " Left", GAIN_AMP_P_48_DB), \ METER_GAIN("ism" id "r", "Input signal meter " label " Right", GAIN_AMP_P_48_DB), \ - blind_switch(id, label, bte) \ - INT_CONTROL("rate" id, "Channel blind test rate " label, U_NONE, meta::ab_tester::RATE) \ + blind_switch(id, label, alias, bte) \ + INT_CONTROL("rate" id, "Channel blind test rate " label, "Rate" alias, U_NONE, meta::ab_tester::RATE) \ #define ABTEST_GLOBAL(max_sel) \ - TRIGGER("rst", "Reset channel rating"), \ - SWITCH("bte", "Blind test enable", 0.0), \ - TRIGGER("shuf", "Re-shuffle channels"), \ - INT_CONTROL_RANGE("sel", "Channel selector", U_NONE, 0, max_sel, 0, 1) + TRIGGER("rst", "Reset channel rating", "Reset"), \ + SWITCH("bte", "Blind test enable", "Blind test", 0.0), \ + TRIGGER("shuf", "Re-shuffle channels", "Shuffle"), \ + INT_CONTROL_ALL("sel", "Channel selector", "Channel selector", U_NONE, 0, max_sel, 0, 1) #define ABTEST_MONO_SWITCH \ - SWITCH("mono", "Mono switch", 0.0f) + SWITCH("mono", "Mono switch", "Mono", 0.0f) static const port_t ab_tester_x2_mono_ports[] = { AUDIO_OUTPUT_MONO, ABTEST_GLOBAL(3), - ABTEST_MONO_CHANNEL("_1", "1", NO_BLIND_SWITCH, 1.0), - ABTEST_MONO_CHANNEL("_2", "2", NO_BLIND_SWITCH, 1.0), + ABTEST_MONO_CHANNEL("_1", "1", " 1", NO_BLIND_SWITCH, 1.0), + ABTEST_MONO_CHANNEL("_2", "2", " 2", NO_BLIND_SWITCH, 1.0), PORTS_END }; @@ -86,10 +86,10 @@ namespace lsp { AUDIO_OUTPUT_MONO, ABTEST_GLOBAL(5), - ABTEST_MONO_CHANNEL("_1", "1", BLIND_SWITCH, 1.0), - ABTEST_MONO_CHANNEL("_2", "2", BLIND_SWITCH, 1.0), - ABTEST_MONO_CHANNEL("_3", "3", BLIND_SWITCH, 0.0), - ABTEST_MONO_CHANNEL("_4", "4", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_1", "1", " 1", BLIND_SWITCH, 1.0), + ABTEST_MONO_CHANNEL("_2", "2", " 2", BLIND_SWITCH, 1.0), + ABTEST_MONO_CHANNEL("_3", "3", " 3", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_4", "4", " 4", BLIND_SWITCH, 0.0), PORTS_END }; @@ -97,14 +97,14 @@ namespace lsp { AUDIO_OUTPUT_MONO, ABTEST_GLOBAL(9), - ABTEST_MONO_CHANNEL("_1", "1", BLIND_SWITCH, 1.0), - ABTEST_MONO_CHANNEL("_2", "2", BLIND_SWITCH, 1.0), - ABTEST_MONO_CHANNEL("_3", "3", BLIND_SWITCH, 0.0), - ABTEST_MONO_CHANNEL("_4", "4", BLIND_SWITCH, 0.0), - ABTEST_MONO_CHANNEL("_5", "5", BLIND_SWITCH, 0.0), - ABTEST_MONO_CHANNEL("_6", "6", BLIND_SWITCH, 0.0), - ABTEST_MONO_CHANNEL("_7", "7", BLIND_SWITCH, 0.0), - ABTEST_MONO_CHANNEL("_8", "8", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_1", "1", " 1", BLIND_SWITCH, 1.0), + ABTEST_MONO_CHANNEL("_2", "2", " 2", BLIND_SWITCH, 1.0), + ABTEST_MONO_CHANNEL("_3", "3", " 3", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_4", "4", " 4", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_5", "5", " 5", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_6", "6", " 6", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_7", "7", " 7", BLIND_SWITCH, 0.0), + ABTEST_MONO_CHANNEL("_8", "8", " 8", BLIND_SWITCH, 0.0), PORTS_END }; @@ -113,8 +113,8 @@ namespace lsp AUDIO_OUTPUT_STEREO, ABTEST_GLOBAL(3), ABTEST_MONO_SWITCH, - ABTEST_STEREO_CHANNEL("_1", "1", NO_BLIND_SWITCH, 1.0), - ABTEST_STEREO_CHANNEL("_2", "2", NO_BLIND_SWITCH, 1.0), + ABTEST_STEREO_CHANNEL("_1", "1", " 1", NO_BLIND_SWITCH, 1.0), + ABTEST_STEREO_CHANNEL("_2", "2", " 2", NO_BLIND_SWITCH, 1.0), PORTS_END }; @@ -123,10 +123,10 @@ namespace lsp AUDIO_OUTPUT_STEREO, ABTEST_GLOBAL(5), ABTEST_MONO_SWITCH, - ABTEST_STEREO_CHANNEL("_1", "1", BLIND_SWITCH, 1.0), - ABTEST_STEREO_CHANNEL("_2", "2", BLIND_SWITCH, 1.0), - ABTEST_STEREO_CHANNEL("_3", "3", BLIND_SWITCH, 0.0), - ABTEST_STEREO_CHANNEL("_4", "4", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_1", "1", " 1", BLIND_SWITCH, 1.0), + ABTEST_STEREO_CHANNEL("_2", "2", " 2", BLIND_SWITCH, 1.0), + ABTEST_STEREO_CHANNEL("_3", "3", " 3", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_4", "4", " 4", BLIND_SWITCH, 0.0), PORTS_END }; @@ -135,14 +135,14 @@ namespace lsp AUDIO_OUTPUT_STEREO, ABTEST_GLOBAL(9), ABTEST_MONO_SWITCH, - ABTEST_STEREO_CHANNEL("_1", "1", BLIND_SWITCH, 1.0), - ABTEST_STEREO_CHANNEL("_2", "2", BLIND_SWITCH, 1.0), - ABTEST_STEREO_CHANNEL("_3", "3", BLIND_SWITCH, 0.0), - ABTEST_STEREO_CHANNEL("_4", "4", BLIND_SWITCH, 0.0), - ABTEST_STEREO_CHANNEL("_5", "5", BLIND_SWITCH, 0.0), - ABTEST_STEREO_CHANNEL("_6", "6", BLIND_SWITCH, 0.0), - ABTEST_STEREO_CHANNEL("_7", "7", BLIND_SWITCH, 0.0), - ABTEST_STEREO_CHANNEL("_8", "8", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_1", "1", " 1", BLIND_SWITCH, 1.0), + ABTEST_STEREO_CHANNEL("_2", "2", " 2", BLIND_SWITCH, 1.0), + ABTEST_STEREO_CHANNEL("_3", "3", " 3", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_4", "4", " 4", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_5", "5", " 5", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_6", "6", " 6", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_7", "7", " 7", BLIND_SWITCH, 0.0), + ABTEST_STEREO_CHANNEL("_8", "8", " 8", BLIND_SWITCH, 0.0), PORTS_END }; diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-plugins-art-delay/.github/workflows/build.yml 2025-03-01 12:43:01.044622863 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/.github/workflows/build.yml 2025-08-26 18:15:46.525976117 +0000 @@ -147,7 +147,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -164,7 +164,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -221,3 +221,17 @@ jobs: shell: msys2 {0} run: make VERBOSE=1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui' + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/CHANGELOG --- 1.2.21-5/modules/lsp-plugins-art-delay/CHANGELOG 2025-03-01 12:43:01.048622839 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/CHANGELOG 2025-08-26 18:15:46.525976117 +0000 @@ -2,6 +2,12 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.27 === +* Updated build scripts and dependencies. + +=== 1.0.26 === +* Updated build scripts and dependencies. + === 1.0.25 === * Updated build scripts and dependencies. diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/dependencies.mk 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/dependencies.mk --- 1.2.21-5/modules/lsp-plugins-art-delay/dependencies.mk 2025-03-01 12:43:01.048622839 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/dependencies.mk 2025-08-26 18:15:46.525976117 +0000 @@ -114,14 +114,35 @@ ifeq ($(PLATFORM),Windows) endif #------------------------------------------------------------------------------ +# MacOS dependencies +MACOS_DEPENDENCIES = \ + LIBAUDIOTOOLBOX \ + LIBCAIRO \ + LIBCOCOA \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBICONV \ + LIBJACK + +MACOS_TEST_DEPENDENCIES = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES += $(MACOS_DEPENDENCIES) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES) \ $(LINUX_DEPENDENCIES) \ $(BSD_DEPENDENCIES) \ $(WINDOWS_DEPENDENCIES) \ + $(MACOS_DEPENDENCIES) \ $(TEST_DEPENDENCIES) \ $(LINUX_TEST_DEPENDENCIES) \ $(BSD_TEST_DEPENDENCIES) \ - $(WINDOWS_TEST_DEPENDENCIES) + $(WINDOWS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES) diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/make/tools.mk --- 1.2.21-5/modules/lsp-plugins-art-delay/make/tools.mk 2025-03-01 12:43:01.048622839 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/make/tools.mk 2025-08-26 18:15:46.525976117 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/modules.mk 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/modules.mk --- 1.2.21-5/modules/lsp-plugins-art-delay/modules.mk 2025-03-01 12:43:01.048622839 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/modules.mk 2025-08-26 18:15:46.525976117 +0000 @@ -19,99 +19,114 @@ # # Variables that describe dependencies -LSP_3RD_PARTY_VERSION := 1.0.21 +LSP_3RD_PARTY_VERSION := 1.0.23 LSP_3RD_PARTY_NAME := lsp-3rd-party LSP_3RD_PARTY_TYPE := hdr LSP_3RD_PARTY_INC_OPT := -idirafter LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_DSP_UNITS_VERSION := 1.0.28 +LSP_DSP_UNITS_VERSION := 1.0.30 LSP_DSP_UNITS_NAME := lsp-dsp-units LSP_DSP_UNITS_TYPE := src LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_R3D_BASE_LIB_VERSION := 1.0.23 +LSP_R3D_BASE_LIB_VERSION := 1.0.25 LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib LSP_R3D_BASE_LIB_TYPE := src LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git -LSP_R3D_IFACE_VERSION := 1.0.23 +LSP_R3D_IFACE_VERSION := 1.0.25 LSP_R3D_IFACE_NAME := lsp-r3d-iface LSP_R3D_IFACE_TYPE := src LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git -LSP_R3D_GLX_LIB_VERSION := 1.0.23 +LSP_R3D_GLX_LIB_VERSION := 1.0.25 LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib LSP_R3D_GLX_LIB_TYPE := bin LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git -LSP_R3D_WGL_LIB_VERSION := 1.0.18 +LSP_R3D_WGL_LIB_VERSION := 1.0.20 LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib LSP_R3D_WGL_LIB_TYPE := bin LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git -LSP_TK_LIB_VERSION := 1.0.27 +LSP_TK_LIB_VERSION := 1.0.29 LSP_TK_LIB_NAME := lsp-tk-lib LSP_TK_LIB_TYPE := src LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git -LSP_WS_LIB_VERSION := 1.0.27 +LSP_WS_LIB_VERSION := 1.0.29 LSP_WS_LIB_NAME := lsp-ws-lib LSP_WS_LIB_TYPE := src LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git # Plugin-related module dependencies -LSP_PLUGIN_FW_VERSION := 1.0.29 +LSP_PLUGIN_FW_VERSION := 1.0.31 LSP_PLUGIN_FW_NAME := lsp-plugin-fw LSP_PLUGIN_FW_TYPE := src LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git LSP_PLUGIN_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git -LSP_PLUGINS_SHARED_VERSION := 1.0.28 +LSP_PLUGINS_SHARED_VERSION := 1.0.30 LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared LSP_PLUGINS_SHARED_TYPE := src LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git LSP_PLUGINS_SHARED_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git # System libraries +LIBAUDIOTOOLBOX_VERSION := system +LIBAUDIOTOOLBOX_NAME := libaudiotoolbox +LIBAUDIOTOOLBOX_TYPE := opt +LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox + +LIBCOCOA_VERSION := system +LIBCOCOA_NAME := libcocoa +LIBCOCOA_TYPE := opt +LIBCOCOA_LDFLAGS := -framework Cocoa + +LIBCOREFOUNDATION_VERSION := system +LIBCOREFOUNDATION_NAME := libcorefoundation +LIBCOREFOUNDATION_TYPE := opt +LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation + LIBADVAPI_VERSION := system LIBADVAPI_NAME := libadvapi32 LIBADVAPI_TYPE := opt diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/project.mk 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/project.mk --- 1.2.21-5/modules/lsp-plugins-art-delay/project.mk 2025-03-01 12:43:01.048622839 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/project.mk 2025-08-26 18:15:46.525976117 +0000 @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Artistic Delay Plugin Series ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.25 +ARTIFACT_VERSION = 1.0.27 Binary files 1.2.21-5/modules/lsp-plugins-art-delay/res/doc/screenshots/art_delay_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/res/doc/screenshots/art_delay_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-art-delay/res/doc/screenshots/art_delay_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/res/doc/screenshots/art_delay_stereo.png differ diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/src/doc/manuals/plugins/art_delay.php 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/src/doc/manuals/plugins/art_delay.php --- 1.2.21-5/modules/lsp-plugins-art-delay/src/doc/manuals/plugins/art_delay.php 2025-03-01 12:43:01.052622816 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/src/doc/manuals/plugins/art_delay.php 2025-08-26 18:15:46.533976039 +0000 @@ -15,8 +15,8 @@
  • Panning of each individual line.

    • Almost all parameters can be smootly automated.

    -

    The delay alows to set up to 256 seconds delay for each delay line. This may yield to huge memory -consumption. To get some memory economy, the memory is consumed in on-demand mode: the delay line +

    The delay allows to set up to 256 seconds delay for each delay line. This may yield huge memory +consumption. To economize memory consumption, the memory is consumed in on-demand mode: the delay line allocates memory only if it is turned on in the delay effect.

    The following restrictions are defined for parameters:

      @@ -51,7 +51,7 @@ allocates memory only if it is turned on Global Delay Line Controls section:
        -
      • On - enables the corresponding delay. When turned on, the desired memory area is allocated for the delay so it could +
      • On - enables the corresponding delay. When turned on, the desired memory area is allocated for the delay so it can operate in real-time mode. When turned off, the allocated memory gets freed.
      • Solo - turns the corresponding delay line into soloing mode. All other non-soloing delay lines become muted.
      • Mute - mutes the corresponding delay line.
        • @@ -96,7 +96,7 @@ allocates memory only if it is turned on
    • Delay Line Processing - the main delay controls.
        • -
      • On - enables the delay. When turned on, the desired memory area is allocated for the delay so it could +
      • On - enables the delay. When turned on, the desired memory area is allocated for the delay so it can operate in real-time mode. When turned off, the allocated memory gets freed.
      • Solo - turns the delay line into soloing mode. All other non-soloing delay lines become muted.
      • Mute - mutes the delay line.
        • diff -pruN 1.2.21-5/modules/lsp-plugins-art-delay/src/main/meta/art_delay.cpp 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/src/main/meta/art_delay.cpp --- 1.2.21-5/modules/lsp-plugins-art-delay/src/main/meta/art_delay.cpp 2025-03-01 12:43:01.052622816 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-art-delay/src/main/meta/art_delay.cpp 2025-08-26 18:15:46.533976039 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-art-delay * Created on: 3 авг. 2021 г. @@ -25,7 +25,7 @@ #define LSP_PLUGINS_ART_DELAY_VERSION_MAJOR 1 #define LSP_PLUGINS_ART_DELAY_VERSION_MINOR 0 -#define LSP_PLUGINS_ART_DELAY_VERSION_MICRO 25 +#define LSP_PLUGINS_ART_DELAY_VERSION_MICRO 27 #define LSP_PLUGINS_ART_DELAY_VERSION \ LSP_MODULE_VERSION( \ @@ -135,71 +135,71 @@ namespace lsp { NULL, NULL } }; - #define ART_PAN_MONO(id, label) \ - PAN_CTL("p" id, label " panorama", 0.0f) + #define ART_PAN_MONO(id, label, alias) \ + PAN_CTL("p" id, label " panorama", "Pan" alias, 0.0f) - #define ART_PAN_STEREO(id, label) \ - PAN_CTL("pl" id, label " left channel panorama", -100.0f), \ - PAN_CTL("pr" id, label " right channel panorama", 100.0f) + #define ART_PAN_STEREO(id, label, alias) \ + PAN_CTL("pl" id, label " left channel panorama", "Pan L" alias, -100.0f), \ + PAN_CTL("pr" id, label " right channel panorama", "Pan R" alias, 100.0f) #define ART_DELAY_COMMON(pan) \ BYPASS, \ - COMBO("lsel", "Delay line selector", 0, art_delay_lines), \ - COMBO("dmax", "Maximum possible delay selector", 3, art_delay_maxlen), \ - pan("_in", "Input"), \ + COMBO("lsel", "Delay line selector", "Delay selector", 0, art_delay_lines), \ + COMBO("dmax", "Maximum possible delay selector", "Max selector", 3, art_delay_maxlen), \ + pan("_in", "Input", " In"), \ DRY_GAIN(GAIN_AMP_0_DB), \ WET_GAIN(GAIN_AMP_0_DB), \ DRYWET(100.0f), \ - SWITCH("dry_on", "Dry enable", 1.0f), \ - SWITCH("wet_on", "Wet enable", 1.0f), \ - SWITCH("mono", "Mono output", 0.0f), \ - SWITCH("fb", "Feedback", 1.0f), \ - AMP_GAIN1("fbg", "Feedback gain", GAIN_AMP_0_DB), \ + SWITCH("dry_on", "Dry enable", "Dry on", 1.0f), \ + SWITCH("wet_on", "Wet enable", "Wet on", 1.0f), \ + SWITCH("mono", "Mono output", "Mono", 0.0f), \ + SWITCH("fb", "Feedback", "Feedback", 1.0f), \ + AMP_GAIN1("fbg", "Feedback gain", "Feed", GAIN_AMP_0_DB), \ OUT_GAIN, \ METER("dmaxv", "Actual delay maximum value", U_SEC, art_delay_metadata::DSEL), \ METER("memuse", "Overall memory usage", U_BYTES, art_delay_metadata::MEMORY) #define ART_DELAY_TEMPO(id) \ - CONTROL("tempo" #id, "Tempo " #id, U_BPM, art_delay_metadata::TEMPO), \ - COMBO("ratio" #id, "Tempo " #id " ratio", 0, art_delay_tempo_ratio), \ - SWITCH("sync" #id, "Tempo" #id " sync", 0.0f), \ + CONTROL("tempo" #id, "Tempo " #id, "Tempo " #id, U_BPM, art_delay_metadata::TEMPO), \ + COMBO("ratio" #id, "Tempo " #id " ratio", "Ratio " #id, 0, art_delay_tempo_ratio), \ + SWITCH("sync" #id, "Tempo" #id " sync", "Sync " #id, 0.0f), \ METER("atempo" #id, "Delay " #id " actual tempo", U_BPM, art_delay_metadata::ATEMPO) #define ART_DELAY_PROCESSOR(id, pan) \ - SWITCH("on" #id, "Delay " #id " on", 0.0f), \ - SWITCH("s" #id, "Delay " #id " solo", 0.0f), \ - SWITCH("m" #id, "Delay " #id " mute", 0.0f), \ - COMBO("dref" #id, "Delay " #id " reference", 0, art_delay_references), \ - CONTROL("drefm" #id, "Delay " #id " reference multiplier", U_NONE, art_delay_metadata::DELAY_MULT), \ - COMBO("tref" #id, "Delay " #id " tempo reference", 0, art_delay_tempo), \ - CONTROL("treff" #id, "Delay " #id " bar fraction", U_BAR, art_delay_metadata::DFRACTION), \ - INT_CONTROL("trefd" #id, "Delay " #id " bar denominator", U_BEAT, art_delay_metadata::DENOMINATOR), \ - CONTROL("trefm" #id, "Delay " #id " bar multiplier", U_NONE, art_delay_metadata::BAR_MULT), \ - CONTROL("frac" #id, "Delay " #id " fraction", U_BAR, art_delay_metadata::FRACTION), \ - INT_CONTROL("den" #id, "Delay " #id " denominator", U_BEAT, art_delay_metadata::DENOMINATOR), \ - CONTROL("dadd" #id, "Delay " #id " time addition", U_SEC, art_delay_metadata::TIME), \ - SWITCH("eq" #id, "Equalizer " #id " on", 0.0f), \ - SWITCH("lc" #id, "Delay " #id " low-cut filter", 0.0f), \ - LOG_CONTROL("flc" #id, "Delay " #id " low-cut frequency", U_HZ, art_delay_metadata::LOW_CUT), \ - SWITCH("hc" #id, "Delay " #id " high-cut filter", 0.0f), \ - LOG_CONTROL("fhc" #id, "Delay " #id " high-cut frequency", U_HZ, art_delay_metadata::HIGH_CUT), \ - LOG_CONTROL("fbs" #id, "Delay " #id " sub-bass", U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ - LOG_CONTROL("fbb" #id, "Delay " #id " bass", U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ - LOG_CONTROL("fbm" #id, "Delay " #id " middle", U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ - LOG_CONTROL("fbp" #id, "Delay " #id " presence", U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ - LOG_CONTROL("fbt" #id, "Delay " #id " treble", U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ - pan(#id, "Delay " #id), \ - AMP_GAIN10("dg" #id, "Delay " #id " gain", GAIN_AMP_0_DB), \ + SWITCH("on" #id, "Delay " #id " on", "Delay on " #id, 0.0f), \ + SWITCH("s" #id, "Delay " #id " solo", "Solo " #id, 0.0f), \ + SWITCH("m" #id, "Delay " #id " mute", "Mute " #id, 0.0f), \ + COMBO("dref" #id, "Delay " #id " reference", "Reference " #id, 0, art_delay_references), \ + CONTROL("drefm" #id, "Delay " #id " reference multiplier", "Ref mul " #id, U_NONE, art_delay_metadata::DELAY_MULT), \ + COMBO("tref" #id, "Delay " #id " tempo reference", "Tempo ref " #id, 0, art_delay_tempo), \ + CONTROL("treff" #id, "Delay " #id " bar fraction", "Bar frac " #id, U_BAR, art_delay_metadata::DFRACTION), \ + INT_CONTROL("trefd" #id, "Delay " #id " bar denominator", "Bar denom " #id, U_BEAT, art_delay_metadata::DENOMINATOR), \ + CONTROL("trefm" #id, "Delay " #id " bar multiplier", "Bar mul " #id, U_NONE, art_delay_metadata::BAR_MULT), \ + CONTROL("frac" #id, "Delay " #id " fraction", "Frac " #id, U_BAR, art_delay_metadata::FRACTION), \ + INT_CONTROL("den" #id, "Delay " #id " denominator", "Denom " #id, U_BEAT, art_delay_metadata::DENOMINATOR), \ + CONTROL("dadd" #id, "Delay " #id " time addition", "Add " #id, U_SEC, art_delay_metadata::TIME), \ + SWITCH("eq" #id, "Equalizer " #id " on", "Eqon " #id, 0.0f), \ + SWITCH("lc" #id, "Delay " #id " low-cut filter", "LCF on " #id, 0.0f), \ + LOG_CONTROL("flc" #id, "Delay " #id " low-cut frequency", "LCF freq " #id, U_HZ, art_delay_metadata::LOW_CUT), \ + SWITCH("hc" #id, "Delay " #id " high-cut filter", "HCF on " #id, 0.0f), \ + LOG_CONTROL("fhc" #id, "Delay " #id " high-cut frequency", "HCF freq " #id, U_HZ, art_delay_metadata::HIGH_CUT), \ + LOG_CONTROL("fbs" #id, "Delay " #id " sub-bass", "Sub lvl " #id, U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ + LOG_CONTROL("fbb" #id, "Delay " #id " bass", "Bass lvl " #id, U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ + LOG_CONTROL("fbm" #id, "Delay " #id " middle", "Mid lvl " #id, U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ + LOG_CONTROL("fbp" #id, "Delay " #id " presence", "Presence lvl " #id, U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ + LOG_CONTROL("fbt" #id, "Delay " #id " treble", "Treble lvl " #id, U_GAIN_AMP, art_delay_metadata::BAND_GAIN), \ + pan(#id, "Delay " #id, " " #id), \ + AMP_GAIN10("dg" #id, "Delay " #id " gain", "Gain " #id, GAIN_AMP_0_DB), \ HUE_CTL("hue" #id, "Delay " #id " hue", float(id) / art_delay_metadata::MAX_PROCESSORS ), \ - SWITCH("fbe" #id, "Delay " #id " feedback enable", 0.0f), \ - AMP_GAIN1("fbg" #id, "Delay " #id " feedback gain", GAIN_AMP_M_INF_DB), \ - COMBO("fbtr" #id, "Delay " #id " feedback tempo reference", 0, art_delay_tempo), \ - CONTROL("fbbf" #id, "Delay " #id " feedback bar fraction", U_BAR, art_delay_metadata::DFRACTION), \ - INT_CONTROL("fbbd" #id, "Delay " #id " feedback bar denominator", U_BEAT, art_delay_metadata::DENOMINATOR), \ - CONTROL("fbbm" #id, "Delay " #id " feedback bar multiplier", U_NONE, art_delay_metadata::BAR_MULT), \ - CONTROL("fbf" #id, "Delay " #id " feedback fraction", U_BAR, art_delay_metadata::FRACTION), \ - INT_CONTROL("fbd" #id, "Delay " #id " feedback denominator", U_BEAT, art_delay_metadata::DENOMINATOR), \ - CONTROL("fbadd" #id, "Delay " #id " feedback time addition", U_SEC, art_delay_metadata::TIME), \ + SWITCH("fbe" #id, "Delay " #id " feedback enable", "Feed on " #id, 0.0f), \ + AMP_GAIN1("fbg" #id, "Delay " #id " feedback gain", "Feed " #id, GAIN_AMP_M_INF_DB), \ + COMBO("fbtr" #id, "Delay " #id " feedback tempo reference", "Feed ref " #id, 0, art_delay_tempo), \ + CONTROL("fbbf" #id, "Delay " #id " feedback bar fraction", "Feed bar frac" #id, U_BAR, art_delay_metadata::DFRACTION), \ + INT_CONTROL("fbbd" #id, "Delay " #id " feedback bar denominator", "Feed bar den " #id, U_BEAT, art_delay_metadata::DENOMINATOR), \ + CONTROL("fbbm" #id, "Delay " #id " feedback bar multiplier", "Feed bar mul " #id, U_NONE, art_delay_metadata::BAR_MULT), \ + CONTROL("fbf" #id, "Delay " #id " feedback fraction", "Feed frac " #id, U_BAR, art_delay_metadata::FRACTION), \ + INT_CONTROL("fbd" #id, "Delay " #id " feedback denominator", "Feed denom " #id, U_BEAT, art_delay_metadata::DENOMINATOR), \ + CONTROL("fbadd" #id, "Delay " #id " feedback time addition", "Feed add " #id, U_SEC, art_delay_metadata::TIME), \ METER("adt" #id, "Delay " #id " actual time", U_SEC, art_delay_metadata::DSEL), \ METER("afbt" #id, "Delay " #id " actual feedback time", U_SEC, art_delay_metadata::DSEL), \ BLINK("door" #id, "Delay " #id " out of range"), \ diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-plugins-autogain/.github/workflows/build.yml 2025-03-01 12:43:00.112628459 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/.github/workflows/build.yml 2025-08-26 18:15:46.433977010 +0000 @@ -147,7 +147,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -164,7 +164,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -221,3 +221,17 @@ jobs: shell: msys2 {0} run: make VERBOSE=1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui' + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/CHANGELOG --- 1.2.21-5/modules/lsp-plugins-autogain/CHANGELOG 2025-03-01 12:43:00.112628459 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/CHANGELOG 2025-08-26 18:15:46.433977010 +0000 @@ -2,6 +2,12 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.12 === +* Updated build scripts and dependencies. + +=== 1.0.11 === +* Updated build scripts and dependencies. + === 1.0.10 === * Updated build scripts and dependencies. diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/dependencies.mk 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/dependencies.mk --- 1.2.21-5/modules/lsp-plugins-autogain/dependencies.mk 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/dependencies.mk 2025-08-26 18:15:46.433977010 +0000 @@ -114,14 +114,35 @@ ifeq ($(PLATFORM),Windows) endif #------------------------------------------------------------------------------ +# MacOS dependencies +MACOS_DEPENDENCIES = \ + LIBAUDIOTOOLBOX \ + LIBCAIRO \ + LIBCOCOA \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBICONV \ + LIBJACK + +MACOS_TEST_DEPENDENCIES = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES += $(MACOS_DEPENDENCIES) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES) \ $(LINUX_DEPENDENCIES) \ $(BSD_DEPENDENCIES) \ $(WINDOWS_DEPENDENCIES) \ + $(MACOS_DEPENDENCIES) \ $(TEST_DEPENDENCIES) \ $(LINUX_TEST_DEPENDENCIES) \ $(BSD_TEST_DEPENDENCIES) \ - $(WINDOWS_TEST_DEPENDENCIES) + $(WINDOWS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES) diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/make/tools.mk --- 1.2.21-5/modules/lsp-plugins-autogain/make/tools.mk 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/make/tools.mk 2025-08-26 18:15:46.437976971 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/modules.mk 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/modules.mk --- 1.2.21-5/modules/lsp-plugins-autogain/modules.mk 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/modules.mk 2025-08-26 18:15:46.437976971 +0000 @@ -19,99 +19,114 @@ # # Variables that describe dependencies -LSP_3RD_PARTY_VERSION := 1.0.21 +LSP_3RD_PARTY_VERSION := 1.0.23 LSP_3RD_PARTY_NAME := lsp-3rd-party LSP_3RD_PARTY_TYPE := hdr LSP_3RD_PARTY_INC_OPT := -idirafter LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_DSP_UNITS_VERSION := 1.0.28 +LSP_DSP_UNITS_VERSION := 1.0.30 LSP_DSP_UNITS_NAME := lsp-dsp-units LSP_DSP_UNITS_TYPE := src LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_R3D_BASE_LIB_VERSION := 1.0.23 +LSP_R3D_BASE_LIB_VERSION := 1.0.25 LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib LSP_R3D_BASE_LIB_TYPE := src LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git -LSP_R3D_IFACE_VERSION := 1.0.23 +LSP_R3D_IFACE_VERSION := 1.0.25 LSP_R3D_IFACE_NAME := lsp-r3d-iface LSP_R3D_IFACE_TYPE := src LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git -LSP_R3D_GLX_LIB_VERSION := 1.0.23 +LSP_R3D_GLX_LIB_VERSION := 1.0.25 LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib LSP_R3D_GLX_LIB_TYPE := bin LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git -LSP_R3D_WGL_LIB_VERSION := 1.0.18 +LSP_R3D_WGL_LIB_VERSION := 1.0.20 LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib LSP_R3D_WGL_LIB_TYPE := bin LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git -LSP_TK_LIB_VERSION := 1.0.27 +LSP_TK_LIB_VERSION := 1.0.29 LSP_TK_LIB_NAME := lsp-tk-lib LSP_TK_LIB_TYPE := src LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git -LSP_WS_LIB_VERSION := 1.0.27 +LSP_WS_LIB_VERSION := 1.0.29 LSP_WS_LIB_NAME := lsp-ws-lib LSP_WS_LIB_TYPE := src LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git # Plugin-related module dependencies -LSP_PLUGIN_FW_VERSION := 1.0.29 +LSP_PLUGIN_FW_VERSION := 1.0.31 LSP_PLUGIN_FW_NAME := lsp-plugin-fw LSP_PLUGIN_FW_TYPE := src LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git LSP_PLUGIN_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git -LSP_PLUGINS_SHARED_VERSION := 1.0.28 +LSP_PLUGINS_SHARED_VERSION := 1.0.30 LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared LSP_PLUGINS_SHARED_TYPE := src LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git LSP_PLUGINS_SHARED_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git # System libraries +LIBAUDIOTOOLBOX_VERSION := system +LIBAUDIOTOOLBOX_NAME := libaudiotoolbox +LIBAUDIOTOOLBOX_TYPE := opt +LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox + +LIBCOCOA_VERSION := system +LIBCOCOA_NAME := libcocoa +LIBCOCOA_TYPE := opt +LIBCOCOA_LDFLAGS := -framework Cocoa + +LIBCOREFOUNDATION_VERSION := system +LIBCOREFOUNDATION_NAME := libcorefoundation +LIBCOREFOUNDATION_TYPE := opt +LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation + LIBADVAPI_VERSION := system LIBADVAPI_NAME := libadvapi32 LIBADVAPI_TYPE := opt diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/project.mk 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/project.mk --- 1.2.21-5/modules/lsp-plugins-autogain/project.mk 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/project.mk 2025-08-26 18:15:46.437976971 +0000 @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Automatic Gain Control Plugin Series ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.10 +ARTIFACT_VERSION = 1.0.12 diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/autogain_mono.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/autogain_mono.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/autogain_mono.cfg 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/autogain_mono.cfg 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -# ------------------------------------------------------------------------------- -# This file contains configuration of the audio plugin. -# Package: test (Test Case) -# Package version: 0.0.0-devel -# Plugin name: Autogain Mono (Autogain Mono) -# Plugin version: 1.0.0 -# UID: autogain_mono -# LV2 URI: http://lsp-plug.in/plugins/lv2/autogain_mono -# VST identifier: ag1m -# LADSPA identifier: 5002274 -# LADSPA label: http://lsp-plug.in/plugins/ladspa/autogain_mono -# -# (C) Linux Studio Plugins -# https://lsp-plug.in/ -# -# ------------------------------------------------------------------------------- - -# Bypass [boolean]: true/false -bypass = false - -# Sidechain preamp [dB]: -60.00000000..40.00000000 -preamp = 0.00 db - -# Sidechain lookahead [ms]: 0.00000000..40.00000000 -lkahead = 0.00000 - -# Loudness measuring long period [ms]: 100.00000000..2000.00000000 -lperiod = 400.00000 - -# Loudness measuring short period [ms]: 5.00000000..100.00000000 -speriod = 20.00000 - -# Weighting function: 0..5 -# 0: None -# 1: A-Weighted -# 2: B-Weighted -# 3: C-Weighted -# 4: D-Weighted -# 5: K-Weighted -weight = 5 - -# Desired loudness level [LUFS]: -60.00000000..0.00000000 -level = -23.00000 - -# Level drift [dB]: 0.00000000..24.00000000 -drift = 12.00 db - -# The level of silence [LUFS]: -84.00000000..-36.00000000 -silence = -72.00000 - -# Enable maximum amplification gain limitation [boolean]: true/false -max_on = false - -# The maximum amplification gain [dB]: 0.00000000..108.00000000 -max_amp = 36.00 db - -# Enable quick amplifier [boolean]: true/false -qamp = false - -# Long gain grow amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vgrow_l = 5 - -# Long gain grow time [ms]: 10.00000000..10000.00000000 -tgrow_l = 500.00000 - -# Long gain fall amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vfall_l = 5 - -# Long gain fall time [ms]: 10.00000000..10000.00000000 -tfall_l = 500.00000 - -# Short gain grow amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vgrow_s = 5 - -# Short gain grow time [ms]: 1.00000000..500.00000000 -tgrow_s = 40.00000 - -# Short gain fall amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vfall_s = 5 - -# Short gain fall time [ms]: 0.10000000..40.00000000 -tfall_s = 10.00000 - -# Input metering enable for long period [boolean]: true/false -e_in_l = true - -# Input metering enable for short period [boolean]: true/false -e_in_s = true - -# Output metering enable for long period [boolean]: true/false -e_out_l = true - -# Output metering enable for short period [boolean]: true/false -e_out_s = true - -# Gain correction metering [boolean]: true/false -e_g = true - - -# ------------------------------------------------------------------------------- -# KVT parameters -# ------------------------------------------------------------------------------- - - -# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/autogain_stereo.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/autogain_stereo.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/autogain_stereo.cfg 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/autogain_stereo.cfg 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -# ------------------------------------------------------------------------------- -# This file contains configuration of the audio plugin. -# Package: test (Test Case) -# Package version: 0.0.0-devel -# Plugin name: Autogain Stereo (Autogain Stereo) -# Plugin version: 1.0.0 -# UID: autogain_stereo -# LV2 URI: http://lsp-plug.in/plugins/lv2/autogain_stereo -# VST identifier: ag1s -# LADSPA identifier: 5002275 -# LADSPA label: http://lsp-plug.in/plugins/ladspa/autogain_stereo -# -# (C) Linux Studio Plugins -# https://lsp-plug.in/ -# -# ------------------------------------------------------------------------------- - -# Bypass [boolean]: true/false -bypass = false - -# Sidechain preamp [dB]: -60.00000000..40.00000000 -preamp = 0.00 db - -# Sidechain lookahead [ms]: 0.00000000..40.00000000 -lkahead = 0.00000 - -# Loudness measuring long period [ms]: 100.00000000..2000.00000000 -lperiod = 400.00000 - -# Loudness measuring short period [ms]: 5.00000000..100.00000000 -speriod = 20.00000 - -# Weighting function: 0..5 -# 0: None -# 1: A-Weighted -# 2: B-Weighted -# 3: C-Weighted -# 4: D-Weighted -# 5: K-Weighted -weight = 5 - -# Desired loudness level [LUFS]: -60.00000000..0.00000000 -level = -23.00000 - -# Level drift [dB]: 0.00000000..24.00000000 -drift = 12.00 db - -# The level of silence [LUFS]: -84.00000000..-36.00000000 -silence = -72.00000 - -# Enable maximum amplification gain limitation [boolean]: true/false -max_on = false - -# The maximum amplification gain [dB]: 0.00000000..108.00000000 -max_amp = 36.00 db - -# Enable quick amplifier [boolean]: true/false -qamp = false - -# Long gain grow amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vgrow_l = 5 - -# Long gain grow time [ms]: 10.00000000..10000.00000000 -tgrow_l = 500.00000 - -# Long gain fall amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vfall_l = 5 - -# Long gain fall time [ms]: 10.00000000..10000.00000000 -tfall_l = 500.00000 - -# Short gain grow amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vgrow_s = 5 - -# Short gain grow time [ms]: 1.00000000..500.00000000 -tgrow_s = 40.00000 - -# Short gain fall amount: 0..10 -# 0: 1 dB -# 1: 3 dB -# 2: 6 dB -# 3: 9 dB -# 4: 10 dB -# 5: 12 dB -# 6: 15 dB -# 7: 18 dB -# 8: 20 dB -# 9: 21 dB -# 10: 24 dB -vfall_s = 5 - -# Short gain fall time [ms]: 0.10000000..40.00000000 -tfall_s = 10.00000 - -# Input metering enable for long period [boolean]: true/false -e_in_l = true - -# Input metering enable for short period [boolean]: true/false -e_in_s = true - -# Output metering enable for long period [boolean]: true/false -e_out_l = true - -# Output metering enable for short period [boolean]: true/false -e_out_s = true - -# Gain correction metering [boolean]: true/false -e_g = true - - -# ------------------------------------------------------------------------------- -# KVT parameters -# ------------------------------------------------------------------------------- - - -# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_mono.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_mono.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_mono.cfg 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_mono.cfg 1970-01-01 00:00:00.000000000 +0000 @@ -1,170 +0,0 @@ -# ------------------------------------------------------------------------------- -# This file contains configuration of the audio plugin. -# Package: test (Test Case) -# Package version: 0.0.0-devel -# Plugin name: Sidechain Autogain Mono (Sidechain Autogain Mono) -# Plugin version: 1.0.3 -# UID: sc_autogain_mono -# LV2 URI: http://lsp-plug.in/plugins/lv2/sc_autogain_mono -# VST 2.x identifier: ag1M -# VST 3.x identifier: 6473702073636167316D20206167314D -# LADSPA identifier: 5002276 -# LADSPA label: http://lsp-plug.in/plugins/ladspa/sc_autogain_mono -# -# (C) Test Case -# https://lsp-plug.in/ -# -# ------------------------------------------------------------------------------- - -# Bypass [boolean]: true/false -bypass = false - -# Sidechain preamp [dB]: -60.00000000..40.00000000 -preamp = 0.00000 - -# Sidechain lookahead [ms]: 0.00000000..40.00000000 -lkahead = 0.00000 - -# Sidechain mode: 0..2 -# 0: Internal -# 1: Control -# 2: Match -scmode = 2 - -# Sidechain metering enable for long period [boolean]: true/false -e_sc_l = true - -# Sidechain metering enable for short period [boolean]: true/false -e_sc_s = true - -# Loudness measuring long period [ms]: 100.00000000..2000.00000000 -lperiod = 400.00000 - -# Loudness measuring short period [ms]: 5.00000000..100.00000000 -speriod = 20.00000 - -# Weighting function: 0..5 -# 0: None -# 1: A-Weighted -# 2: B-Weighted -# 3: C-Weighted -# 4: D-Weighted -# 5: K-Weighted -weight = 5 - -# Desired loudness level [LUFS]: -60.00000000..0.00000000 -level = -23.00000 - -# Level drift [dB]: 0.00000000..24.00000000 -drift = 12.00000 - -# The level of silence [LUFS]: -84.00000000..-36.00000000 -silence = -72.00000 - -# Enable maximum amplification gain limitation [boolean]: true/false -max_on = false - -# The maximum amplification gain [dB]: 0.00000000..108.00000000 -max_amp = 36.00000 - -# Enable quick amplifier [boolean]: true/false -qamp = false - -# Long gain grow amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vgrow_l = 5 - -# Long gain grow time [ms]: 10.00000000..10000.00000000 -tgrow_l = 500.00000 - -# Long gain fall amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vfall_l = 5 - -# Long gain fall time [ms]: 10.00000000..10000.00000000 -tfall_l = 500.00000 - -# Short gain grow amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vgrow_s = 5 - -# Short gain grow time [ms]: 1.00000000..500.00000000 -tgrow_s = 40.00000 - -# Short gain fall amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vfall_s = 5 - -# Short gain fall time [ms]: 0.10000000..40.00000000 -tfall_s = 10.00000 - -# Input metering enable for long period [boolean]: true/false -e_in_l = true - -# Input metering enable for short period [boolean]: true/false -e_in_s = true - -# Output metering enable for long period [boolean]: true/false -e_out_l = true - -# Output metering enable for short period [boolean]: true/false -e_out_s = true - -# Gain correction metering [boolean]: true/false -e_g = true - - -# ------------------------------------------------------------------------------- -# KVT parameters -# ------------------------------------------------------------------------------- - - -# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_stereo.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_stereo.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_stereo.cfg 2025-03-01 12:43:00.116628434 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/config/sc_autogain_stereo.cfg 1970-01-01 00:00:00.000000000 +0000 @@ -1,170 +0,0 @@ -# ------------------------------------------------------------------------------- -# This file contains configuration of the audio plugin. -# Package: test (Test Case) -# Package version: 0.0.0-devel -# Plugin name: Sidechain Autogain Stereo (Sidechain Autogain Stereo) -# Plugin version: 1.0.3 -# UID: sc_autogain_stereo -# LV2 URI: http://lsp-plug.in/plugins/lv2/sc_autogain_stereo -# VST 2.x identifier: ag1S -# VST 3.x identifier: 64737020736361673173202061673153 -# LADSPA identifier: 5002277 -# LADSPA label: http://lsp-plug.in/plugins/ladspa/sc_autogain_stereo -# -# (C) Test Case -# https://lsp-plug.in/ -# -# ------------------------------------------------------------------------------- - -# Bypass [boolean]: true/false -bypass = false - -# Sidechain preamp [dB]: -60.00000000..40.00000000 -preamp = 0.00000 - -# Sidechain lookahead [ms]: 0.00000000..40.00000000 -lkahead = 0.00000 - -# Sidechain mode: 0..2 -# 0: Internal -# 1: Control -# 2: Match -scmode = 1 - -# Sidechain metering enable for long period [boolean]: true/false -e_sc_l = true - -# Sidechain metering enable for short period [boolean]: true/false -e_sc_s = true - -# Loudness measuring long period [ms]: 100.00000000..2000.00000000 -lperiod = 400.00000 - -# Loudness measuring short period [ms]: 5.00000000..100.00000000 -speriod = 20.00000 - -# Weighting function: 0..5 -# 0: None -# 1: A-Weighted -# 2: B-Weighted -# 3: C-Weighted -# 4: D-Weighted -# 5: K-Weighted -weight = 5 - -# Desired loudness level [LUFS]: -60.00000000..0.00000000 -level = -29.51699 - -# Level drift [dB]: 0.00000000..24.00000000 -drift = 12.00000 - -# The level of silence [LUFS]: -84.00000000..-36.00000000 -silence = -72.00000 - -# Enable maximum amplification gain limitation [boolean]: true/false -max_on = false - -# The maximum amplification gain [dB]: 0.00000000..108.00000000 -max_amp = 36.00000 - -# Enable quick amplifier [boolean]: true/false -qamp = false - -# Long gain grow amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vgrow_l = 5 - -# Long gain grow time [ms]: 10.00000000..10000.00000000 -tgrow_l = 500.00000 - -# Long gain fall amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vfall_l = 5 - -# Long gain fall time [ms]: 10.00000000..10000.00000000 -tfall_l = 500.00000 - -# Short gain grow amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vgrow_s = 5 - -# Short gain grow time [ms]: 1.00000000..500.00000000 -tgrow_s = 40.00000 - -# Short gain fall amount: 0..12 -# 0: 0.1 dB -# 1: 0.5 dB -# 2: 1 dB -# 3: 3 dB -# 4: 6 dB -# 5: 9 dB -# 6: 10 dB -# 7: 12 dB -# 8: 15 dB -# 9: 18 dB -# 10: 20 dB -# 11: 21 dB -# 12: 24 dB -vfall_s = 5 - -# Short gain fall time [ms]: 0.10000000..40.00000000 -tfall_s = 10.00000 - -# Input metering enable for long period [boolean]: true/false -e_in_l = true - -# Input metering enable for short period [boolean]: true/false -e_in_s = true - -# Output metering enable for long period [boolean]: true/false -e_out_l = true - -# Output metering enable for short period [boolean]: true/false -e_out_s = true - -# Gain correction metering [boolean]: true/false -e_g = true - - -# ------------------------------------------------------------------------------- -# KVT parameters -# ------------------------------------------------------------------------------- - - -# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/autogain_mono.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/autogain_mono.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/autogain_mono.cfg 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/autogain_mono.cfg 2025-08-26 18:15:46.437976971 +0000 @@ -0,0 +1,149 @@ +# ------------------------------------------------------------------------------- +# This file contains configuration of the audio plugin. +# Package: test (Test Case) +# Package version: 0.0.0-devel +# Plugin name: Autogain Mono (Autogain Mono) +# Plugin version: 1.0.0 +# UID: autogain_mono +# LV2 URI: http://lsp-plug.in/plugins/lv2/autogain_mono +# VST identifier: ag1m +# LADSPA identifier: 5002274 +# LADSPA label: http://lsp-plug.in/plugins/ladspa/autogain_mono +# +# (C) Linux Studio Plugins +# https://lsp-plug.in/ +# +# ------------------------------------------------------------------------------- + +# Bypass [boolean]: true/false +bypass = false + +# Sidechain preamp [dB]: -60.00000000..40.00000000 +preamp = 0.00 db + +# Sidechain lookahead [ms]: 0.00000000..40.00000000 +lkahead = 0.00000 + +# Loudness measuring long period [ms]: 100.00000000..2000.00000000 +lperiod = 400.00000 + +# Loudness measuring short period [ms]: 5.00000000..100.00000000 +speriod = 20.00000 + +# Weighting function: 0..5 +# 0: None +# 1: A-Weighted +# 2: B-Weighted +# 3: C-Weighted +# 4: D-Weighted +# 5: K-Weighted +weight = 5 + +# Desired loudness level [LUFS]: -60.00000000..0.00000000 +level = -23.00000 + +# Level drift [dB]: 0.00000000..24.00000000 +drift = 12.00 db + +# The level of silence [LUFS]: -84.00000000..-36.00000000 +silence = -72.00000 + +# Enable maximum amplification gain limitation [boolean]: true/false +max_on = false + +# The maximum amplification gain [dB]: 0.00000000..108.00000000 +max_amp = 36.00 db + +# Enable quick amplifier [boolean]: true/false +qamp = false + +# Long gain grow amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vgrow_l = 5 + +# Long gain grow time [ms]: 10.00000000..10000.00000000 +tgrow_l = 500.00000 + +# Long gain fall amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vfall_l = 5 + +# Long gain fall time [ms]: 10.00000000..10000.00000000 +tfall_l = 500.00000 + +# Short gain grow amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vgrow_s = 5 + +# Short gain grow time [ms]: 1.00000000..500.00000000 +tgrow_s = 40.00000 + +# Short gain fall amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vfall_s = 5 + +# Short gain fall time [ms]: 0.10000000..40.00000000 +tfall_s = 10.00000 + +# Input metering enable for long period [boolean]: true/false +e_in_l = true + +# Input metering enable for short period [boolean]: true/false +e_in_s = true + +# Output metering enable for long period [boolean]: true/false +e_out_l = true + +# Output metering enable for short period [boolean]: true/false +e_out_s = true + +# Gain correction metering [boolean]: true/false +e_g = true + + +# ------------------------------------------------------------------------------- +# KVT parameters +# ------------------------------------------------------------------------------- + + +# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/autogain_stereo.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/autogain_stereo.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/autogain_stereo.cfg 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/autogain_stereo.cfg 2025-08-26 18:15:46.437976971 +0000 @@ -0,0 +1,149 @@ +# ------------------------------------------------------------------------------- +# This file contains configuration of the audio plugin. +# Package: test (Test Case) +# Package version: 0.0.0-devel +# Plugin name: Autogain Stereo (Autogain Stereo) +# Plugin version: 1.0.0 +# UID: autogain_stereo +# LV2 URI: http://lsp-plug.in/plugins/lv2/autogain_stereo +# VST identifier: ag1s +# LADSPA identifier: 5002275 +# LADSPA label: http://lsp-plug.in/plugins/ladspa/autogain_stereo +# +# (C) Linux Studio Plugins +# https://lsp-plug.in/ +# +# ------------------------------------------------------------------------------- + +# Bypass [boolean]: true/false +bypass = false + +# Sidechain preamp [dB]: -60.00000000..40.00000000 +preamp = 0.00 db + +# Sidechain lookahead [ms]: 0.00000000..40.00000000 +lkahead = 0.00000 + +# Loudness measuring long period [ms]: 100.00000000..2000.00000000 +lperiod = 400.00000 + +# Loudness measuring short period [ms]: 5.00000000..100.00000000 +speriod = 20.00000 + +# Weighting function: 0..5 +# 0: None +# 1: A-Weighted +# 2: B-Weighted +# 3: C-Weighted +# 4: D-Weighted +# 5: K-Weighted +weight = 5 + +# Desired loudness level [LUFS]: -60.00000000..0.00000000 +level = -23.00000 + +# Level drift [dB]: 0.00000000..24.00000000 +drift = 12.00 db + +# The level of silence [LUFS]: -84.00000000..-36.00000000 +silence = -72.00000 + +# Enable maximum amplification gain limitation [boolean]: true/false +max_on = false + +# The maximum amplification gain [dB]: 0.00000000..108.00000000 +max_amp = 36.00 db + +# Enable quick amplifier [boolean]: true/false +qamp = false + +# Long gain grow amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vgrow_l = 5 + +# Long gain grow time [ms]: 10.00000000..10000.00000000 +tgrow_l = 500.00000 + +# Long gain fall amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vfall_l = 5 + +# Long gain fall time [ms]: 10.00000000..10000.00000000 +tfall_l = 500.00000 + +# Short gain grow amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vgrow_s = 5 + +# Short gain grow time [ms]: 1.00000000..500.00000000 +tgrow_s = 40.00000 + +# Short gain fall amount: 0..10 +# 0: 1 dB +# 1: 3 dB +# 2: 6 dB +# 3: 9 dB +# 4: 10 dB +# 5: 12 dB +# 6: 15 dB +# 7: 18 dB +# 8: 20 dB +# 9: 21 dB +# 10: 24 dB +vfall_s = 5 + +# Short gain fall time [ms]: 0.10000000..40.00000000 +tfall_s = 10.00000 + +# Input metering enable for long period [boolean]: true/false +e_in_l = true + +# Input metering enable for short period [boolean]: true/false +e_in_s = true + +# Output metering enable for long period [boolean]: true/false +e_out_l = true + +# Output metering enable for short period [boolean]: true/false +e_out_s = true + +# Gain correction metering [boolean]: true/false +e_g = true + + +# ------------------------------------------------------------------------------- +# KVT parameters +# ------------------------------------------------------------------------------- + + +# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_mono.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_mono.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_mono.cfg 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_mono.cfg 2025-08-26 18:15:46.437976971 +0000 @@ -0,0 +1,170 @@ +# ------------------------------------------------------------------------------- +# This file contains configuration of the audio plugin. +# Package: test (Test Case) +# Package version: 0.0.0-devel +# Plugin name: Sidechain Autogain Mono (Sidechain Autogain Mono) +# Plugin version: 1.0.3 +# UID: sc_autogain_mono +# LV2 URI: http://lsp-plug.in/plugins/lv2/sc_autogain_mono +# VST 2.x identifier: ag1M +# VST 3.x identifier: 6473702073636167316D20206167314D +# LADSPA identifier: 5002276 +# LADSPA label: http://lsp-plug.in/plugins/ladspa/sc_autogain_mono +# +# (C) Test Case +# https://lsp-plug.in/ +# +# ------------------------------------------------------------------------------- + +# Bypass [boolean]: true/false +bypass = false + +# Sidechain preamp [dB]: -60.00000000..40.00000000 +preamp = 0.00000 + +# Sidechain lookahead [ms]: 0.00000000..40.00000000 +lkahead = 0.00000 + +# Sidechain mode: 0..2 +# 0: Internal +# 1: Control +# 2: Match +scmode = 2 + +# Sidechain metering enable for long period [boolean]: true/false +e_sc_l = true + +# Sidechain metering enable for short period [boolean]: true/false +e_sc_s = true + +# Loudness measuring long period [ms]: 100.00000000..2000.00000000 +lperiod = 400.00000 + +# Loudness measuring short period [ms]: 5.00000000..100.00000000 +speriod = 20.00000 + +# Weighting function: 0..5 +# 0: None +# 1: A-Weighted +# 2: B-Weighted +# 3: C-Weighted +# 4: D-Weighted +# 5: K-Weighted +weight = 5 + +# Desired loudness level [LUFS]: -60.00000000..0.00000000 +level = -23.00000 + +# Level drift [dB]: 0.00000000..24.00000000 +drift = 12.00000 + +# The level of silence [LUFS]: -84.00000000..-36.00000000 +silence = -72.00000 + +# Enable maximum amplification gain limitation [boolean]: true/false +max_on = false + +# The maximum amplification gain [dB]: 0.00000000..108.00000000 +max_amp = 36.00000 + +# Enable quick amplifier [boolean]: true/false +qamp = false + +# Long gain grow amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vgrow_l = 5 + +# Long gain grow time [ms]: 10.00000000..10000.00000000 +tgrow_l = 500.00000 + +# Long gain fall amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vfall_l = 5 + +# Long gain fall time [ms]: 10.00000000..10000.00000000 +tfall_l = 500.00000 + +# Short gain grow amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vgrow_s = 5 + +# Short gain grow time [ms]: 1.00000000..500.00000000 +tgrow_s = 40.00000 + +# Short gain fall amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vfall_s = 5 + +# Short gain fall time [ms]: 0.10000000..40.00000000 +tfall_s = 10.00000 + +# Input metering enable for long period [boolean]: true/false +e_in_l = true + +# Input metering enable for short period [boolean]: true/false +e_in_s = true + +# Output metering enable for long period [boolean]: true/false +e_out_l = true + +# Output metering enable for short period [boolean]: true/false +e_out_s = true + +# Gain correction metering [boolean]: true/false +e_g = true + + +# ------------------------------------------------------------------------------- +# KVT parameters +# ------------------------------------------------------------------------------- + + +# ------------------------------------------------------------------------------- diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_stereo.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_stereo.cfg --- 1.2.21-5/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_stereo.cfg 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/configs/sc_autogain_stereo.cfg 2025-08-26 18:15:46.437976971 +0000 @@ -0,0 +1,170 @@ +# ------------------------------------------------------------------------------- +# This file contains configuration of the audio plugin. +# Package: test (Test Case) +# Package version: 0.0.0-devel +# Plugin name: Sidechain Autogain Stereo (Sidechain Autogain Stereo) +# Plugin version: 1.0.3 +# UID: sc_autogain_stereo +# LV2 URI: http://lsp-plug.in/plugins/lv2/sc_autogain_stereo +# VST 2.x identifier: ag1S +# VST 3.x identifier: 64737020736361673173202061673153 +# LADSPA identifier: 5002277 +# LADSPA label: http://lsp-plug.in/plugins/ladspa/sc_autogain_stereo +# +# (C) Test Case +# https://lsp-plug.in/ +# +# ------------------------------------------------------------------------------- + +# Bypass [boolean]: true/false +bypass = false + +# Sidechain preamp [dB]: -60.00000000..40.00000000 +preamp = 0.00000 + +# Sidechain lookahead [ms]: 0.00000000..40.00000000 +lkahead = 0.00000 + +# Sidechain mode: 0..2 +# 0: Internal +# 1: Control +# 2: Match +scmode = 1 + +# Sidechain metering enable for long period [boolean]: true/false +e_sc_l = true + +# Sidechain metering enable for short period [boolean]: true/false +e_sc_s = true + +# Loudness measuring long period [ms]: 100.00000000..2000.00000000 +lperiod = 400.00000 + +# Loudness measuring short period [ms]: 5.00000000..100.00000000 +speriod = 20.00000 + +# Weighting function: 0..5 +# 0: None +# 1: A-Weighted +# 2: B-Weighted +# 3: C-Weighted +# 4: D-Weighted +# 5: K-Weighted +weight = 5 + +# Desired loudness level [LUFS]: -60.00000000..0.00000000 +level = -29.51699 + +# Level drift [dB]: 0.00000000..24.00000000 +drift = 12.00000 + +# The level of silence [LUFS]: -84.00000000..-36.00000000 +silence = -72.00000 + +# Enable maximum amplification gain limitation [boolean]: true/false +max_on = false + +# The maximum amplification gain [dB]: 0.00000000..108.00000000 +max_amp = 36.00000 + +# Enable quick amplifier [boolean]: true/false +qamp = false + +# Long gain grow amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vgrow_l = 5 + +# Long gain grow time [ms]: 10.00000000..10000.00000000 +tgrow_l = 500.00000 + +# Long gain fall amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vfall_l = 5 + +# Long gain fall time [ms]: 10.00000000..10000.00000000 +tfall_l = 500.00000 + +# Short gain grow amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vgrow_s = 5 + +# Short gain grow time [ms]: 1.00000000..500.00000000 +tgrow_s = 40.00000 + +# Short gain fall amount: 0..12 +# 0: 0.1 dB +# 1: 0.5 dB +# 2: 1 dB +# 3: 3 dB +# 4: 6 dB +# 5: 9 dB +# 6: 10 dB +# 7: 12 dB +# 8: 15 dB +# 9: 18 dB +# 10: 20 dB +# 11: 21 dB +# 12: 24 dB +vfall_s = 5 + +# Short gain fall time [ms]: 0.10000000..40.00000000 +tfall_s = 10.00000 + +# Input metering enable for long period [boolean]: true/false +e_in_l = true + +# Input metering enable for short period [boolean]: true/false +e_in_s = true + +# Output metering enable for long period [boolean]: true/false +e_out_l = true + +# Output metering enable for short period [boolean]: true/false +e_out_s = true + +# Gain correction metering [boolean]: true/false +e_g = true + + +# ------------------------------------------------------------------------------- +# KVT parameters +# ------------------------------------------------------------------------------- + + +# ------------------------------------------------------------------------------- Binary files 1.2.21-5/modules/lsp-plugins-autogain/res/doc/screenshots/autogain_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/screenshots/autogain_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-autogain/res/doc/screenshots/autogain_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/screenshots/autogain_stereo.png differ Binary files 1.2.21-5/modules/lsp-plugins-autogain/res/doc/screenshots/sc_autogain_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/screenshots/sc_autogain_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-autogain/res/doc/screenshots/sc_autogain_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/res/doc/screenshots/sc_autogain_stereo.png differ diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/src/doc/manuals/plugins/autogain.php 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/src/doc/manuals/plugins/autogain.php --- 1.2.21-5/modules/lsp-plugins-autogain/src/doc/manuals/plugins/autogain.php 2025-03-01 12:43:00.120628410 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/src/doc/manuals/plugins/autogain.php 2025-08-26 18:15:46.441976932 +0000 @@ -29,7 +29,7 @@

        If the level of the signal rapidly changes, the plugin can also rapidly reduce the shocking effect of the loud sound and (if enabled) rapidly raise the gain, too. Despite, because it uses RMS measurements, it does not fully protect from - sudden loud clicks/pops, and aditional surge protection should be applied. Additional control over the zero level also + sudden loud clicks/pops, and additional surge protection should be applied. Additional control over the zero level also makes the plugin act as a trigger: if the signal is below the mimum level, then the gain value does not change. This prevents from significant amplification of a background noise in the case of long silence at the input.

        diff -pruN 1.2.21-5/modules/lsp-plugins-autogain/src/main/meta/autogain.cpp 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/src/main/meta/autogain.cpp --- 1.2.21-5/modules/lsp-plugins-autogain/src/main/meta/autogain.cpp 2025-03-01 12:43:00.124628385 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-autogain/src/main/meta/autogain.cpp 2025-08-26 18:15:46.441976932 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-autogain * Created on: 21 сен 2023 г. @@ -25,7 +25,7 @@ #define LSP_PLUGINS_AUTOGAIN_VERSION_MAJOR 1 #define LSP_PLUGINS_AUTOGAIN_VERSION_MINOR 0 -#define LSP_PLUGINS_AUTOGAIN_VERSION_MICRO 10 +#define LSP_PLUGINS_AUTOGAIN_VERSION_MICRO 12 #define LSP_PLUGINS_AUTOGAIN_VERSION \ LSP_MODULE_VERSION( \ @@ -95,11 +95,11 @@ namespace lsp OPT_AUDIO_RETURN("scl_r", "Side-chain shared memory link input Right", 1, "link") #define AUTOGAIN_COMMON_SC(combo, combo_dfl) \ - CONTROL("preamp", "Sidechain preamp", U_DB, meta::autogain::SC_PREAMP), \ - CONTROL("lkahead", "Sidechain lookahead", U_MSEC, meta::autogain::SC_LOOKAHEAD), \ - COMBO("scmode", "Sidechain mode", combo_dfl, combo), \ - SWITCH("e_sc_l", "Sidechain metering enable for long period", 1.0f), \ - SWITCH("e_sc_s", "Sidechain metering enable for short period", 1.0f), \ + CONTROL("preamp", "Sidechain preamp", "SC preamp", U_DB, meta::autogain::SC_PREAMP), \ + CONTROL("lkahead", "Sidechain lookahead", "SC look", U_MSEC, meta::autogain::SC_LOOKAHEAD), \ + COMBO("scmode", "Sidechain mode", "SC mode", combo_dfl, combo), \ + SWITCH("e_sc_l", "Sidechain metering enable for long period", "Long SC on", 1.0f), \ + SWITCH("e_sc_s", "Sidechain metering enable for short period", "Short SC on", 1.0f), \ METER_GAIN("g_sc_l", "Sidechain loudness meter for long period", GAIN_AMP_P_48_DB), \ METER_GAIN("g_sc_s", "Sidechain loudness meter for short period", GAIN_AMP_P_48_DB), \ MESH("gr_sc_l", "Sidechain loudness graph for long period", 2, meta::autogain::MESH_POINTS), \ @@ -112,30 +112,30 @@ namespace lsp AUTOGAIN_COMMON_SC(sc_modes_sc, meta::autogain::SCMODE_DFL_SC) #define AUTOGAIN_COMMON \ - LOG_CONTROL("lperiod", "Loudness measuring long period", U_MSEC, meta::autogain::LONG_PERIOD), \ - LOG_CONTROL("speriod", "Loudness measuring short period", U_MSEC, meta::autogain::SHORT_PERIOD), \ - COMBO("weight", "Weighting function", meta::autogain::WEIGHT_DFL, weighting_modes), \ - CONTROL("level", "Desired loudness level", U_LUFS, meta::autogain::LEVEL), \ - CONTROL("drift", "Level drift", U_DB, meta::autogain::DEVIATION), \ - CONTROL("silence", "The level of silence", U_LUFS, meta::autogain::SILENCE), \ - SWITCH("max_on", "Enable maximum amplification gain limitation", 0.0f), \ - CONTROL("max_amp", "The maximum amplification gain", U_DB, meta::autogain::MAX_GAIN), \ + LOG_CONTROL("lperiod", "Loudness measuring long period", "Long period", U_MSEC, meta::autogain::LONG_PERIOD), \ + LOG_CONTROL("speriod", "Loudness measuring short period", "Short period", U_MSEC, meta::autogain::SHORT_PERIOD), \ + COMBO("weight", "Weighting function", "Weighting", meta::autogain::WEIGHT_DFL, weighting_modes), \ + CONTROL("level", "Desired loudness level", "Loudness", U_LUFS, meta::autogain::LEVEL), \ + CONTROL("drift", "Level drift", "Drift", U_DB, meta::autogain::DEVIATION), \ + CONTROL("silence", "The level of silence", "Silence", U_LUFS, meta::autogain::SILENCE), \ + SWITCH("max_on", "Enable maximum amplification gain limitation", "Gain limit on", 0.0f), \ + CONTROL("max_amp", "The maximum amplification gain", "Max gain", U_DB, meta::autogain::MAX_GAIN), \ \ - SWITCH("qamp", "Enable quick amplifier", 0.0f), \ - COMBO("vgrow_l", "Long gain grow amount", meta::autogain::NUM_DFL, speed_numerators), \ - LOG_CONTROL("tgrow_l", "Long gain grow time", U_MSEC, meta::autogain::LONG_GROW), \ - COMBO("vfall_l", "Long gain fall amount", meta::autogain::NUM_DFL, speed_numerators), \ - LOG_CONTROL("tfall_l", "Long gain fall time", U_MSEC, meta::autogain::LONG_FALL), \ - COMBO("vgrow_s", "Short gain grow amount", meta::autogain::NUM_DFL, speed_numerators), \ - LOG_CONTROL("tgrow_s", "Short gain grow time", U_MSEC, meta::autogain::SHORT_GROW), \ - COMBO("vfall_s", "Short gain fall amount", meta::autogain::NUM_DFL, speed_numerators), \ - LOG_CONTROL("tfall_s", "Short gain fall time", U_MSEC, meta::autogain::SHORT_FALL), \ + SWITCH("qamp", "Enable quick amplifier", "Quick amp", 0.0f), \ + COMBO("vgrow_l", "Long gain grow amount", "Long grow", meta::autogain::NUM_DFL, speed_numerators), \ + LOG_CONTROL("tgrow_l", "Long gain grow time", "Long grow time", U_MSEC, meta::autogain::LONG_GROW), \ + COMBO("vfall_l", "Long gain fall amount", "Long fall", meta::autogain::NUM_DFL, speed_numerators), \ + LOG_CONTROL("tfall_l", "Long gain fall time", "Long fall time", U_MSEC, meta::autogain::LONG_FALL), \ + COMBO("vgrow_s", "Short gain grow amount", "Short grow", meta::autogain::NUM_DFL, speed_numerators), \ + LOG_CONTROL("tgrow_s", "Short gain grow time", "Short grow time", U_MSEC, meta::autogain::SHORT_GROW), \ + COMBO("vfall_s", "Short gain fall amount", "Short fall", meta::autogain::NUM_DFL, speed_numerators), \ + LOG_CONTROL("tfall_s", "Short gain fall time", "Short fall time", U_MSEC, meta::autogain::SHORT_FALL), \ \ - SWITCH("e_in_l", "Input metering enable for long period", 1.0f), \ - SWITCH("e_in_s", "Input metering enable for short period", 1.0f), \ - SWITCH("e_out_l", "Output metering enable for long period", 1.0f), \ - SWITCH("e_out_s", "Output metering enable for short period", 1.0f), \ - SWITCH("e_g", "Gain correction metering", 1.0f), \ + SWITCH("e_in_l", "Input metering enable for long period", "Show In long", 1.0f), \ + SWITCH("e_in_s", "Input metering enable for short period", "Show In short", 1.0f), \ + SWITCH("e_out_l", "Output metering enable for long period", "Show Out long", 1.0f), \ + SWITCH("e_out_s", "Output metering enable for short period", "Show Out short", 1.0f), \ + SWITCH("e_g", "Gain correction metering", "Show Gain", 1.0f), \ \ METER_GAIN("g_in_l", "Input loudness meter for long period", GAIN_AMP_P_48_DB), \ METER_GAIN("g_in_s", "Input loudness meter for short period", GAIN_AMP_P_48_DB), \ diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-plugins-beat-breather/.github/workflows/build.yml 2025-03-01 12:43:00.512626057 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/.github/workflows/build.yml 2025-08-26 18:15:46.949972001 +0000 @@ -147,7 +147,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -164,7 +164,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -221,3 +221,17 @@ jobs: shell: msys2 {0} run: make VERBOSE=1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui' + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/CHANGELOG --- 1.2.21-5/modules/lsp-plugins-beat-breather/CHANGELOG 2025-03-01 12:43:00.512626057 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/CHANGELOG 2025-08-26 18:15:46.949972001 +0000 @@ -2,6 +2,12 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.15 === +* Updated build scripts and dependencies. + +=== 1.0.14 === +* Updated build scripts and dependencies. + === 1.0.13 === * Updated build scripts and dependencies. diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/dependencies.mk 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/dependencies.mk --- 1.2.21-5/modules/lsp-plugins-beat-breather/dependencies.mk 2025-03-01 12:43:00.516626033 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/dependencies.mk 2025-08-26 18:15:46.949972001 +0000 @@ -114,14 +114,35 @@ ifeq ($(PLATFORM),Windows) endif #------------------------------------------------------------------------------ +# MacOS dependencies +MACOS_DEPENDENCIES = \ + LIBAUDIOTOOLBOX \ + LIBCAIRO \ + LIBCOCOA \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBICONV \ + LIBJACK + +MACOS_TEST_DEPENDENCIES = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES += $(MACOS_DEPENDENCIES) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES) \ $(LINUX_DEPENDENCIES) \ $(BSD_DEPENDENCIES) \ $(WINDOWS_DEPENDENCIES) \ + $(MACOS_DEPENDENCIES) \ $(TEST_DEPENDENCIES) \ $(LINUX_TEST_DEPENDENCIES) \ $(BSD_TEST_DEPENDENCIES) \ - $(WINDOWS_TEST_DEPENDENCIES) + $(WINDOWS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES) diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/make/tools.mk --- 1.2.21-5/modules/lsp-plugins-beat-breather/make/tools.mk 2025-03-01 12:43:00.516626033 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/make/tools.mk 2025-08-26 18:15:46.949972001 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/modules.mk 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/modules.mk --- 1.2.21-5/modules/lsp-plugins-beat-breather/modules.mk 2025-03-01 12:43:00.516626033 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/modules.mk 2025-08-26 18:15:46.949972001 +0000 @@ -19,99 +19,114 @@ # # Variables that describe dependencies -LSP_3RD_PARTY_VERSION := 1.0.21 +LSP_3RD_PARTY_VERSION := 1.0.23 LSP_3RD_PARTY_NAME := lsp-3rd-party LSP_3RD_PARTY_TYPE := hdr LSP_3RD_PARTY_INC_OPT := -idirafter LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_DSP_UNITS_VERSION := 1.0.28 +LSP_DSP_UNITS_VERSION := 1.0.30 LSP_DSP_UNITS_NAME := lsp-dsp-units LSP_DSP_UNITS_TYPE := src LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_R3D_BASE_LIB_VERSION := 1.0.23 +LSP_R3D_BASE_LIB_VERSION := 1.0.25 LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib LSP_R3D_BASE_LIB_TYPE := src LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git -LSP_R3D_IFACE_VERSION := 1.0.23 +LSP_R3D_IFACE_VERSION := 1.0.25 LSP_R3D_IFACE_NAME := lsp-r3d-iface LSP_R3D_IFACE_TYPE := src LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git -LSP_R3D_GLX_LIB_VERSION := 1.0.23 +LSP_R3D_GLX_LIB_VERSION := 1.0.25 LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib LSP_R3D_GLX_LIB_TYPE := bin LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git -LSP_R3D_WGL_LIB_VERSION := 1.0.18 +LSP_R3D_WGL_LIB_VERSION := 1.0.20 LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib LSP_R3D_WGL_LIB_TYPE := bin LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git -LSP_TK_LIB_VERSION := 1.0.27 +LSP_TK_LIB_VERSION := 1.0.29 LSP_TK_LIB_NAME := lsp-tk-lib LSP_TK_LIB_TYPE := src LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git -LSP_WS_LIB_VERSION := 1.0.27 +LSP_WS_LIB_VERSION := 1.0.29 LSP_WS_LIB_NAME := lsp-ws-lib LSP_WS_LIB_TYPE := src LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git # Plugin-related module dependencies -LSP_PLUGIN_FW_VERSION := 1.0.29 +LSP_PLUGIN_FW_VERSION := 1.0.31 LSP_PLUGIN_FW_NAME := lsp-plugin-fw LSP_PLUGIN_FW_TYPE := src LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git LSP_PLUGIN_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git -LSP_PLUGINS_SHARED_VERSION := 1.0.28 +LSP_PLUGINS_SHARED_VERSION := 1.0.30 LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared LSP_PLUGINS_SHARED_TYPE := src LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git LSP_PLUGINS_SHARED_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git # System libraries +LIBAUDIOTOOLBOX_VERSION := system +LIBAUDIOTOOLBOX_NAME := libaudiotoolbox +LIBAUDIOTOOLBOX_TYPE := opt +LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox + +LIBCOCOA_VERSION := system +LIBCOCOA_NAME := libcocoa +LIBCOCOA_TYPE := opt +LIBCOCOA_LDFLAGS := -framework Cocoa + +LIBCOREFOUNDATION_VERSION := system +LIBCOREFOUNDATION_NAME := libcorefoundation +LIBCOREFOUNDATION_TYPE := opt +LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation + LIBADVAPI_VERSION := system LIBADVAPI_NAME := libadvapi32 LIBADVAPI_TYPE := opt diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/project.mk 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/project.mk --- 1.2.21-5/modules/lsp-plugins-beat-breather/project.mk 2025-03-01 12:43:00.516626033 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/project.mk 2025-08-26 18:15:46.949972001 +0000 @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Beat Breather Plugin ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.13 +ARTIFACT_VERSION = 1.0.15 Binary files 1.2.21-5/modules/lsp-plugins-beat-breather/res/doc/screenshots/beat_breather_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/res/doc/screenshots/beat_breather_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-beat-breather/res/doc/screenshots/beat_breather_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/res/doc/screenshots/beat_breather_stereo.png differ diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/src/doc/manuals/plugins/beat_breather.php 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/src/doc/manuals/plugins/beat_breather.php --- 1.2.21-5/modules/lsp-plugins-beat-breather/src/doc/manuals/plugins/beat_breather.php 2025-03-01 12:43:00.516626033 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/src/doc/manuals/plugins/beat_breather.php 2025-08-26 18:15:46.953971963 +0000 @@ -13,21 +13,21 @@
        • Unlike classic crossovers which use IIR (Infinite Impulse Response) filters to split signal into multiple bands and shift the phase of the audio signal at band split points, the Linear Phase allows to use FIR (Finite Impulse Response) filters which are deprived of this. -
        • Unlike most IIR filters which are designed using bilinear transform, linear phase filters allow simulate their tranfer function +
        • Unlike most IIR filters which are designed using bilinear transform, linear phase filters allow simulate their transfer function to look like the transfer function of analog filters, without deforming it's magnitude envelope near the nyquist frequency.
        • Unlike design of classic Linkwitz-Riley filters, the design of IIR filters provides shorter transition zone of the filter.
        • Unlike classic IIR filters the slope of the FIR filter is not restricted to be the multiple of 6 dB.
      • Punch detection - detection of peaks above the average level of the audio. For that case two type of RMS values are computed:
          • -
        • Long time - the long-time RMS value (by default, the esimation period is 400 ms) to estimate the average level of the audio signal.
          • +
        • Long time - the long-time RMS value (by default, the esitmation period is 400 ms) to estimate the average level of the audio signal.
        • Short time - the short-time RMS value (by default, the estimation period is less than 20 ms and depends on the frequency range) to estimate the envelope of the changing in time signal.
      • Punch filtering - additional stage to eliminate some noise from the signal not associated with punches.
        • -
      • Beat processing - short-time dynamic amplification of the frequency band accoding to the signal passed from the punch filter.
        • +
      • Beat processing - short-time dynamic amplification of the frequency band according to the signal passed from the punch filter.
      -

      The simlified schema of the device is shown on the figure below.

      +

      The simplified schema of the device is shown on the figure below.

      Controls:

      @@ -38,7 +38,7 @@
    • Stereo Split - enables independent compression of left and right channels.
      • -
    • Filters - enables drawing tranfer function of each sidechain filter on the spectrum graph.
      • +
    • Filters - enables drawing transfer function of each sidechain filter on the spectrum graph.
    • Zoom - zoom fader, allows to adjust zoom on the frequency chart.

    'Analysis' section:

    diff -pruN 1.2.21-5/modules/lsp-plugins-beat-breather/src/main/meta/beat_breather.cpp 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/src/main/meta/beat_breather.cpp --- 1.2.21-5/modules/lsp-plugins-beat-breather/src/main/meta/beat_breather.cpp 2025-03-01 12:43:00.516626033 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-beat-breather/src/main/meta/beat_breather.cpp 2025-08-26 18:15:46.953971963 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-beat-breather * Created on: 14 авг 2023 г. @@ -25,7 +25,7 @@ #define LSP_PLUGINS_BEAT_BREATHER_VERSION_MAJOR 1 #define LSP_PLUGINS_BEAT_BREATHER_VERSION_MINOR 0 -#define LSP_PLUGINS_BEAT_BREATHER_VERSION_MICRO 13 +#define LSP_PLUGINS_BEAT_BREATHER_VERSION_MICRO 15 #define LSP_PLUGINS_BEAT_BREATHER_VERSION \ LSP_MODULE_VERSION( \ @@ -52,65 +52,65 @@ namespace lsp #define BB_COMMON \ BYPASS, \ IN_GAIN, \ - AMP_GAIN("g_dry", "Dry gain", 0.0f, 10.0f), \ - AMP_GAIN("g_wet", "Wet gain", 1.0f, 10.0f), \ + AMP_GAIN("g_dry", "Dry gain", "Dry", 0.0f, 10.0f), \ + AMP_GAIN("g_wet", "Wet gain", "Wet", 1.0f, 10.0f), \ DRYWET(100.0f), \ OUT_GAIN, \ - COMBO("ts", "Tab selector", 0, bb_tabs), \ - LOG_CONTROL("react", "FFT reactivity", U_MSEC, beat_breather::FFT_REACT_TIME), \ - CONTROL("shift", "FFT shift gain", U_DB, beat_breather::FFT_SHIFT), \ - LOG_CONTROL("zoom", "Graph zoom", U_GAIN_AMP, beat_breather::ZOOM), \ - SWITCH("flt", "Show filters", 1.0f) + COMBO("ts", "Tab selector", "Tab selector", 0, bb_tabs), \ + LOG_CONTROL("react", "FFT reactivity", "Reactivity", U_MSEC, beat_breather::FFT_REACT_TIME), \ + CONTROL("shift", "FFT shift gain", "FFT shift", U_DB, beat_breather::FFT_SHIFT), \ + LOG_CONTROL("zoom", "Graph zoom", "Zoom", U_GAIN_AMP, beat_breather::ZOOM), \ + SWITCH("flt", "Show filters", "Show flt", 1.0f) #define BB_COMMON_STEREO \ - SWITCH("ssplit", "Stereo split", 0.0f) + SWITCH("ssplit", "Stereo split", "Stereo split", 0.0f) - #define BB_CHANNEL_METERS(id, label) \ + #define BB_CHANNEL_METERS(id, label, alias) \ METER_GAIN("ilm" id, "Input level meter" label, GAIN_AMP_P_24_DB), \ METER_GAIN("olm" id, "Output level meter" label, GAIN_AMP_P_24_DB), \ - SWITCH("ife" id, "Input FFT graph enable" label, 1.0f), \ - SWITCH("ofe" id, "Output FFT graph enable" label, 1.0f), \ + SWITCH("ife" id, "Input FFT graph enable" label, "FFT In" alias, 1.0f), \ + SWITCH("ofe" id, "Output FFT graph enable" label, "FFT Out" alias, 1.0f), \ MESH("ifg" id, "Input FFT graph" label, 2, beat_breather::FFT_MESH_POINTS + 2), \ MESH("ofg" id, "Output FFT graph" label, 2, beat_breather::FFT_MESH_POINTS), \ MESH("ag" id, "Output filter graph" label, 2, beat_breather::FFT_MESH_POINTS) - #define BB_SPLIT(id, label, on, freq) \ - SWITCH("se" id, "Frequency split enable" label, on), \ - LOG_CONTROL_DFL("sf" id, "Split frequency" label, U_HZ, beat_breather::FREQ, freq) - - #define BB_BAND(id, label, short_rms, pf_attack, pf_release, bp_attack, bp_release) \ - SWITCH("bs" id, "Solo band" label, 0.0f), \ - SWITCH("bm" id, "Mute band" label, 0.0f), \ - COMBO("bls" id, "Band listen stage" label, beat_breather::LISTEN_DFL, bb_tabs), \ - CONTROL("lps" id, "Lo-pass slope" label, U_DB, beat_breather::SLOPE), \ - CONTROL("hps" id, "Hi-pass slope" label, U_DB, beat_breather::SLOPE), \ - CONTROL("flat" id, "Filter cap flatten" label, U_DB, beat_breather::FLATTEN), \ - LOG_CONTROL("bg" id, "Band output gain" label, U_GAIN_AMP, beat_breather::BAND_GAIN), \ + #define BB_SPLIT(id, label, alias, on, freq) \ + SWITCH("se" id, "Frequency split enable" label, "Freq split" alias, on), \ + LOG_CONTROL_DFL("sf" id, "Split frequency" label, "Split" label, U_HZ, beat_breather::FREQ, freq) + + #define BB_BAND(id, label, alias, short_rms, pf_attack, pf_release, bp_attack, bp_release) \ + SWITCH("bs" id, "Solo band" label, "Solo" alias, 0.0f), \ + SWITCH("bm" id, "Mute band" label, "Mute" alias, 0.0f), \ + COMBO("bls" id, "Band listen stage" label, "Listen" alias, beat_breather::LISTEN_DFL, bb_tabs), \ + CONTROL("lps" id, "Lo-pass slope" label, "LP slope" alias, U_DB, beat_breather::SLOPE), \ + CONTROL("hps" id, "Hi-pass slope" label, "HP slope" alias, U_DB, beat_breather::SLOPE), \ + CONTROL("flat" id, "Filter cap flatten" label, "Flatten" alias, U_DB, beat_breather::FLATTEN), \ + LOG_CONTROL("bg" id, "Band output gain" label, "Out lvl" alias, U_GAIN_AMP, beat_breather::BAND_GAIN), \ METER("fre" id, "Frequency range end" label, U_HZ, beat_breather::OUT_FREQ), \ MESH("bfg" id, "Band filter graph" label, 2, beat_breather::FFT_MESH_POINTS + 2), \ \ - CONTROL("pdlt" id, "Punch detector long-time RMS estimation" label, U_MSEC, beat_breather::PD_LONG_RMS), \ - CONTROL_DFL("pdst" id, "Punch detector short-time RMS estimation" label, U_MSEC, beat_breather::PD_SHORT_RMS, short_rms), \ - CONTROL("pdbs" id, "Punch detector short RMS bias" label, U_DB, beat_breather::PD_BIAS), \ - CONTROL("pdmk" id, "Punch detector makeup" label, U_DB, beat_breather::PD_MAKEUP), \ + CONTROL("pdlt" id, "Punch detector long-time RMS estimation" label, "Punch RMS" alias, U_MSEC, beat_breather::PD_LONG_RMS), \ + CONTROL_DFL("pdst" id, "Punch detector short-time RMS estimation" label, "Punch S-RMS" alias, U_MSEC, beat_breather::PD_SHORT_RMS, short_rms), \ + CONTROL("pdbs" id, "Punch detector short RMS bias" label, "Punch bias" alias, U_DB, beat_breather::PD_BIAS), \ + CONTROL("pdmk" id, "Punch detector makeup" label, "Punch makeup" alias, U_DB, beat_breather::PD_MAKEUP), \ \ - CONTROL("pflk" id, "Punch filter lookahead" label, U_MSEC, beat_breather::PF_LOOKAHEAD), \ - LOG_CONTROL_DFL("pfat" id, "Punch filter attack time" label, U_MSEC, beat_breather::PF_ATTACK, pf_attack), \ - LOG_CONTROL_DFL("pfrt" id, "Punch filter release time" label, U_MSEC, beat_breather::PF_RELEASE, pf_release), \ - LOG_CONTROL("pfth" id, "Punch filter threshold" label, U_GAIN_AMP, beat_breather::PF_THRESHOLD), \ - LOG_CONTROL("pfrl" id, "Punch filter reduction level" label, U_GAIN_AMP, beat_breather::PF_REDUCTION), \ - LOG_CONTROL("pfrz" id, "Punch filter reduction zone" label, U_GAIN_AMP, beat_breather::PF_ZONE), \ + CONTROL("pflk" id, "Punch filter lookahead" label, "Punch look" alias, U_MSEC, beat_breather::PF_LOOKAHEAD), \ + LOG_CONTROL_DFL("pfat" id, "Punch filter attack time" label, "Punch att" alias, U_MSEC, beat_breather::PF_ATTACK, pf_attack), \ + LOG_CONTROL_DFL("pfrt" id, "Punch filter release time" label, "Punch rel" alias, U_MSEC, beat_breather::PF_RELEASE, pf_release), \ + LOG_CONTROL("pfth" id, "Punch filter threshold" label, "Punch thresh" alias, U_GAIN_AMP, beat_breather::PF_THRESHOLD), \ + LOG_CONTROL("pfrl" id, "Punch filter reduction level" label, "Punch red" alias, U_GAIN_AMP, beat_breather::PF_REDUCTION), \ + LOG_CONTROL("pfrz" id, "Punch filter reduction zone" label, "Punch zone" alias, U_GAIN_AMP, beat_breather::PF_ZONE), \ MESH("pfg" id, "Punch filter curve graph" label, 2, beat_breather::CURVE_MESH_POINTS), \ \ - LOG_CONTROL_DFL("bpat" id, "Beat processor attack time" label, U_DB, beat_breather::BP_ATTACK, bp_attack), \ - LOG_CONTROL_DFL("bprt" id, "Beat processor release time" label, U_DB, beat_breather::BP_RELEASE, bp_release), \ - CONTROL("bpts" id, "Beat processor time shift" label, U_MSEC, beat_breather::BP_TIME_SHIFT), \ - LOG_CONTROL("bpth" id, "Beat processor threshold" label, U_GAIN_AMP, beat_breather::BP_THRESHOLD), \ - CONTROL("bper" id, "Beat processor expand ratio" label, U_NONE, beat_breather::BP_RATIO), \ - LOG_CONTROL("bpmg" id, "Beat processor maximum gain" label, U_GAIN_AMP, beat_breather::BP_MAX_GAIN), \ + LOG_CONTROL_DFL("bpat" id, "Beat processor attack time" label, "Beat att" alias, U_DB, beat_breather::BP_ATTACK, bp_attack), \ + LOG_CONTROL_DFL("bprt" id, "Beat processor release time" label, "Beat rel" alias, U_DB, beat_breather::BP_RELEASE, bp_release), \ + CONTROL("bpts" id, "Beat processor time shift" label, "Beat shift" label, U_MSEC, beat_breather::BP_TIME_SHIFT), \ + LOG_CONTROL("bpth" id, "Beat processor threshold" label, "Beat thresh" alias, U_GAIN_AMP, beat_breather::BP_THRESHOLD), \ + CONTROL("bper" id, "Beat processor expand ratio" label, "Beat ratio" alias, U_NONE, beat_breather::BP_RATIO), \ + LOG_CONTROL("bpmg" id, "Beat processor maximum gain" label, "Beat gain" alias, U_GAIN_AMP, beat_breather::BP_MAX_GAIN), \ MESH("bpg" id, "Beat processor curve graph" label, 2, beat_breather::CURVE_MESH_POINTS) - #define BB_BAND_METERS(id, label) \ + #define BB_BAND_METERS(id, label, alias) \ METER_OUT_GAIN("ilm" id, "Band input level meter" label, GAIN_AMP_P_36_DB), \ METER_OUT_GAIN("olm" id, "Band output level meter" label, GAIN_AMP_P_36_DB), \ MESH("pdgr" id, "Punch detector time graph" label, 2, beat_breather::TIME_MESH_POINTS), \ @@ -162,33 +162,33 @@ namespace lsp // Input and output audio ports PORTS_MONO_PLUGIN, BB_COMMON, - BB_CHANNEL_METERS("", ""), + BB_CHANNEL_METERS("", "", ""), - BB_SPLIT("_1", " 1", 0.0f, 40.0f), - BB_SPLIT("_2", " 2", 1.0f, 100.0f), - BB_SPLIT("_3", " 3", 0.0f, 252.0f), - BB_SPLIT("_4", " 4", 1.0f, 632.0f), - BB_SPLIT("_5", " 5", 0.0f, 1587.0f), - BB_SPLIT("_6", " 6", 1.0f, 3984.0f), - BB_SPLIT("_7", " 7", 0.0f, 10000.0f), - - BB_BAND("_1", " 1", 19.84f, 3.36f, 8.18, 10.01, 61.08), - BB_BAND("_2", " 2", 14.79f, 2.32f, 6.72, 6.39, 35.88), - BB_BAND("_3", " 3", 11.69f, 1.72f, 5.75, 4.46, 23.46), - BB_BAND("_4", " 4", 9.24f, 1.27f, 4.91, 3.11, 15.32), - BB_BAND("_5", " 5", 7.31f, 0.95f, 4.21, 2.17, 10.01), - BB_BAND("_6", " 6", 5.78f, 0.71f, 3.60, 1.52, 6.55), - BB_BAND("_7", " 7", 4.57f, 0.52f, 3.08, 1.06, 4.27), - BB_BAND("_8", " 8", 3.63f, 0.32f, 2.64, 0.75, 2.83), - - BB_BAND_METERS("_1", " 1"), - BB_BAND_METERS("_2", " 2"), - BB_BAND_METERS("_3", " 3"), - BB_BAND_METERS("_4", " 4"), - BB_BAND_METERS("_5", " 5"), - BB_BAND_METERS("_6", " 6"), - BB_BAND_METERS("_7", " 7"), - BB_BAND_METERS("_8", " 8"), + BB_SPLIT("_1", " 1", " 1", 0.0f, 40.0f), + BB_SPLIT("_2", " 2", " 2", 1.0f, 100.0f), + BB_SPLIT("_3", " 3", " 3", 0.0f, 252.0f), + BB_SPLIT("_4", " 4", " 4", 1.0f, 632.0f), + BB_SPLIT("_5", " 5", " 5", 0.0f, 1587.0f), + BB_SPLIT("_6", " 6", " 6", 1.0f, 3984.0f), + BB_SPLIT("_7", " 7", " 7", 0.0f, 10000.0f), + + BB_BAND("_1", " 1", " 1", 19.84f, 3.36f, 8.18, 10.01, 61.08), + BB_BAND("_2", " 2", " 2", 14.79f, 2.32f, 6.72, 6.39, 35.88), + BB_BAND("_3", " 3", " 3", 11.69f, 1.72f, 5.75, 4.46, 23.46), + BB_BAND("_4", " 4", " 4", 9.24f, 1.27f, 4.91, 3.11, 15.32), + BB_BAND("_5", " 5", " 5", 7.31f, 0.95f, 4.21, 2.17, 10.01), + BB_BAND("_6", " 6", " 6", 5.78f, 0.71f, 3.60, 1.52, 6.55), + BB_BAND("_7", " 7", " 7", 4.57f, 0.52f, 3.08, 1.06, 4.27), + BB_BAND("_8", " 8", " 8", 3.63f, 0.32f, 2.64, 0.75, 2.83), + + BB_BAND_METERS("_1", " 1", " 1"), + BB_BAND_METERS("_2", " 2", " 2"), + BB_BAND_METERS("_3", " 3", " 3"), + BB_BAND_METERS("_4", " 4", " 4"), + BB_BAND_METERS("_5", " 5", " 5"), + BB_BAND_METERS("_6", " 6", " 6"), + BB_BAND_METERS("_7", " 7", " 7"), + BB_BAND_METERS("_8", " 8", " 8"), PORTS_END }; @@ -199,43 +199,43 @@ namespace lsp PORTS_STEREO_PLUGIN, BB_COMMON, BB_COMMON_STEREO, - BB_CHANNEL_METERS("_l", " Left"), - BB_CHANNEL_METERS("_r", " Right"), + BB_CHANNEL_METERS("_l", " Left", " L"), + BB_CHANNEL_METERS("_r", " Right", " R"), - BB_SPLIT("_1", " 1", 0.0f, 40.0f), - BB_SPLIT("_2", " 2", 1.0f, 100.0f), - BB_SPLIT("_3", " 3", 0.0f, 252.0f), - BB_SPLIT("_4", " 4", 1.0f, 632.0f), - BB_SPLIT("_5", " 5", 0.0f, 1587.0f), - BB_SPLIT("_6", " 6", 1.0f, 3984.0f), - BB_SPLIT("_7", " 7", 0.0f, 10000.0f), - - BB_BAND("_1", " 1", 19.84f, 3.36f, 8.18, 10.01, 61.08), - BB_BAND("_2", " 2", 14.79f, 2.32f, 6.72, 6.39, 35.88), - BB_BAND("_3", " 3", 11.69f, 1.72f, 5.75, 4.46, 23.46), - BB_BAND("_4", " 4", 9.24f, 1.27f, 4.91, 3.11, 15.32), - BB_BAND("_5", " 5", 7.31f, 0.95f, 4.21, 2.17, 10.01), - BB_BAND("_6", " 6", 5.78f, 0.71f, 3.60, 1.52, 6.55), - BB_BAND("_7", " 7", 4.57f, 0.52f, 3.08, 1.06, 4.27), - BB_BAND("_8", " 8", 3.63f, 0.32f, 2.64, 0.75, 2.83), - - BB_BAND_METERS("_1l", " 1 Left"), - BB_BAND_METERS("_2l", " 2 Left"), - BB_BAND_METERS("_3l", " 3 Left"), - BB_BAND_METERS("_4l", " 4 Left"), - BB_BAND_METERS("_5l", " 5 Left"), - BB_BAND_METERS("_6l", " 6 Left"), - BB_BAND_METERS("_7l", " 7 Left"), - BB_BAND_METERS("_8l", " 8 Left"), - - BB_BAND_METERS("_1r", " 1 Right"), - BB_BAND_METERS("_2r", " 2 Right"), - BB_BAND_METERS("_3r", " 3 Right"), - BB_BAND_METERS("_4r", " 4 Right"), - BB_BAND_METERS("_5r", " 5 Right"), - BB_BAND_METERS("_6r", " 6 Right"), - BB_BAND_METERS("_7r", " 7 Right"), - BB_BAND_METERS("_8r", " 8 Right"), + BB_SPLIT("_1", " 1", " 1", 0.0f, 40.0f), + BB_SPLIT("_2", " 2", " 2", 1.0f, 100.0f), + BB_SPLIT("_3", " 3", " 3", 0.0f, 252.0f), + BB_SPLIT("_4", " 4", " 4", 1.0f, 632.0f), + BB_SPLIT("_5", " 5", " 5", 0.0f, 1587.0f), + BB_SPLIT("_6", " 6", " 6", 1.0f, 3984.0f), + BB_SPLIT("_7", " 7", " 7", 0.0f, 10000.0f), + + BB_BAND("_1", " 1", " 1", 19.84f, 3.36f, 8.18, 10.01, 61.08), + BB_BAND("_2", " 2", " 2", 14.79f, 2.32f, 6.72, 6.39, 35.88), + BB_BAND("_3", " 3", " 3", 11.69f, 1.72f, 5.75, 4.46, 23.46), + BB_BAND("_4", " 4", " 4", 9.24f, 1.27f, 4.91, 3.11, 15.32), + BB_BAND("_5", " 5", " 5", 7.31f, 0.95f, 4.21, 2.17, 10.01), + BB_BAND("_6", " 6", " 6", 5.78f, 0.71f, 3.60, 1.52, 6.55), + BB_BAND("_7", " 7", " 7", 4.57f, 0.52f, 3.08, 1.06, 4.27), + BB_BAND("_8", " 8", " 8", 3.63f, 0.32f, 2.64, 0.75, 2.83), + + BB_BAND_METERS("_1l", " 1 Left", " 1 L"), + BB_BAND_METERS("_2l", " 2 Left", " 2 L"), + BB_BAND_METERS("_3l", " 3 Left", " 3 L"), + BB_BAND_METERS("_4l", " 4 Left", " 4 L"), + BB_BAND_METERS("_5l", " 5 Left", " 5 L"), + BB_BAND_METERS("_6l", " 6 Left", " 6 L"), + BB_BAND_METERS("_7l", " 7 Left", " 7 L"), + BB_BAND_METERS("_8l", " 8 Left", " 8 L"), + + BB_BAND_METERS("_1r", " 1 Right", " 1 R"), + BB_BAND_METERS("_2r", " 2 Right", " 2 R"), + BB_BAND_METERS("_3r", " 3 Right", " 3 R"), + BB_BAND_METERS("_4r", " 4 Right", " 4 R"), + BB_BAND_METERS("_5r", " 5 Right", " 5 R"), + BB_BAND_METERS("_6r", " 6 Right", " 6 R"), + BB_BAND_METERS("_7r", " 7 Right", " 7 R"), + BB_BAND_METERS("_8r", " 8 Right", " 8 R"), PORTS_END }; diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/.github/workflows/build.yml 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/.github/workflows/build.yml --- 1.2.21-5/modules/lsp-plugins-chorus/.github/workflows/build.yml 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/.github/workflows/build.yml 2025-08-26 18:15:46.885972623 +0000 @@ -147,7 +147,7 @@ jobs: image: opensuse/leap:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -164,7 +164,7 @@ jobs: image: opensuse/tumbleweed:latest steps: - name: Install dependencies - run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel + run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ glibc-locale glibc-gconv-modules-extra clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr @@ -221,3 +221,17 @@ jobs: shell: msys2 {0} run: make VERBOSE=1 + macos_stable: + runs-on: macos-latest + steps: + - name: Update repositories + run: brew update + - name: Install dependencies + run: brew install make pkgconf cairo freetype + - uses: actions/checkout@v3 + - name: Configure project + run: gmake config STRICT=1 VERBOSE=1 FEATURES='lv2 ui' + - name: Fetch project dependencies + run: gmake fetch + - name: Build project + run: gmake VERBOSE=1 diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/CHANGELOG 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/CHANGELOG --- 1.2.21-5/modules/lsp-plugins-chorus/CHANGELOG 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/CHANGELOG 2025-08-26 18:15:46.885972623 +0000 @@ -2,6 +2,14 @@ * RECENT CHANGES ******************************************************************************* +=== 1.0.8 === +* Updated build scripts and dependencies. + +=== 1.0.7 === +* Significantly reduced LFO noise. +* Added Drive knob to the feedback chain. +* Updated build scripts and dependencies. + === 1.0.6 === * Updated build scripts and dependencies. diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/dependencies.mk 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/dependencies.mk --- 1.2.21-5/modules/lsp-plugins-chorus/dependencies.mk 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/dependencies.mk 2025-08-26 18:15:46.885972623 +0000 @@ -114,14 +114,35 @@ ifeq ($(PLATFORM),Windows) endif #------------------------------------------------------------------------------ +# MacOS dependencies +MACOS_DEPENDENCIES = \ + LIBAUDIOTOOLBOX \ + LIBCAIRO \ + LIBCOCOA \ + LIBCOREFOUNDATION \ + LIBFONTCONFIG \ + LIBFREETYPE \ + LIBICONV \ + LIBJACK + +MACOS_TEST_DEPENDENCIES = + +ifeq ($(PLATFORM),MacOS) + DEPENDENCIES += $(MACOS_DEPENDENCIES) + TEST_DEPENDENCIES += $(MACOS_TEST_DEPENDENCIES) +endif + +#------------------------------------------------------------------------------ # All possible dependencies ALL_DEPENDENCIES = \ $(DEPENDENCIES) \ $(LINUX_DEPENDENCIES) \ $(BSD_DEPENDENCIES) \ $(WINDOWS_DEPENDENCIES) \ + $(MACOS_DEPENDENCIES) \ $(TEST_DEPENDENCIES) \ $(LINUX_TEST_DEPENDENCIES) \ $(BSD_TEST_DEPENDENCIES) \ - $(WINDOWS_TEST_DEPENDENCIES) + $(WINDOWS_TEST_DEPENDENCIES) \ + $(MACOS_TEST_DEPENDENCIES) diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/include/private/meta/chorus.h 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/include/private/meta/chorus.h --- 1.2.21-5/modules/lsp-plugins-chorus/include/private/meta/chorus.h 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/include/private/meta/chorus.h 2025-08-26 18:15:46.885972623 +0000 @@ -108,6 +108,11 @@ namespace lsp static constexpr float FEEDBACK_GAIN_DFL = GAIN_AMP_M_6_DB; static constexpr float FEEDBACK_GAIN_STEP = 0.015f; + static constexpr float FEEDBACK_DRIVE_MIN = 0.0f; + static constexpr float FEEDBACK_DRIVE_MAX = 1.0f; + static constexpr float FEEDBACK_DRIVE_DFL = 0.0f; + static constexpr float FEEDBACK_DRIVE_STEP = 0.025f; + static constexpr float FEEDBACK_DELAY_MIN = 0.0f; static constexpr float FEEDBACK_DELAY_MAX = 5.0f; static constexpr float FEEDBACK_DELAY_DFL = 0.0f; diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/include/private/plugins/chorus.h 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/include/private/plugins/chorus.h --- 1.2.21-5/modules/lsp-plugins-chorus/include/private/plugins/chorus.h 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/include/private/plugins/chorus.h 2025-08-26 18:15:46.885972623 +0000 @@ -1,6 +1,6 @@ /* - * Copyright (C) 2024 Linux Studio Plugins Project - * (C) 2024 Vladimir Sadovnikov + * Copyright (C) 2025 Linux Studio Plugins Project + * (C) 2025 Vladimir Sadovnikov * * This file is part of lsp-plugins-chorus * Created on: 23 мар 2024 г. @@ -48,8 +48,6 @@ namespace lsp typedef struct voice_t { uint32_t nPhase; // Phase shift relative to global LFO - float nOvlDelay; // Overlapping delay shift in samples - float nOvlDepth; // Overlapping depth float fNormShift; // Normalized shift float fNormScale; // Normalized scale float fOutPhase; // Output phase value @@ -146,8 +144,10 @@ namespace lsp float fWetGain; // Wet gain float fOldFeedGain; // Old feedback gain float fFeedGain; // Feed-back gain - size_t nOldFeedDelay; // Old feedback delay - size_t nFeedDelay; // Feed-back delay + float fOldFeedDrive; // Old feed-back drive + float fFeedDrive; // Feedback drive + float fOldFeedDelay; // Old feedback delay + float fFeedDelay; // Feed-back delay bool bMS; // Mid/Side mode bool bMono; // Mono mode bool bUpdateVoices; // Need voices update flag @@ -177,6 +177,7 @@ namespace lsp plug::IPort *pFeedOn; // Enable feedback plug::IPort *pFeedGain; // Feedback gain + plug::IPort *pFeedDrive; // Feedback drive plug::IPort *pFeedDelay; // Feedback delay plug::IPort *pFeedPhase; // Feedback phase @@ -194,9 +195,6 @@ namespace lsp protected: static inline uint32_t phase_to_int(float phase); - static inline float lerp(float o_value, float n_value, float k); - static inline float qlerp(float o_value, float n_value, float k); - static inline int32_t ilerp(int32_t o_value, int32_t n_value, float k); protected: void do_destroy(); diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/make/tools.mk 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/make/tools.mk --- 1.2.21-5/modules/lsp-plugins-chorus/make/tools.mk 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/make/tools.mk 2025-08-26 18:15:46.885972623 +0000 @@ -89,6 +89,7 @@ INSTALL ?= $(X_INSTALL_TOOL) FLAG_RELRO := -Wl,-z,relro,-z,now FLAG_STDLIB := FLAG_GC_SECTIONS := -Wl,--gc-sections +FLAG_AS_NEEDED := -Wl,-as-needed NOARCH_CFLAGS := NOARCH_CXXFLAGS := NOARCH_EXE_FLAGS := @@ -108,7 +109,8 @@ else ifeq ($(PLATFORM),Windows) NOARCH_LDFLAGS += -T $(CURDIR)/make/ld-windows.script else ifeq ($(PLATFORM),MacOS) FLAG_RELRO = - FLAG_GC_SECTIONS = + FLAG_GC_SECTIONS = + FLAG_AS_NEEDED = NOARCH_CXXFLAGS += -std=c++0x NOARCH_LDFLAGS += -keep_private_externs else ifeq ($(PLATFORM),BSD) @@ -200,11 +202,11 @@ NOARCH_LDFLAGS += -r LDFLAGS := $(ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) HOST_LDFLAGS := $(HOST_ARCHITECTURE_LDFLAGS) $(NOARCH_LDFLAGS) -NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) +NOARCH_EXE_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) EXE_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) HOST_EXE_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_EXE_FLAGS) -NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) -shared $(FLAG_STDLIB) -fPIC +NOARCH_SO_FLAGS += $(FLAG_RELRO) $(FLAG_GC_SECTIONS) $(FLAG_AS_NEEDED) -shared $(FLAG_STDLIB) -fPIC SO_FLAGS := $(ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) HOST_SO_FLAGS := $(HOST_ARCHITECTURE_CFLAGS) $(NOARCH_SO_FLAGS) diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/modules.mk 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/modules.mk --- 1.2.21-5/modules/lsp-plugins-chorus/modules.mk 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/modules.mk 2025-08-26 18:15:46.885972623 +0000 @@ -19,99 +19,114 @@ # # Variables that describe dependencies -LSP_3RD_PARTY_VERSION := 1.0.21 +LSP_3RD_PARTY_VERSION := 1.0.23 LSP_3RD_PARTY_NAME := lsp-3rd-party LSP_3RD_PARTY_TYPE := hdr LSP_3RD_PARTY_INC_OPT := -idirafter LSP_3RD_PARTY_URL_RO := https://github.com/lsp-plugins/$(LSP_3RD_PARTY_NAME).git LSP_3RD_PARTY_URL_RW := git@github.com:lsp-plugins/$(LSP_3RD_PARTY_NAME).git -LSP_COMMON_LIB_VERSION := 1.0.41 +LSP_COMMON_LIB_VERSION := 1.0.43 LSP_COMMON_LIB_NAME := lsp-common-lib LSP_COMMON_LIB_TYPE := src LSP_COMMON_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git LSP_COMMON_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git -LSP_DSP_LIB_VERSION := 1.0.29 +LSP_DSP_LIB_VERSION := 1.0.31 LSP_DSP_LIB_NAME := lsp-dsp-lib LSP_DSP_LIB_TYPE := src LSP_DSP_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git LSP_DSP_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git -LSP_DSP_UNITS_VERSION := 1.0.28 +LSP_DSP_UNITS_VERSION := 1.0.30 LSP_DSP_UNITS_NAME := lsp-dsp-units LSP_DSP_UNITS_TYPE := src LSP_DSP_UNITS_URL_RO := https://github.com/lsp-plugins/$(LSP_DSP_UNITS_NAME).git LSP_DSP_UNITS_URL_RW := git@github.com:lsp-plugins/$(LSP_DSP_UNITS_NAME).git -LSP_LLTL_LIB_VERSION := 1.0.24 +LSP_LLTL_LIB_VERSION := 1.0.26 LSP_LLTL_LIB_NAME := lsp-lltl-lib LSP_LLTL_LIB_TYPE := src LSP_LLTL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git LSP_LLTL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git -LSP_R3D_BASE_LIB_VERSION := 1.0.23 +LSP_R3D_BASE_LIB_VERSION := 1.0.25 LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib LSP_R3D_BASE_LIB_TYPE := src LSP_R3D_BASE_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git LSP_R3D_BASE_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git -LSP_R3D_IFACE_VERSION := 1.0.23 +LSP_R3D_IFACE_VERSION := 1.0.25 LSP_R3D_IFACE_NAME := lsp-r3d-iface LSP_R3D_IFACE_TYPE := src LSP_R3D_IFACE_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git LSP_R3D_IFACE_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git -LSP_R3D_GLX_LIB_VERSION := 1.0.23 +LSP_R3D_GLX_LIB_VERSION := 1.0.25 LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib LSP_R3D_GLX_LIB_TYPE := bin LSP_R3D_GLX_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git LSP_R3D_GLX_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git -LSP_R3D_WGL_LIB_VERSION := 1.0.18 +LSP_R3D_WGL_LIB_VERSION := 1.0.20 LSP_R3D_WGL_LIB_NAME := lsp-r3d-wgl-lib LSP_R3D_WGL_LIB_TYPE := bin LSP_R3D_WGL_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git LSP_R3D_WGL_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git -LSP_RUNTIME_LIB_VERSION := 1.0.27 +LSP_RUNTIME_LIB_VERSION := 1.0.29 LSP_RUNTIME_LIB_NAME := lsp-runtime-lib LSP_RUNTIME_LIB_TYPE := src LSP_RUNTIME_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git LSP_RUNTIME_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git -LSP_TEST_FW_VERSION := 1.0.30 +LSP_TEST_FW_VERSION := 1.0.32 LSP_TEST_FW_NAME := lsp-test-fw LSP_TEST_FW_TYPE := src LSP_TEST_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git LSP_TEST_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_TEST_FW_NAME).git -LSP_TK_LIB_VERSION := 1.0.27 +LSP_TK_LIB_VERSION := 1.0.29 LSP_TK_LIB_NAME := lsp-tk-lib LSP_TK_LIB_TYPE := src LSP_TK_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_TK_LIB_NAME).git LSP_TK_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_TK_LIB_NAME).git -LSP_WS_LIB_VERSION := 1.0.27 +LSP_WS_LIB_VERSION := 1.0.29 LSP_WS_LIB_NAME := lsp-ws-lib LSP_WS_LIB_TYPE := src LSP_WS_LIB_URL_RO := https://github.com/lsp-plugins/$(LSP_WS_LIB_NAME).git LSP_WS_LIB_URL_RW := git@github.com:lsp-plugins/$(LSP_WS_LIB_NAME).git # Plugin-related module dependencies -LSP_PLUGIN_FW_VERSION := 1.0.29 +LSP_PLUGIN_FW_VERSION := 1.0.31 LSP_PLUGIN_FW_NAME := lsp-plugin-fw LSP_PLUGIN_FW_TYPE := src LSP_PLUGIN_FW_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGIN_FW_NAME).git LSP_PLUGIN_FW_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGIN_FW_NAME).git -LSP_PLUGINS_SHARED_VERSION := 1.0.28 +LSP_PLUGINS_SHARED_VERSION := 1.0.30 LSP_PLUGINS_SHARED_NAME := lsp-plugins-shared LSP_PLUGINS_SHARED_TYPE := src LSP_PLUGINS_SHARED_URL_RO := https://github.com/lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git LSP_PLUGINS_SHARED_URL_RW := git@github.com:lsp-plugins/$(LSP_PLUGINS_SHARED_NAME).git # System libraries +LIBAUDIOTOOLBOX_VERSION := system +LIBAUDIOTOOLBOX_NAME := libaudiotoolbox +LIBAUDIOTOOLBOX_TYPE := opt +LIBAUDIOTOOLBOX_LDFLAGS := -framework AudioToolbox + +LIBCOCOA_VERSION := system +LIBCOCOA_NAME := libcocoa +LIBCOCOA_TYPE := opt +LIBCOCOA_LDFLAGS := -framework Cocoa + +LIBCOREFOUNDATION_VERSION := system +LIBCOREFOUNDATION_NAME := libcorefoundation +LIBCOREFOUNDATION_TYPE := opt +LIBCOREFOUNDATION_LDFLAGS := -framework CoreFoundation + LIBADVAPI_VERSION := system LIBADVAPI_NAME := libadvapi32 LIBADVAPI_TYPE := opt diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/project.mk 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/project.mk --- 1.2.21-5/modules/lsp-plugins-chorus/project.mk 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/project.mk 2025-08-26 18:15:46.885972623 +0000 @@ -25,7 +25,7 @@ ARTIFACT_TYPE = plug ARTIFACT_DESC = LSP Chorus Plugin ARTIFACT_HEADERS = lsp-plug.in ARTIFACT_EXPORT_HEADERS = 0 -ARTIFACT_VERSION = 1.0.6 +ARTIFACT_VERSION = 1.0.8 diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/res/doc/configs/chorus_stereo.cfg 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/res/doc/configs/chorus_stereo.cfg --- 1.2.21-5/modules/lsp-plugins-chorus/res/doc/configs/chorus_stereo.cfg 2025-03-01 12:43:00.092628577 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/res/doc/configs/chorus_stereo.cfg 2025-08-26 18:15:46.885972623 +0000 @@ -1,15 +1,17 @@ # ------------------------------------------------------------------------------- # This file contains configuration of the audio plugin. -# Package: test (Test Case) -# Package version: 0.0.0-devel -# Plugin name: Chorus Stereo (Chorus Stereo) -# Plugin version: 1.0.0 -# UID: chorus_stereo -# LV2 URI: http://lsp-plug.in/plugins/lv2/chorus_stereo -# VST 2.x identifier: ch1s -# VST 3.x identifier: 64737020636831732020202063683173 -# LADSPA identifier: 5002315 -# LADSPA label: http://lsp-plug.in/plugins/ladspa/chorus_stereo +# Package: test (Test Case) +# Package version: 0.0.0-devel +# Plugin name: Chorus Stereo (Chorus Stereo) +# Plugin version: 1.0.7 +# UID: chorus_stereo +# CLAP URI: in.lsp-plug.chorus_stereo +# GStreamer identifier: lsp-plugins-chorus-stereo +# LADSPA identifier: 5002315 +# LADSPA label: http://lsp-plug.in/plugins/ladspa/chorus_stereo +# LV2 URI: http://lsp-plug.in/plugins/lv2/chorus_stereo +# VST 2.x identifier: ch1s +# VST 3.x identifier: 64737020636831732020202063683173 # # (C) Test Case # https://lsp-plug.in/ @@ -199,6 +201,9 @@ fb_on = true # Feedback gain [G]: 0.00000000..0.89125091 fgain = -2.51 db +# Feedback drive [G]: 0.00000000..1.00000000 +fdrive = -48.49 db + # Feedback delay [ms]: 0.00000000..5.00000000 fdelay = 0.00000 Binary files 1.2.21-5/modules/lsp-plugins-chorus/res/doc/screenshots/chorus_mono.png and 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/res/doc/screenshots/chorus_mono.png differ Binary files 1.2.21-5/modules/lsp-plugins-chorus/res/doc/screenshots/chorus_stereo.png and 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/res/doc/screenshots/chorus_stereo.png differ diff -pruN 1.2.21-5/modules/lsp-plugins-chorus/res/main/ui/effects/chorus.xml 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/res/main/ui/effects/chorus.xml --- 1.2.21-5/modules/lsp-plugins-chorus/res/main/ui/effects/chorus.xml 2025-03-01 12:43:00.096628554 +0000 +++ 1.2.23-0ubuntu1/modules/lsp-plugins-chorus/res/main/ui/effects/chorus.xml 2025-08-26 18:15:46.893972545 +0000 @@ -1,7 +1,6 @@ - - + @@ -22,7 +21,7 @@ - + @@ -261,7 +260,6 @@ - @@ -313,7 +311,7 @@ - + @@ -415,12 +413,8 @@ - - - - - + @@ -503,10 +497,6 @@ - - - - @@ -520,10 +510,11 @@ - + + + - - + + + - + + @@ -543,10 +537,12 @@ + - + - + + @@ -554,10 +550,12 @@ + - + - + + @@ -569,14 +567,16 @@ - + + - - + + - + + @@ -598,7 +598,6 @@ - @@ -647,75 +646,91 @@ - + - - -