Skip to content
Snippets Groups Projects
Commit def132d3 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

build/cmake: support building with speexdsp

Change-Id: I74dd3db0aeab65ea3708b3616b62faa742ffb879
parent d0a40f2a
No related branches found
No related tags found
No related merge requests found
...@@ -162,6 +162,7 @@ source_group("Source Files\\media" FILES ${Source_Files__media}) ...@@ -162,6 +162,7 @@ source_group("Source Files\\media" FILES ${Source_Files__media})
source_group("Source Files\\media\\audio" FILES ${Source_Files__media__audio}) source_group("Source Files\\media\\audio" FILES ${Source_Files__media__audio})
source_group("Source Files\\media\\audio\\audio-processing" FILES ${Source_Files__media__audio__audio_processing}) source_group("Source Files\\media\\audio\\audio-processing" FILES ${Source_Files__media__audio__audio_processing})
source_group("Source Files\\media\\audio\\audio-processing" FILES ${Source_Files__media__audio__webrtc}) source_group("Source Files\\media\\audio\\audio-processing" FILES ${Source_Files__media__audio__webrtc})
source_group("Source Files\\media\\audio\\audio-processing" FILES ${Source_Files__media__audio__speexdsp})
source_group("Source Files\\media\\audio\\sound" FILES ${Source_Files__media__audio__sound}) source_group("Source Files\\media\\audio\\sound" FILES ${Source_Files__media__audio__sound})
source_group("Source Files\\media\\video" FILES ${Source_Files__media__video}) source_group("Source Files\\media\\video" FILES ${Source_Files__media__video})
source_group("Source Files\\plugin" FILES ${Source_Files__plugin}) source_group("Source Files\\plugin" FILES ${Source_Files__plugin})
...@@ -489,6 +490,7 @@ else() ...@@ -489,6 +490,7 @@ else()
pkg_search_module (swresample REQUIRED IMPORTED_TARGET libswresample) pkg_search_module (swresample REQUIRED IMPORTED_TARGET libswresample)
pkg_search_module (swscale REQUIRED IMPORTED_TARGET libswscale) pkg_search_module (swscale REQUIRED IMPORTED_TARGET libswscale)
pkg_search_module (avutil REQUIRED IMPORTED_TARGET libavutil) pkg_search_module (avutil REQUIRED IMPORTED_TARGET libavutil)
pkg_search_module (speexdsp REQUIRED IMPORTED_TARGET speexdsp)
if (JAMI_PLUGIN) if (JAMI_PLUGIN)
if (APPLE) if (APPLE)
pkg_search_module (archive REQUIRED IMPORTED_TARGET minizip) pkg_search_module (archive REQUIRED IMPORTED_TARGET minizip)
...@@ -546,6 +548,12 @@ else() ...@@ -546,6 +548,12 @@ else()
target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::webrtcap) target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::webrtcap)
target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WEBRTC_AP) target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WEBRTC_AP)
endif() endif()
if (speexdsp_FOUND)
target_sources(${PROJECT_NAME} PRIVATE ${Source_Files__media__audio__speexdsp} )
target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::speexdsp)
target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_SPEEXDSP)
endif()
install (TARGETS ${PROJECT_NAME}) install (TARGETS ${PROJECT_NAME})
if (JAMI_JNI) if (JAMI_JNI)
......
...@@ -92,6 +92,7 @@ set (Source_Files__media__audio ${Source_Files__media__audio} PARENT_SCOPE) ...@@ -92,6 +92,7 @@ set (Source_Files__media__audio ${Source_Files__media__audio} PARENT_SCOPE)
set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE) set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE) set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE) set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)
set (Source_Files__media__audio__speexdsp ${Source_Files__media__audio__speexdsp} PARENT_SCOPE)
set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE) set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE)
if(MSVC) if(MSVC)
set (Source_Files__media__audio__portaudio ${Source_Files__media__audio__portaudio} PARENT_SCOPE) set (Source_Files__media__audio__portaudio ${Source_Files__media__audio__portaudio} PARENT_SCOPE)
......
...@@ -58,6 +58,7 @@ endif() ...@@ -58,6 +58,7 @@ endif()
set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE) set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE) set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE) set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)
set (Source_Files__media__audio__speexdsp ${Source_Files__media__audio__speexdsp} PARENT_SCOPE)
set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE) set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE)
if(MSVC) if(MSVC)
......
...@@ -42,3 +42,4 @@ set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARE ...@@ -42,3 +42,4 @@ set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARE
add_subdirectory(audio-processing) add_subdirectory(audio-processing)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE) set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE) set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)
set (Source_Files__media__audio__speexdsp ${Source_Files__media__audio__speexdsp} PARENT_SCOPE)
...@@ -5,6 +5,9 @@ list (APPEND Source_Files__media__audio__audio_processing ...@@ -5,6 +5,9 @@ list (APPEND Source_Files__media__audio__audio_processing
"${CMAKE_CURRENT_SOURCE_DIR}/audio_processor.h" "${CMAKE_CURRENT_SOURCE_DIR}/audio_processor.h"
"${CMAKE_CURRENT_SOURCE_DIR}/null_audio_processor.h" "${CMAKE_CURRENT_SOURCE_DIR}/null_audio_processor.h"
"${CMAKE_CURRENT_SOURCE_DIR}/null_audio_processor.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/null_audio_processor.cpp"
)
list (APPEND Source_Files__media__audio__speexdsp
"${CMAKE_CURRENT_SOURCE_DIR}/speex.h" "${CMAKE_CURRENT_SOURCE_DIR}/speex.h"
"${CMAKE_CURRENT_SOURCE_DIR}/speex.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/speex.cpp"
) )
...@@ -16,3 +19,4 @@ list (APPEND Source_Files__media__audio__webrtc ...@@ -16,3 +19,4 @@ list (APPEND Source_Files__media__audio__webrtc
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE) set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE) set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)
set (Source_Files__media__audio__speexdsp ${Source_Files__media__audio__speexdsp} PARENT_SCOPE)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment