[asterisk-scf-commits] asterisk-scf/integration/webrtc.git branch "jitterbuf" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Sun Oct 16 20:20:44 CDT 2011
branch "jitterbuf" has been updated
via bef1fcdd1a794c36fc330d8e0bb40ff1af5ad565 (commit)
via 37e6ca05f60d19459f60dc641e0a51a8ea5c4923 (commit)
from 4bdc1b9900983ff08044b17c6487864d5cd97f5c (commit)
Summary of changes:
CMakeLists.txt | 4 +++-
.../main/interface/spl_inl.h | 4 ++--
.../main/source/CMakeLists.txt | 6 ++++++
src/modules/NetEQ/main/source/CMakeLists.txt | 7 +++++++
.../codecs/PCM16B/main/source/CMakeLists.txt | 7 +++++++
5 files changed, 25 insertions(+), 3 deletions(-)
- Log -----------------------------------------------------------------
commit bef1fcdd1a794c36fc330d8e0bb40ff1af5ad565
Author: Joshua Colp <jcolp at digium.com>
Date: Sun Oct 16 20:24:07 2011 -0300
Add support for building on 64-bit Linux.
diff --git a/src/common_audio/signal_processing_library/main/interface/spl_inl.h b/src/common_audio/signal_processing_library/main/interface/spl_inl.h
index ef26766..ecbf2e7 100644
--- a/src/common_audio/signal_processing_library/main/interface/spl_inl.h
+++ b/src/common_audio/signal_processing_library/main/interface/spl_inl.h
@@ -92,7 +92,7 @@ static __inline WebRtc_Word16 WebRtcSpl_GetSizeInBits(WebRtc_UWord32 n) {
if (0x00000002 & (n >> bits)) bits += 1;
if (0x00000001 & (n >> bits)) bits += 1;
- return bits;
+ return (WebRtc_Word16)bits;
}
static __inline int WebRtcSpl_NormW32(WebRtc_Word32 a) {
@@ -134,7 +134,7 @@ static __inline int WebRtcSpl_NormU32(WebRtc_UWord32 a) {
static __inline int WebRtcSpl_NormW16(WebRtc_Word16 a) {
int zeros;
- if (a <= 0) a ^= 0xFFFF;
+ if (a <= 0) a ^= (WebRtc_Word16)0xFFFF;
if (!(0xFF80 & a)) {
zeros = 8;
diff --git a/src/common_audio/signal_processing_library/main/source/CMakeLists.txt b/src/common_audio/signal_processing_library/main/source/CMakeLists.txt
index b950b23..8c5966f 100644
--- a/src/common_audio/signal_processing_library/main/source/CMakeLists.txt
+++ b/src/common_audio/signal_processing_library/main/source/CMakeLists.txt
@@ -51,5 +51,11 @@ astscf_component_add_files(astscf-webrtc-signal-proc filter_ma_fast_q12.c)
astscf_component_build_library(astscf-webrtc-signal-proc STATIC)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ set_target_properties(astscf-webrtc-signal-proc PROPERTIES COMPILE_FLAGS -fPIC)
+ endif()
+endif()
+
astscf_component_install(astscf-webrtc-signal-proc)
diff --git a/src/modules/NetEQ/main/source/CMakeLists.txt b/src/modules/NetEQ/main/source/CMakeLists.txt
index ff857ba..f9f8b93 100644
--- a/src/modules/NetEQ/main/source/CMakeLists.txt
+++ b/src/modules/NetEQ/main/source/CMakeLists.txt
@@ -48,6 +48,13 @@ astscf_component_add_files(astscf-webrtc-neteq unmute_signal.c)
#endif()
astscf_component_build_library(astscf-webrtc-neteq STATIC)
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+ if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ set_target_properties(astscf-webrtc-neteq PROPERTIES COMPILE_FLAGS -fPIC)
+ endif()
+endif()
+
target_link_libraries(astscf-webrtc-neteq astscf-webrtc-signal-proc astscf-webrtc-pcm16b-codec)
astscf_component_install(astscf-webrtc-neteq)
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt b/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt
index 29754e6..ee5a18f 100644
--- a/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt
+++ b/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt
@@ -11,6 +11,13 @@ astscf_component_add_files(astscf-webrtc-pcm16b-codec ${pcm16b_headers} ${common
astscf_component_add_files(astscf-webrtc-pcm16b-codec pcm16b.c)
astscf_component_build_library(astscf-webrtc-pcm16b-codec STATIC)
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+ if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ set_target_properties(astscf-webrtc-pcm16b-codec PROPERTIES COMPILE_FLAGS -fPIC)
+ endif()
+endif()
+
target_link_libraries(astscf-webrtc-signal-proc)
astscf_component_install(astscf-webrtc-pcm16b-codec)
commit 37e6ca05f60d19459f60dc641e0a51a8ea5c4923
Author: Joshua Colp <jcolp at digium.com>
Date: Sun Oct 16 20:23:39 2011 -0300
Enable wideband support so the jitterbuffer supports 16kHz.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03cb96f..377542d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
set(astscf-webtrc_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-add_subdirectory(src)
\ No newline at end of file
+add_definitions(-DNETEQ_WIDEBAND)
+
+add_subdirectory(src)
-----------------------------------------------------------------------
--
asterisk-scf/integration/webrtc.git
More information about the asterisk-scf-commits
mailing list