Fix issues with C++ and add an option to compile without opus

Author: almoghamdani

CMakeLists.txt

@@ -1,11 +1,36 @@
 cmake_minimum_required(VERSION 3.1)
 project(rnnoise)
 
+option(RNNOISE_COMPILE_OPUS ON)
+
+if(RNNOISE_COMPILE_OPUS)
+	add_definitions(-DCOMPILE_OPUS)
+endif()
+
+# Ignore CRT warnings
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
 # Get source files
 file(GLOB SOURCES "src/*.c" "src/*.h" "include/*.h")
 
+# Build rnnoise
+add_definitions(-DRNNOISE_BUILD)
+
 # Compile the library
-add_library(rnnoise STATIC ${SOURCES})
+add_library(rnnoise ${SOURCES})
+
+# Build DLL if needed
+if(BUILD_SHARED_LIBS)
+  if(WIN32)
+    target_compile_definitions(rnnoise PRIVATE DLL_EXPORT)
+  else()
+    include(CheckCCompilerFlag)
+    check_c_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
+    if(COMPILER_HAS_HIDDEN_VISIBILITY)
+      set_target_properties(rnnoise PROPERTIES C_VISIBILITY_PRESET hidden)
+    endif()
+  endif()
+endif()
 
 # Include dirs
 target_include_directories(rnnoise PUBLIC

include/rnnoise.h

@@ -30,7 +30,6 @@
 
 #include <stdio.h>
 
-
 #ifndef RNNOISE_EXPORT
 # if defined(WIN32)
 #  if defined(RNNOISE_BUILD) && defined(DLL_EXPORT)
@@ -45,6 +44,10 @@
 # endif
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct DenoiseState DenoiseState;
 typedef struct RNNModel RNNModel;
 
@@ -62,4 +65,7 @@ RNNOISE_EXPORT RNNModel *rnnoise_model_from_file(FILE *f);
 
 RNNOISE_EXPORT void rnnoise_model_free(RNNModel *model);
 
+#ifdef __cplusplus
+}
+#endif
 #endif

src/kiss_fft.c

@@ -515,6 +515,7 @@ void opus_fft_free(const kiss_fft_state *cfg, int arch)
 
 #endif /* CUSTOM_MODES */
 
+#ifdef COMPILE_OPUS
 void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout)
 {
     int m2, m;
@@ -599,3 +600,4 @@ void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *
    for (i=0;i<st->nfft;i++)
       fout[i].i = -fout[i].i;
 }
+#endif

src/rnn.c

@@ -76,6 +76,7 @@ static OPUS_INLINE float relu(float x)
    return x < 0 ? 0 : x;
 }
 
+#ifdef COMPILE_OPUS
 void compute_dense(const DenseLayer *layer, float *output, const float *input)
 {
    int i, j;
@@ -154,6 +155,7 @@ void compute_gru(const GRULayer *gru, float *state, const float *input)
    for (i=0;i<N;i++)
       state[i] = h[i];
 }
+#endif
 
 #define INPUT_SIZE 42