diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2023-12-13 01:57:59 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-12-20 07:01:25 +0300 |
| commit | 10d1997614eb0f04a8ca178db1919059d4daad91 (patch) | |
| tree | b6128b2186f94d68045f13d24231122c5628c02b | |
| parent | 7abb83ba3cd85eae7418bf5b5798d334bcf71acf (diff) | |
Add OPUS_OSCE option to cmake
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | cmake/OpusSources.cmake | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 073d7de8..9827fea8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,10 @@ set(OPUS_DRED_HELP_STR "enable DRED.") option(OPUS_DRED ${OPUS_DRED_HELP_STR} OFF) add_feature_info(OPUS_DRED OPUS_DRED ${OPUS_DRED_HELP_STR}) +set(OPUS_OSCE_HELP_STR "enable OSCE.") +option(OPUS_OSCE ${OPUS_OSCE_HELP_STR} OFF) +add_feature_info(OPUS_OSCE OPUS_OSCE ${OPUS_OSCE_HELP_STR}) + if(APPLE) set(OPUS_BUILD_FRAMEWORK_HELP_STR "build Framework bundle for Apple systems.") option(OPUS_BUILD_FRAMEWORK ${OPUS_BUILD_FRAMEWORK_HELP_STR} OFF) @@ -366,6 +370,7 @@ add_sources_group(opus silk ${silk_headers} ${silk_sources}) add_sources_group(opus celt ${celt_headers} ${celt_sources}) add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources}) add_sources_group(opus lpcnet ${dred_headers} ${dred_sources}) +add_sources_group(opus lpcnet ${osce_headers} ${osce_sources}) if(OPUS_FIXED_POINT) add_sources_group(opus silk ${silk_sources_fixed}) @@ -387,6 +392,13 @@ if (OPUS_DRED) endif() endif() +if (OPUS_OSCE) + target_compile_definitions(opus PRIVATE ENABLE_OSCE) + if(NOT OPUS_DEEP_PLC) + target_compile_definitions(opus PRIVATE ENABLE_DEEP_PLC) + endif() +endif() + if(NOT OPUS_DISABLE_INTRINSICS) if(((OPUS_X86_MAY_HAVE_SSE AND NOT OPUS_X86_PRESUME_SSE) OR (OPUS_X86_MAY_HAVE_SSE2 AND NOT OPUS_X86_PRESUME_SSE2) OR diff --git a/cmake/OpusSources.cmake b/cmake/OpusSources.cmake index 74e4eaed..0cf24557 100644 --- a/cmake/OpusSources.cmake +++ b/cmake/OpusSources.cmake @@ -42,8 +42,10 @@ get_opus_sources(CELT_SOURCES_ARM_NE10 celt_sources.mk celt_sources_arm_ne10) get_opus_sources(DEEP_PLC_HEAD lpcnet_headers.mk deep_plc_headers) get_opus_sources(DRED_HEAD lpcnet_headers.mk dred_headers) +get_opus_sources(OSCE_HEAD lpcnet_headers.mk osce_headers) get_opus_sources(DEEP_PLC_SOURCES lpcnet_sources.mk deep_plc_sources) get_opus_sources(DRED_SOURCES lpcnet_sources.mk dred_sources) +get_opus_sources(OSCE_SOURCES lpcnet_sources.mk osce_sources) get_opus_sources(DNN_SOURCES_X86_RTCD lpcnet_sources.mk dnn_sources_x86_rtcd) get_opus_sources(DNN_SOURCES_SSE2 lpcnet_sources.mk dnn_sources_sse2) get_opus_sources(DNN_SOURCES_SSE4_1 lpcnet_sources.mk dnn_sources_sse4_1) |