From 7fdcb166b4fcf84320b874ee382d0edd58783a55 Mon Sep 17 00:00:00 2001 From: pkv Date: Tue, 3 Sep 2024 22:00:52 +0200 Subject: [PATCH] obs-filters: Fix building of noise reduction If speex and rnnoise are disabled but nvafx is enabled, the noise reduction filter still needs to be built. This fixes the issue. Co-authored-by: Ryan Foster Signed-off-by: pkv --- plugins/obs-filters/CMakeLists.txt | 5 +---- plugins/obs-filters/cmake/nvidia.cmake | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 plugins/obs-filters/cmake/nvidia.cmake diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt index 3deb2b57b..af07700b5 100644 --- a/plugins/obs-filters/CMakeLists.txt +++ b/plugins/obs-filters/CMakeLists.txt @@ -5,10 +5,6 @@ legacy_check() add_library(obs-filters MODULE) add_library(OBS::filters ALIAS obs-filters) -if(OS_WINDOWS) - target_enable_feature(obs-filters "NVIDIA Audio FX support" LIBNVAFX_ENABLED HAS_NOISEREDUCTION) -endif() - target_sources( obs-filters PRIVATE @@ -41,6 +37,7 @@ include(cmake/speexdsp.cmake) include(cmake/rnnoise.cmake) if(OS_WINDOWS) + include(cmake/nvidia.cmake) configure_file(cmake/windows/obs-module.rc.in obs-filters.rc) target_sources(obs-filters PRIVATE obs-filters.rc) endif() diff --git a/plugins/obs-filters/cmake/nvidia.cmake b/plugins/obs-filters/cmake/nvidia.cmake new file mode 100644 index 000000000..e6b1e9f0b --- /dev/null +++ b/plugins/obs-filters/cmake/nvidia.cmake @@ -0,0 +1,4 @@ +if(ENABLE_NVAFX) + target_sources(obs-filters PRIVATE noise-suppress-filter.c) + target_compile_definitions(obs-filters PRIVATE LIBNVAFX_ENABLED HAS_NOISEREDUCTION) +endif()