From e61851f533abc09205d94076625bb68eae5af670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 12 Mar 2015 09:51:02 +0100 Subject: [PATCH 01/19] Fix missing files in the distributed archive and prevent intallation of private headers --- include/Makefile.am | 4 ++-- include/bcg729/Makefile.am | 6 ++++-- test/Makefile.am | 2 ++ test/bin/Makefile.am | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index 8ace3bd..90a391b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = bcg729 -include_HEADERS= adaptativeCodebookSearch.h \ +private_headers= adaptativeCodebookSearch.h \ basicOperationsMacros.h \ codebooks.h \ codecParameters.h \ @@ -28,4 +28,4 @@ include_HEADERS= adaptativeCodebookSearch.h \ typedef.h \ utils.h -EXTRA_DIST=$(include_HEADERS) +EXTRA_DIST=$(private_headers) diff --git a/include/bcg729/Makefile.am b/include/bcg729/Makefile.am index 4ddad37..4013392 100644 --- a/include/bcg729/Makefile.am +++ b/include/bcg729/Makefile.am @@ -1,8 +1,10 @@ bcg729_includedir=$(includedir)/bcg729 +public_headers=encoder.h decoder.h + bcg729_include_HEADERS= if !BUILD_MSBCG729 -bcg729_include_HEADERS+=encoder.h decoder.h +bcg729_include_HEADERS+=$(public_headers) endif -EXTRA_DIST=$(bcg729_include_HEADERS) +EXTRA_DIST=$(public_headers) diff --git a/test/Makefile.am b/test/Makefile.am index 6ae5df0..706b7f4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = bin TESTS = testCampaignAll + +EXTRA_DIST=testCampaignAll diff --git a/test/bin/Makefile.am b/test/bin/Makefile.am index e343173..a6fc98e 100644 --- a/test/bin/Makefile.am +++ b/test/bin/Makefile.am @@ -1,7 +1,9 @@ check_PROGRAMS=adaptativeCodebookSearchTest computeAdaptativeCodebookGainTest computeLPTest computeWeightedSpeechTest decodeAdaptativeCodeVectorTest decodeFixedCodeVectorTest decodeGainsTest decodeLSPTest \ decoderTest encoderTest decoderMultiChannelTest encoderMultiChannelTest findOpenLoopPitchDelayTest fixedCodebookSearchTest g729FixedPointMathTest gainQuantizationTest interpolateqLSPAndConvert2LPTest \ LP2LSPConversionTest LPSynthesisFilterTest LSPQuantizationTest postFilterTest postProcessingTest preProcessingTest -util_src=$(top_srcdir)/test/src/testUtils.c +util_src= \ + $(top_srcdir)/test/src/testUtils.c \ + $(top_srcdir)/test/src/testUtils.h adaptativeCodebookSearchTest_SOURCES=$(top_srcdir)/test/src/adaptativeCodebookSearchTest.c $(util_src) computeAdaptativeCodebookGainTest_SOURCES=$(top_srcdir)/test/src/computeAdaptativeCodebookGainTest.c $(util_src) From 6f4e6aab6b664cd33eab00e8ffd39de21dff9862 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 12 Mar 2015 22:15:05 +0100 Subject: [PATCH 02/19] fix make distcheck --- test/Makefile.am | 14 ++++++++++++-- test/testCampaignAll | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 706b7f4..cbb490a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,15 @@ SUBDIRS = bin -TESTS = testCampaignAll +testCampaignAll-exec: $(srcdir)/testCampaignAll $(srcdir)/testCampaign + cp -f $(srcdir)/testCampaignAll testCampaignAll-exec + cp -f $(srcdir)/testCampaign testCampaign-exec -EXTRA_DIST=testCampaignAll + +TESTS = testCampaignAll-exec + +EXTRA_DIST=testCampaignAll testCampaign + +CLEANFILES=testCampaignAll-exec testCampaign-exec + +clean-local: + rm -rf patterns diff --git a/test/testCampaignAll b/test/testCampaignAll index dc9473b..e72eab7 100755 --- a/test/testCampaignAll +++ b/test/testCampaignAll @@ -29,4 +29,4 @@ if [ ! -d "patterns" ]; then fi # run all the tests -./testCampaign all +./testCampaign-exec all From b2c07fe46ab131fe9a8db40397865c70d6f4cb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 16 Mar 2015 11:52:38 +0100 Subject: [PATCH 03/19] Increment version number --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 829997c..07acbb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ project(BCG729 C) set(PACKAGE "bcg729") set(PACKAGE_NAME "${PACKAGE}") -set(PACKAGE_VERSION "0.1") +set(PACKAGE_VERSION "0.2") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "support@belledonne-communications.com") set(PACKAGE_TARNAME "bcg729") diff --git a/configure.ac b/configure.ac index 1c16f14..fd9a020 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ -AC_INIT([bcg729],[0.1]) +AC_INIT([bcg729],[0.2]) AC_CANONICAL_SYSTEM AC_PREREQ(2.63) AC_CONFIG_SRCDIR([src/encoder.c]) From 656563e27484af358cf107cacd0cf32aeac4b73c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 17 Mar 2015 17:02:01 +0100 Subject: [PATCH 04/19] set version to 1.0.0 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07acbb5..accfac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ project(BCG729 C) set(PACKAGE "bcg729") set(PACKAGE_NAME "${PACKAGE}") -set(PACKAGE_VERSION "0.2") +set(PACKAGE_VERSION "1.0.0") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "support@belledonne-communications.com") set(PACKAGE_TARNAME "bcg729") diff --git a/configure.ac b/configure.ac index fd9a020..6c9b8b3 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ -AC_INIT([bcg729],[0.2]) +AC_INIT([bcg729],[1.0.0]) AC_CANONICAL_SYSTEM AC_PREREQ(2.63) AC_CONFIG_SRCDIR([src/encoder.c]) From 169ed0bfe22b31093229ecf46a6b96afc5f0f7a5 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 19 May 2015 17:29:58 +0200 Subject: [PATCH 05/19] CMakeLists.txt: add ENABLE_STATIC option --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index accfac4..8fd0495 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ set(VERSION "${PACKAGE_VERSION}") option(ENABLE_TESTS "Enable compilation of the tests." No) option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." Yes) - +option(ENABLE_STATIC "Build static library (default is shared library)." OFF) if(ENABLE_MSPLUGIN) find_package(Mediastreamer2) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7e694ac..1139c20 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ # ############################################################################ -set(BCG729_SOURCE_FILES +set(SOURCE_FILES adaptativeCodebookSearch.c codebooks.c computeAdaptativeCodebookGain.c @@ -46,16 +46,20 @@ set(BCG729_SOURCE_FILES utils.c ) -add_library(bcg729 SHARED ${BCG729_SOURCE_FILES}) -set_target_properties(bcg729 PROPERTIES VERSION 0) -if(MSVC) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libbcg729.pdb - DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) +if (ENABLE_STATIC) + add_library(bcg729 STATIC ${SOURCE_FILES}) +else() + add_library(bcg729 SHARED ${SOURCE_FILES}) + set_target_properties(bcg729 PROPERTIES VERSION 0) + if(MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libbcg729.pdb + DESTINATION bin + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + endif() + set_target_properties(bcg729 PROPERTIES PREFIX "lib") endif() - set_target_properties(bcg729 PROPERTIES PREFIX "lib") endif() install(TARGETS bcg729 EXPORT Bcg729Targets @@ -65,8 +69,8 @@ install(TARGETS bcg729 EXPORT Bcg729Targets PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) -set(ABS_BCG729_SOURCE_FILES ) -foreach(elem ${BCG729_SOURCE_FILES}) - list(APPEND ABS_BCG729_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}") +set(ABS_SOURCE_FILES ) +foreach(elem ${SOURCE_FILES}) + list(APPEND ABS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}") endforeach() -set(BCG729_SOURCE_FILES ${ABS_BCG729_SOURCE_FILES} PARENT_SCOPE) +set(SOURCE_FILES ${ABS_SOURCE_FILES} PARENT_SCOPE) From 6ca907ef964f5f41f3ab75a1bd2148bb26326675 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 21 May 2015 09:46:37 +0200 Subject: [PATCH 06/19] Fix build with CMake which was broken with last commit. --- CMakeLists.txt | 6 +++--- src/CMakeLists.txt | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fd0495..85f5e70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,9 @@ set(PACKAGE_URL "") set(VERSION "${PACKAGE_VERSION}") -option(ENABLE_TESTS "Enable compilation of the tests." No) -option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." Yes) -option(ENABLE_STATIC "Build static library (default is shared library)." OFF) +option(ENABLE_TESTS "Enable compilation of the tests." NO) +option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." YES) +option(ENABLE_STATIC "Build static library (default is shared library)." NO) if(ENABLE_MSPLUGIN) find_package(Mediastreamer2) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1139c20..0142feb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ # ############################################################################ -set(SOURCE_FILES +set(BCG729_SOURCE_FILES adaptativeCodebookSearch.c codebooks.c computeAdaptativeCodebookGain.c @@ -47,9 +47,9 @@ set(SOURCE_FILES ) if (ENABLE_STATIC) - add_library(bcg729 STATIC ${SOURCE_FILES}) + add_library(bcg729 STATIC ${BCG729_SOURCE_FILES}) else() - add_library(bcg729 SHARED ${SOURCE_FILES}) + add_library(bcg729 SHARED ${BCG729_SOURCE_FILES}) set_target_properties(bcg729 PROPERTIES VERSION 0) if(MSVC) if(CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -69,8 +69,8 @@ install(TARGETS bcg729 EXPORT Bcg729Targets PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) -set(ABS_SOURCE_FILES ) -foreach(elem ${SOURCE_FILES}) - list(APPEND ABS_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}") +set(ABS_BCG729_SOURCE_FILES ) +foreach(elem ${BCG729_SOURCE_FILES}) + list(APPEND ABS_BCG729_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}") endforeach() -set(SOURCE_FILES ${ABS_SOURCE_FILES} PARENT_SCOPE) +set(BCG729_SOURCE_FILES ${ABS_BCG729_SOURCE_FILES} PARENT_SCOPE) From dc37a9a01a9b69f49b6339cd2f5d999fcf584a89 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 22 May 2015 17:12:31 +0200 Subject: [PATCH 07/19] Allow build of libmsbcg729 statically with CMake. --- msbcg729/CMakeLists.txt | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/msbcg729/CMakeLists.txt b/msbcg729/CMakeLists.txt index 253998f..b798a99 100644 --- a/msbcg729/CMakeLists.txt +++ b/msbcg729/CMakeLists.txt @@ -27,16 +27,20 @@ set(SOURCE_FILES include_directories(${MEDIASTREAMER2_INCLUDE_DIRS}) -add_library(msbcg729 SHARED ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) -set_target_properties(msbcg729 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 0) -if(MSVC) - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libmsbcg729.pdb - DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) +if(ENABLE_STATIC) + add_library(msbcg729 STATIC ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) +else() + add_library(msbcg729 SHARED ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) + set_target_properties(msbcg729 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 0) + if(MSVC) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libmsbcg729.pdb + DESTINATION bin + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + endif() + set_target_properties(msbcg729 PROPERTIES PREFIX "lib") endif() - set_target_properties(msbcg729 PROPERTIES PREFIX "lib") endif() target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES}) @@ -46,3 +50,4 @@ install(TARGETS msbcg729 ARCHIVE DESTINATION lib/mediastreamer/plugins PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) + From 7f76ef482b26400995474d37fc330565a9fe0e9e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 3 Jul 2015 11:55:15 +0200 Subject: [PATCH 08/19] Add Visual Studio project for Windows 10. --- build/windows10/libmsbcg729/libmsbcg729.sln | 174 ++++++++++++++++++ .../windows10/libmsbcg729/libmsbcg729.vcxproj | 119 ++++++++++++ include/bcg729/decoder.h | 2 +- include/bcg729/encoder.h | 2 +- 4 files changed, 295 insertions(+), 2 deletions(-) create mode 100644 build/windows10/libmsbcg729/libmsbcg729.sln create mode 100644 build/windows10/libmsbcg729/libmsbcg729.vcxproj diff --git a/build/windows10/libmsbcg729/libmsbcg729.sln b/build/windows10/libmsbcg729/libmsbcg729.sln new file mode 100644 index 0000000..611f9c6 --- /dev/null +++ b/build/windows10/libmsbcg729/libmsbcg729.sln @@ -0,0 +1,174 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.22823.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmsbcg729", "libmsbcg729.vcxproj", "{ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediastreamer2", "..\..\..\..\linphone\mediastreamer2\build\windows10\mediastreamer2\mediastreamer2.vcxproj", "{88E3C241-EB6F-4C84-80DC-89B8961DAF80}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ortp", "..\..\..\..\linphone\oRTP\build\windows10\ortp\ortp.vcxproj", "{2E56B851-9D8D-40E5-84BB-E4EE63B71D25}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srtp", "..\..\..\..\srtp\build\windows10\srtp\srtp.vcxproj", "{59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2", "..\..\..\..\build\xml2\windows10\xml2\xml2.vcxproj", "{2B04DE79-4D33-4405-AC01-C89E0593A71D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polarssl", "..\..\..\..\polarssl\build\windows10\polarssl\polarssl.vcxproj", "{88768DD9-5110-4AC8-8B0E-41CD7713E1A2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speex", "..\..\..\..\speex\build\windows10\speex\speex.vcxproj", "{971DD379-1C2D-44D2-9285-FDA556C48176}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdsp", "..\..\..\..\speex\build\windows10\speexdsp\speexdsp.vcxproj", "{104BF91B-8314-4328-A996-90B8DF6052AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus", "..\..\..\..\opus\build\windows10\opus\opus.vcxproj", "{81AF1025-E0EE-4AD6-988D-2EF162778693}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzrtp", "..\..\..\..\bzrtp\build\windows10\bzrtp\bzrtp.vcxproj", "{45C7723D-3107-4906-9633-F43ABE8A7147}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsm", "..\..\..\..\gsm\build\windows10\gsm\gsm.vcxproj", "{EF1103C7-8AAC-464B-BA31-86B87246FA72}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|ARM.ActiveCfg = Debug|ARM + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|ARM.Build.0 = Debug|ARM + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x64.ActiveCfg = Debug|x64 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x64.Build.0 = Debug|x64 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x86.ActiveCfg = Debug|Win32 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Debug|x86.Build.0 = Debug|Win32 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|ARM.ActiveCfg = Release|ARM + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|ARM.Build.0 = Release|ARM + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x64.ActiveCfg = Release|x64 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x64.Build.0 = Release|x64 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x86.ActiveCfg = Release|Win32 + {ACF5EA95-D647-4D0C-8F97-2CD9AAE8A2E0}.Release|x86.Build.0 = Release|Win32 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|ARM.ActiveCfg = Debug|ARM + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|ARM.Build.0 = Debug|ARM + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x64.ActiveCfg = Debug|x64 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x64.Build.0 = Debug|x64 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x86.ActiveCfg = Debug|Win32 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Debug|x86.Build.0 = Debug|Win32 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|ARM.ActiveCfg = Release|ARM + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|ARM.Build.0 = Release|ARM + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x64.ActiveCfg = Release|x64 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x64.Build.0 = Release|x64 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x86.ActiveCfg = Release|Win32 + {88E3C241-EB6F-4C84-80DC-89B8961DAF80}.Release|x86.Build.0 = Release|Win32 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|ARM.ActiveCfg = Debug|ARM + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|ARM.Build.0 = Debug|ARM + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x64.ActiveCfg = Debug|x64 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x64.Build.0 = Debug|x64 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x86.ActiveCfg = Debug|Win32 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Debug|x86.Build.0 = Debug|Win32 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|ARM.ActiveCfg = Release|ARM + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|ARM.Build.0 = Release|ARM + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x64.ActiveCfg = Release|x64 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x64.Build.0 = Release|x64 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x86.ActiveCfg = Release|Win32 + {2E56B851-9D8D-40E5-84BB-E4EE63B71D25}.Release|x86.Build.0 = Release|Win32 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|ARM.ActiveCfg = Debug|ARM + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|ARM.Build.0 = Debug|ARM + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x64.ActiveCfg = Debug|x64 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x64.Build.0 = Debug|x64 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x86.ActiveCfg = Debug|Win32 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Debug|x86.Build.0 = Debug|Win32 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|ARM.ActiveCfg = Release|ARM + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|ARM.Build.0 = Release|ARM + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x64.ActiveCfg = Release|x64 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x64.Build.0 = Release|x64 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x86.ActiveCfg = Release|Win32 + {59104E4F-A087-442E-ABD4-BCD2A1F0B0FE}.Release|x86.Build.0 = Release|Win32 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|ARM.ActiveCfg = Debug|ARM + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|ARM.Build.0 = Debug|ARM + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x64.ActiveCfg = Debug|x64 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x64.Build.0 = Debug|x64 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x86.ActiveCfg = Debug|Win32 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Debug|x86.Build.0 = Debug|Win32 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|ARM.ActiveCfg = Release|ARM + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|ARM.Build.0 = Release|ARM + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x64.ActiveCfg = Release|x64 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x64.Build.0 = Release|x64 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x86.ActiveCfg = Release|Win32 + {2B04DE79-4D33-4405-AC01-C89E0593A71D}.Release|x86.Build.0 = Release|Win32 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|ARM.ActiveCfg = Debug|ARM + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|ARM.Build.0 = Debug|ARM + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x64.ActiveCfg = Debug|x64 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x64.Build.0 = Debug|x64 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x86.ActiveCfg = Debug|Win32 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Debug|x86.Build.0 = Debug|Win32 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|ARM.ActiveCfg = Release|ARM + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|ARM.Build.0 = Release|ARM + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x64.ActiveCfg = Release|x64 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x64.Build.0 = Release|x64 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x86.ActiveCfg = Release|Win32 + {88768DD9-5110-4AC8-8B0E-41CD7713E1A2}.Release|x86.Build.0 = Release|Win32 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|ARM.ActiveCfg = Debug|ARM + {971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|ARM.Build.0 = Debug|ARM + {971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x64.ActiveCfg = Debug|x64 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x64.Build.0 = Debug|x64 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x86.ActiveCfg = Debug|Win32 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Debug|x86.Build.0 = Debug|Win32 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Release|ARM.ActiveCfg = Release|ARM + {971DD379-1C2D-44D2-9285-FDA556C48176}.Release|ARM.Build.0 = Release|ARM + {971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x64.ActiveCfg = Release|x64 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x64.Build.0 = Release|x64 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x86.ActiveCfg = Release|Win32 + {971DD379-1C2D-44D2-9285-FDA556C48176}.Release|x86.Build.0 = Release|Win32 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|ARM.ActiveCfg = Debug|ARM + {104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|ARM.Build.0 = Debug|ARM + {104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x64.ActiveCfg = Debug|x64 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x64.Build.0 = Debug|x64 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x86.ActiveCfg = Debug|Win32 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Debug|x86.Build.0 = Debug|Win32 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Release|ARM.ActiveCfg = Release|ARM + {104BF91B-8314-4328-A996-90B8DF6052AF}.Release|ARM.Build.0 = Release|ARM + {104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x64.ActiveCfg = Release|x64 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x64.Build.0 = Release|x64 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x86.ActiveCfg = Release|Win32 + {104BF91B-8314-4328-A996-90B8DF6052AF}.Release|x86.Build.0 = Release|Win32 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|ARM.ActiveCfg = Debug|ARM + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|ARM.Build.0 = Debug|ARM + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x64.ActiveCfg = Debug|x64 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x64.Build.0 = Debug|x64 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x86.ActiveCfg = Debug|Win32 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Debug|x86.Build.0 = Debug|Win32 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|ARM.ActiveCfg = Release|ARM + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|ARM.Build.0 = Release|ARM + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x64.ActiveCfg = Release|x64 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x64.Build.0 = Release|x64 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x86.ActiveCfg = Release|Win32 + {81AF1025-E0EE-4AD6-988D-2EF162778693}.Release|x86.Build.0 = Release|Win32 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|ARM.ActiveCfg = Debug|ARM + {45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|ARM.Build.0 = Debug|ARM + {45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x64.ActiveCfg = Debug|x64 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x64.Build.0 = Debug|x64 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x86.ActiveCfg = Debug|Win32 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Debug|x86.Build.0 = Debug|Win32 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Release|ARM.ActiveCfg = Release|ARM + {45C7723D-3107-4906-9633-F43ABE8A7147}.Release|ARM.Build.0 = Release|ARM + {45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x64.ActiveCfg = Release|x64 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x64.Build.0 = Release|x64 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x86.ActiveCfg = Release|Win32 + {45C7723D-3107-4906-9633-F43ABE8A7147}.Release|x86.Build.0 = Release|Win32 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|ARM.ActiveCfg = Debug|ARM + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|ARM.Build.0 = Debug|ARM + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x64.ActiveCfg = Debug|x64 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x64.Build.0 = Debug|x64 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x86.ActiveCfg = Debug|Win32 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Debug|x86.Build.0 = Debug|Win32 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|ARM.ActiveCfg = Release|ARM + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|ARM.Build.0 = Release|ARM + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x64.ActiveCfg = Release|x64 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x64.Build.0 = Release|x64 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x86.ActiveCfg = Release|Win32 + {EF1103C7-8AAC-464B-BA31-86B87246FA72}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/windows10/libmsbcg729/libmsbcg729.vcxproj b/build/windows10/libmsbcg729/libmsbcg729.vcxproj new file mode 100644 index 0000000..414e018 --- /dev/null +++ b/build/windows10/libmsbcg729/libmsbcg729.vcxproj @@ -0,0 +1,119 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {88e3c241-eb6f-4c84-80dc-89b8961daf80} + + + {2e56b851-9d8d-40e5-84bb-e4ee63b71d25} + + + + {acf5ea95-d647-4d0c-8f97-2cd9aae8a2e0} + DynamicLibrary + libmsbcg729 + libmsbcg729 + en-US + 14.0 + true + Windows Store + 8.2 + + + + DynamicLibrary + true + v140 + + + DynamicLibrary + false + true + v140 + + + + + + + + + + + + false + false + + + + NotUsing + false + $(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\..\linphone\mediastreamer2\include;$(ProjectDir)..\..\..\..\linphone\oRTP\include;%(AdditionalIncludeDirectories) + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/include/bcg729/decoder.h b/include/bcg729/decoder.h index afe2780..40959f8 100644 --- a/include/bcg729/decoder.h +++ b/include/bcg729/decoder.h @@ -23,7 +23,7 @@ typedef struct bcg729DecoderChannelContextStruct_struct bcg729DecoderChannelContextStruct; #include -#ifdef WIN32 +#ifdef _WIN32 #define BCG729_VISIBILITY #else #define BCG729_VISIBILITY __attribute__ ((visibility ("default"))) diff --git a/include/bcg729/encoder.h b/include/bcg729/encoder.h index 6735a5d..646903f 100644 --- a/include/bcg729/encoder.h +++ b/include/bcg729/encoder.h @@ -23,7 +23,7 @@ #include typedef struct bcg729EncoderChannelContextStruct_struct bcg729EncoderChannelContextStruct; -#ifdef WIN32 +#ifdef _WIN32 #define BCG729_VISIBILITY #else #define BCG729_VISIBILITY __attribute__ ((visibility ("default"))) From e00b22535e75cc98e16db029f753f2087fec8cf6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 3 Aug 2015 10:29:18 +0200 Subject: [PATCH 09/19] Fix Visual Studio 2015 project for Windows 10. --- build/windows10/libmsbcg729/libmsbcg729.vcxproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/windows10/libmsbcg729/libmsbcg729.vcxproj b/build/windows10/libmsbcg729/libmsbcg729.vcxproj index 414e018..f092beb 100644 --- a/build/windows10/libmsbcg729/libmsbcg729.vcxproj +++ b/build/windows10/libmsbcg729/libmsbcg729.vcxproj @@ -74,7 +74,9 @@ 14.0 true Windows Store - 8.2 + 10 + 10.0.10240.0 + 10.0.10069.0 From 34f9f4123ac96084b813ca5e84747a03422a59fa Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 22 Sep 2015 10:49:48 +0200 Subject: [PATCH 10/19] Specify output directory in Visual Studio project for Windows 10. --- build/windows10/libmsbcg729/libmsbcg729.vcxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/build/windows10/libmsbcg729/libmsbcg729.vcxproj b/build/windows10/libmsbcg729/libmsbcg729.vcxproj index f092beb..30a481c 100644 --- a/build/windows10/libmsbcg729/libmsbcg729.vcxproj +++ b/build/windows10/libmsbcg729/libmsbcg729.vcxproj @@ -102,6 +102,7 @@ false false + $(SolutionDir)$(Platform)\$(Configuration)\ From 9d8ed7ca075e67fbda839fe58d85e2080f2d0c05 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 9 Oct 2015 13:50:03 +0200 Subject: [PATCH 11/19] Allow inclusion of CMake project in a global CMake project. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f5e70..e5d77ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,11 @@ option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." YES) option(ENABLE_STATIC "Build static library (default is shared library)." NO) if(ENABLE_MSPLUGIN) - find_package(Mediastreamer2) + if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) + include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake") + else() + find_package(Mediastreamer2) + endif() if(NOT MEDIASTREAMER2_FOUND) message(WARNING "Could not find the mediastreamer2 libraries!") @@ -74,7 +78,7 @@ if(ENABLE_MSPLUGIN) add_subdirectory(msbcg729) endif() if(ENABLE_TESTS) - add_subdirectory(test) + #add_subdirectory(test) endif() From 06d0bfe525d7ba0246020408ecb62d13b7e4c868 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 13 Oct 2015 11:20:37 +0200 Subject: [PATCH 12/19] Do not add BelledonneCommunications namespace for CMake targets export. --- Bcg729Config.cmake | 2 +- CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Bcg729Config.cmake b/Bcg729Config.cmake index 89cd8e1..a7b414f 100644 --- a/Bcg729Config.cmake +++ b/Bcg729Config.cmake @@ -31,5 +31,5 @@ include("${CMAKE_CURRENT_LIST_DIR}/Bcg729Targets.cmake") get_filename_component(BCG729_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) set(BCG729_INCLUDE_DIRS "${BCG729_CMAKE_DIR}/../../../include") -set(BCG729_LIBRARIES BelledonneCommunications::bcg729) +set(BCG729_LIBRARIES bcg729) set(BCG729_FOUND 1) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d77ba..f60a9bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,6 @@ write_basic_package_version_file( ) export(EXPORT Bcg729Targets FILE "${CMAKE_CURRENT_BINARY_DIR}/Bcg729Targets.cmake" - NAMESPACE BelledonneCommunications:: ) configure_file(Bcg729Config.cmake "${CMAKE_CURRENT_BINARY_DIR}/Bcg729Config.cmake" @@ -100,7 +99,6 @@ configure_file(Bcg729Config.cmake set(ConfigPackageLocation lib/cmake/Bcg729) install(EXPORT Bcg729Targets FILE Bcg729Targets.cmake - NAMESPACE BelledonneCommunications:: DESTINATION ${ConfigPackageLocation} ) install(FILES From 91d1206d63e57a78af1d26058052e9d37f0b6f5d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 2 Nov 2015 14:07:03 +0100 Subject: [PATCH 13/19] Update version to 1.0.1. --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f60a9bb..165c546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ project(BCG729 C) set(PACKAGE "bcg729") set(PACKAGE_NAME "${PACKAGE}") -set(PACKAGE_VERSION "1.0.0") +set(PACKAGE_VERSION "1.0.1") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "support@belledonne-communications.com") set(PACKAGE_TARNAME "bcg729") diff --git a/configure.ac b/configure.ac index 6c9b8b3..24301fb 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ -AC_INIT([bcg729],[1.0.0]) +AC_INIT([bcg729],[1.0.1]) AC_CANONICAL_SYSTEM AC_PREREQ(2.63) AC_CONFIG_SRCDIR([src/encoder.c]) From 51d0d1dda46a01089840f5803c38bf985cf4d00f Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 14 Jan 2016 11:25:00 +0100 Subject: [PATCH 14/19] CMakeLists.txt: do not activate -Werror on iOS (SDK not compiling otherwise) --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 165c546..dac811a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,10 @@ add_definitions(-DHAVE_CONFIG_H) if(MSVC) add_definitions("/W3") else() - add_definitions("-Wall" "-Werror") + add_definitions("-Wall") + if (NOT IOS) + add_definitions("-Werror") + endif() endif() add_subdirectory(src) From e540e0c4d5521c5125e1de496ad1085e642df120 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 1 Feb 2016 11:32:33 +0100 Subject: [PATCH 15/19] libmsbcg729_init now using MSFactory. --- msbcg729/bcg729_enc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/msbcg729/bcg729_enc.c b/msbcg729/bcg729_enc.c index 56137ed..b9b973e 100644 --- a/msbcg729/bcg729_enc.c +++ b/msbcg729/bcg729_enc.c @@ -190,8 +190,8 @@ extern MSFilterDesc ms_bcg729_dec_desc; #define VERSION "debug" #endif -MS_PLUGIN_DECLARE(void) libmsbcg729_init(void){ - ms_filter_register(&ms_bcg729_enc_desc); - ms_filter_register(&ms_bcg729_dec_desc); +MS_PLUGIN_DECLARE(void) libmsbcg729_init(MSFactory * factory){ + ms_factory_register_filter(factory, &ms_bcg729_enc_desc); + ms_factory_register_filter(factory, &ms_bcg729_dec_desc); ms_message(" libmsbcg729 " VERSION " plugin loaded"); } From 0ed137cd58de8b90e80e35bd723eb83c20d8b322 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 24 Feb 2016 17:42:10 +0100 Subject: [PATCH 16/19] Allow building both shared and static libraries. --- CMakeLists.txt | 19 +++++++++++-------- msbcg729/CMakeLists.txt | 34 +++++++++++++++++++++------------- src/CMakeLists.txt | 36 +++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dac811a..9f9ee2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,12 +21,12 @@ ############################################################################ cmake_minimum_required(VERSION 3.0) -project(BCG729 C) +project(bcg729 VERSION 1.0.1 LANGUAGES C) -set(PACKAGE "bcg729") -set(PACKAGE_NAME "${PACKAGE}") -set(PACKAGE_VERSION "1.0.1") +set(PACKAGE "${PROJECT_NAME}") +set(PACKAGE_NAME "${PROJECT_NAME}") +set(PACKAGE_VERSION "${PROJECT_VERSION}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "support@belledonne-communications.com") set(PACKAGE_TARNAME "bcg729") @@ -34,9 +34,12 @@ set(PACKAGE_URL "") set(VERSION "${PACKAGE_VERSION}") +option(ENABLE_SHARED "Build shared library." YES) +option(ENABLE_STATIC "Build static library." YES) option(ENABLE_TESTS "Enable compilation of the tests." NO) option(ENABLE_MSPLUGIN "Enable compilation of the mediastreamer2 plugin." YES) -option(ENABLE_STATIC "Build static library (default is shared library)." NO) + +include(GNUInstallDirs) if(ENABLE_MSPLUGIN) if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) @@ -99,13 +102,13 @@ configure_file(Bcg729Config.cmake COPYONLY ) -set(ConfigPackageLocation lib/cmake/Bcg729) +set(CONFIG_PACKAGE_LOCATION "${CMAKE_INSTALL_DATADIR}/Bcg729/cmake") install(EXPORT Bcg729Targets FILE Bcg729Targets.cmake - DESTINATION ${ConfigPackageLocation} + DESTINATION ${CONFIG_PACKAGE_LOCATION} ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Bcg729Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/Bcg729ConfigVersion.cmake" - DESTINATION ${ConfigPackageLocation} + DESTINATION ${CONFIG_PACKAGE_LOCATION} ) diff --git a/msbcg729/CMakeLists.txt b/msbcg729/CMakeLists.txt index b798a99..4050fb5 100644 --- a/msbcg729/CMakeLists.txt +++ b/msbcg729/CMakeLists.txt @@ -27,27 +27,35 @@ set(SOURCE_FILES include_directories(${MEDIASTREAMER2_INCLUDE_DIRS}) +add_library(msbcg729-objects OBJECT ${SOURCE_FILES}) +set_target_properties(msbcg729-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + if(ENABLE_STATIC) - add_library(msbcg729 STATIC ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) -else() - add_library(msbcg729 SHARED ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) + add_library(msbcg729-static STATIC $ $) + set_target_properties(msbcg729-static PROPERTIES OUTPUT_NAME msbcg729) + target_link_libraries(msbcg729-static ${MEDIASTREAMER2_LIBRARIES}) + install(TARGETS msbcg729-static + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) +endif() +if(ENABLE_SHARED) + add_library(msbcg729 MODULE $ $) set_target_properties(msbcg729 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 0) + target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES}) if(MSVC) if(CMAKE_BUILD_TYPE STREQUAL "Debug") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libmsbcg729.pdb - DESTINATION bin + DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) endif() set_target_properties(msbcg729 PROPERTIES PREFIX "lib") endif() + install(TARGETS msbcg729 + RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) endif() -target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES}) - -install(TARGETS msbcg729 - RUNTIME DESTINATION lib/mediastreamer/plugins - LIBRARY DESTINATION lib/mediastreamer/plugins - ARCHIVE DESTINATION lib/mediastreamer/plugins - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -) - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0142feb..e7d9171 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,31 +46,33 @@ set(BCG729_SOURCE_FILES utils.c ) -if (ENABLE_STATIC) - add_library(bcg729 STATIC ${BCG729_SOURCE_FILES}) -else() +add_library(bcg729-objects OBJECT ${BCG729_SOURCE_FILES}) +set_target_properties(bcg729-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE) + +if(ENABLE_STATIC) + add_library(bcg729-static STATIC $) + set_target_properties(bcg729-static PROPERTIES OUTPUT_NAME bcg729) + install(TARGETS bcg729-static EXPORT Bcg729Targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) +endif() +if(ENABLE_SHARED) add_library(bcg729 SHARED ${BCG729_SOURCE_FILES}) set_target_properties(bcg729 PROPERTIES VERSION 0) if(MSVC) if(CMAKE_BUILD_TYPE STREQUAL "Debug") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/libbcg729.pdb - DESTINATION bin + DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) endif() set_target_properties(bcg729 PROPERTIES PREFIX "lib") endif() + install(TARGETS bcg729 EXPORT Bcg729Targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) endif() - -install(TARGETS bcg729 EXPORT Bcg729Targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -) - -set(ABS_BCG729_SOURCE_FILES ) -foreach(elem ${BCG729_SOURCE_FILES}) - list(APPEND ABS_BCG729_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}") -endforeach() -set(BCG729_SOURCE_FILES ${ABS_BCG729_SOURCE_FILES} PARENT_SCOPE) From d989835b5f954f8a033c28ab4a957b6b8694675b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 26 Feb 2016 17:33:07 +0100 Subject: [PATCH 17/19] Fix build on Mac OS X. --- msbcg729/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msbcg729/CMakeLists.txt b/msbcg729/CMakeLists.txt index 4050fb5..cb54ab0 100644 --- a/msbcg729/CMakeLists.txt +++ b/msbcg729/CMakeLists.txt @@ -41,7 +41,7 @@ if(ENABLE_STATIC) endif() if(ENABLE_SHARED) add_library(msbcg729 MODULE $ $) - set_target_properties(msbcg729 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 0) + set_target_properties(msbcg729 PROPERTIES SOVERSION 0) target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES}) if(MSVC) if(CMAKE_BUILD_TYPE STREQUAL "Debug") From 4edc094bcfee08032b6d6fb38cfb00ecf66a9f49 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 2 Mar 2016 13:45:28 +0100 Subject: [PATCH 18/19] Do not use object library when building with CMake. --- msbcg729/CMakeLists.txt | 7 ++----- src/CMakeLists.txt | 8 +++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/msbcg729/CMakeLists.txt b/msbcg729/CMakeLists.txt index cb54ab0..cd47bfa 100644 --- a/msbcg729/CMakeLists.txt +++ b/msbcg729/CMakeLists.txt @@ -27,11 +27,8 @@ set(SOURCE_FILES include_directories(${MEDIASTREAMER2_INCLUDE_DIRS}) -add_library(msbcg729-objects OBJECT ${SOURCE_FILES}) -set_target_properties(msbcg729-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE) - if(ENABLE_STATIC) - add_library(msbcg729-static STATIC $ $) + add_library(msbcg729-static STATIC ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) set_target_properties(msbcg729-static PROPERTIES OUTPUT_NAME msbcg729) target_link_libraries(msbcg729-static ${MEDIASTREAMER2_LIBRARIES}) install(TARGETS msbcg729-static @@ -40,7 +37,7 @@ if(ENABLE_STATIC) ) endif() if(ENABLE_SHARED) - add_library(msbcg729 MODULE $ $) + add_library(msbcg729 MODULE ${BCG729_SOURCE_FILES} ${SOURCE_FILES}) set_target_properties(msbcg729 PROPERTIES SOVERSION 0) target_link_libraries(msbcg729 ${MEDIASTREAMER2_LIBRARIES}) if(MSVC) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e7d9171..6652126 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,7 +50,7 @@ add_library(bcg729-objects OBJECT ${BCG729_SOURCE_FILES}) set_target_properties(bcg729-objects PROPERTIES POSITION_INDEPENDENT_CODE TRUE) if(ENABLE_STATIC) - add_library(bcg729-static STATIC $) + add_library(bcg729-static STATIC ${BCG729_SOURCE_FILES}) set_target_properties(bcg729-static PROPERTIES OUTPUT_NAME bcg729) install(TARGETS bcg729-static EXPORT Bcg729Targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -76,3 +76,9 @@ if(ENABLE_SHARED) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) endif() + +set(ABS_BCG729_SOURCE_FILES ) +foreach(elem ${BCG729_SOURCE_FILES}) + list(APPEND ABS_BCG729_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${elem}") +endforeach() +set(BCG729_SOURCE_FILES ${ABS_BCG729_SOURCE_FILES} PARENT_SCOPE) From 06a55d73bafc1a95e9f1a27b26cdacdf944e98e0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 17 Mar 2016 14:47:37 +0100 Subject: [PATCH 19/19] Add CMake files as EXTRA_DIST of autotools. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 288139e..84b77b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = bcg729.spec +EXTRA_DIST = bcg729.spec Bcg729Config.cmake CMakeLists.txt config.h.cmake msbcg729/CMakeLists.txt src/CMakeLists.txt SUBDIRS = include src if BUILD_MSBCG729