[asterisk-scf-commits] asterisk-scf/integration/webrtc.git branch "jitterbuf" updated.

[Commits to the Asterisk SCF project code repositories]

branch "jitterbuf" has been updated
       via  4bdc1b9900983ff08044b17c6487864d5cd97f5c (commit)
      from  d6d058ba66237090e7900d63e042bc3d5fbb7971 (commit)

Summary of changes:
 CMakeLists.txt                                     |    4 +++-
 src/modules/NetEQ/main/CMakeLists.txt              |    1 -
 src/modules/NetEQ/main/source/CMakeLists.txt       |   10 +++++-----
 src/modules/audio_coding/codecs/CMakeLists.txt     |    8 +++++++-
 src/modules/audio_coding/codecs/CNG/CMakeLists.txt |    2 ++
 .../audio_coding/codecs/CNG/main/CMakeLists.txt    |    1 +
 .../audio_coding/codecs/PCM16B/CMakeLists.txt      |    2 ++
 .../audio_coding/codecs/PCM16B/main/CMakeLists.txt |    2 ++
 .../codecs/PCM16B/main/source/CMakeLists.txt       |   18 ++++++++++++++++++
 9 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 src/modules/audio_coding/codecs/CNG/CMakeLists.txt
 create mode 100644 src/modules/audio_coding/codecs/CNG/main/CMakeLists.txt
 create mode 100644 src/modules/audio_coding/codecs/PCM16B/CMakeLists.txt
 create mode 100644 src/modules/audio_coding/codecs/PCM16B/main/CMakeLists.txt
 create mode 100644 src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt


- Log -----------------------------------------------------------------
commit 4bdc1b9900983ff08044b17c6487864d5cd97f5c
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Oct 13 01:48:49 2011 -0500

    Added additional files to the build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae7e9e4..03cb96f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,2 +1,4 @@
-# Asterisk SCF integrated build.
+
+set(astscf-webtrc_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+
 add_subdirectory(src)
\ No newline at end of file
diff --git a/src/modules/NetEQ/main/CMakeLists.txt b/src/modules/NetEQ/main/CMakeLists.txt
index af4fabd..b7307a5 100644
--- a/src/modules/NetEQ/main/CMakeLists.txt
+++ b/src/modules/NetEQ/main/CMakeLists.txt
@@ -1,2 +1 @@
-# Asterisk SCF integrated build.
 add_subdirectory(source)
\ No newline at end of file
diff --git a/src/modules/NetEQ/main/source/CMakeLists.txt b/src/modules/NetEQ/main/source/CMakeLists.txt
index 8b1539a..ff857ba 100644
--- a/src/modules/NetEQ/main/source/CMakeLists.txt
+++ b/src/modules/NetEQ/main/source/CMakeLists.txt
@@ -43,12 +43,12 @@ astscf_component_add_files(astscf-webrtc-neteq signal_mcu.c)
 astscf_component_add_files(astscf-webrtc-neteq split_and_insert.c)
 astscf_component_add_files(astscf-webrtc-neteq unmute_signal.c)
 
-if(WIN32)
-    add_definitions(-DWEBRTC_EXPORT)
-endif()
+#if(WIN32)
+#    add_definitions(-DWEBRTC_EXPORT)
+#endif()
 
-astscf_component_build_library(astscf-webrtc-neteq)
-target_link_libraries(astscf-webrtc-neteq astscf-webrtc-signal-proc)
+astscf_component_build_library(astscf-webrtc-neteq STATIC)
+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/CMakeLists.txt b/src/modules/audio_coding/codecs/CMakeLists.txt
index d69ce25..483d995 100644
--- a/src/modules/audio_coding/codecs/CMakeLists.txt
+++ b/src/modules/audio_coding/codecs/CMakeLists.txt
@@ -1 +1,7 @@
-# Asterisk SCF integrated build.
\ No newline at end of file
+
+# add_subdirectory(CNG)
+# add_subdirectory(G711)
+# add_subdirectory(G722)
+# add_subdirectory(iLBC)
+# add_subdirectory(iSAC)
+add_subdirectory(PCM16B)
diff --git a/src/modules/audio_coding/codecs/CNG/CMakeLists.txt b/src/modules/audio_coding/codecs/CNG/CMakeLists.txt
new file mode 100644
index 0000000..a03765a
--- /dev/null
+++ b/src/modules/audio_coding/codecs/CNG/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(main)
diff --git a/src/modules/audio_coding/codecs/CNG/main/CMakeLists.txt b/src/modules/audio_coding/codecs/CNG/main/CMakeLists.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/modules/audio_coding/codecs/CNG/main/CMakeLists.txt
@@ -0,0 +1 @@
+
diff --git a/src/modules/audio_coding/codecs/PCM16B/CMakeLists.txt b/src/modules/audio_coding/codecs/PCM16B/CMakeLists.txt
new file mode 100644
index 0000000..a03765a
--- /dev/null
+++ b/src/modules/audio_coding/codecs/PCM16B/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(main)
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/CMakeLists.txt b/src/modules/audio_coding/codecs/PCM16B/main/CMakeLists.txt
new file mode 100644
index 0000000..3e9047e
--- /dev/null
+++ b/src/modules/audio_coding/codecs/PCM16B/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(source)
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt b/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt
new file mode 100644
index 0000000..29754e6
--- /dev/null
+++ b/src/modules/audio_coding/codecs/PCM16B/main/source/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Asterisk SCF integrated build.
+astscf_component_init(astscf-webrtc-pcm16b-codec)
+
+include_directories(${common_audio_dir}/signal_processing_library/main/interface)
+include_directories(../interface)
+include_directories(${top_header_dir})
+
+file(GLOB_RECURSE pcm16b_headers ../interface/*.h *.h)
+astscf_component_add_files(astscf-webrtc-pcm16b-codec ${pcm16b_headers} ${common_webrtc_headers} ${codec_interface_headers})
+
+astscf_component_add_files(astscf-webrtc-pcm16b-codec pcm16b.c)
+
+astscf_component_build_library(astscf-webrtc-pcm16b-codec STATIC)
+target_link_libraries(astscf-webrtc-signal-proc)
+
+astscf_component_install(astscf-webrtc-pcm16b-codec)
+
+

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/webrtc.git