diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index c021c7c855..abeeb4fe04 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -230,8 +230,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.2017.vcxproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_h26x", "src\mod\codecs\mod_h26x\mod_h26x.2017.vcxproj", "{2C3C2423-234B-4772-8899-D3B137E5CA35}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applications\mod_esf\mod_esf.2017.vcxproj", "{3850D93A-5F24-4922-BC1C-74D08C37C256}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_local_stream", "src\mod\formats\mod_local_stream\mod_local_stream.2017.vcxproj", "{2CA40887-1622-46A1-A7F9-17FD7E7E545B}" @@ -885,17 +883,6 @@ Global {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.Build.0 = Release Passthrough|Win32 {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.ActiveCfg = Release Passthrough|x64 {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.Build.0 = Release Passthrough|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.All|Win32.ActiveCfg = Release|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.ActiveCfg = Release|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.Build.0 = Release|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.Build.0 = Debug|Win32 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.ActiveCfg = Debug|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.Build.0 = Debug|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.ActiveCfg = Release|Win32 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.Build.0 = Release|Win32 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.ActiveCfg = Release|x64 - {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.Build.0 = Release|x64 {3850D93A-5F24-4922-BC1C-74D08C37C256}.All|Win32.ActiveCfg = Release|x64 {3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.ActiveCfg = Release|x64 {3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.Build.0 = Release|x64 @@ -2469,7 +2456,6 @@ Global {988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {3850D93A-5F24-4922-BC1C-74D08C37C256} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {D7F1E3F2-A3F4-474C-8555-15122571AF52} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} diff --git a/build/modules.conf.in b/build/modules.conf.in index 95d47294d0..9c63ccdb23 100755 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -57,7 +57,6 @@ codecs/mod_b64 #codecs/mod_com_g729 codecs/mod_g723_1 codecs/mod_g729 -codecs/mod_h26x #codecs/mod_ilbc codecs/mod_opus #codecs/mod_silk diff --git a/build/modules.conf.most b/build/modules.conf.most index fdf5d61ac9..8f8a8e2f14 100755 --- a/build/modules.conf.most +++ b/build/modules.conf.most @@ -56,7 +56,6 @@ codecs/mod_codec2 #codecs/mod_com_g729 codecs/mod_g723_1 codecs/mod_g729 -codecs/mod_h26x codecs/mod_ilbc codecs/mod_opus codecs/mod_silk diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml index 9290d072b5..f03dfb749c 100755 --- a/conf/insideout/autoload_configs/modules.conf.xml +++ b/conf/insideout/autoload_configs/modules.conf.xml @@ -59,7 +59,6 @@ - diff --git a/conf/insideout/vars.xml b/conf/insideout/vars.xml index 39a5dedd37..8e2b1854c8 100644 --- a/conf/insideout/vars.xml +++ b/conf/insideout/vars.xml @@ -59,14 +59,6 @@ G729 - G729 in passthru mode. (mod_g729) G723 - G723.1 in passthru mode. (mod_g723_1) AMR - AMR in passthru mode. (mod_amr) - - These are the passthru video codecs: (mod_h26x) - - H261 - H.261 Video - H263 - H.263 Video - H263-1998 - H.263-1998 Video - H263-2000 - H.263-2000 Video - H264 - H.264 Video --> diff --git a/conf/sbc/autoload_configs/modules.conf.xml b/conf/sbc/autoload_configs/modules.conf.xml index 31f46a4128..c35b9a53e0 100644 --- a/conf/sbc/autoload_configs/modules.conf.xml +++ b/conf/sbc/autoload_configs/modules.conf.xml @@ -42,7 +42,6 @@ - diff --git a/conf/sbc/vars.xml b/conf/sbc/vars.xml index 6186ff7cc7..d77d7f17fc 100644 --- a/conf/sbc/vars.xml +++ b/conf/sbc/vars.xml @@ -58,14 +58,6 @@ G723 - G723.1 in passthru mode. (mod_g723_1) AMR - AMR in passthru mode. (mod_amr) - These are the passthru video codecs: (mod_h26x) - - H261 - H.261 Video - H263 - H.263 Video - H263-1998 - H.263-1998 Video - H263-2000 - H.263-2000 Video - H264 - H.264 Video - --> diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml index 3e48242643..19581f57db 100755 --- a/conf/vanilla/autoload_configs/modules.conf.xml +++ b/conf/vanilla/autoload_configs/modules.conf.xml @@ -84,7 +84,6 @@ - diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml index 8948d179cc..54a15a2534 100644 --- a/conf/vanilla/vars.xml +++ b/conf/vanilla/vars.xml @@ -205,14 +205,6 @@ G723 - G723.1 in passthru mode. (mod_g723_1) AMR - AMR in passthru mode. (mod_amr) - These are the passthru video codecs: (mod_h26x) - - H261 - H.261 Video - H263 - H.263 Video - H263-1998 - H.263-1998 Video - H263-2000 - H.263-2000 Video - H264 - H.264 Video - RTP Dynamic Payload Numbers currently used in FreeSWITCH and their purpose. 96 - AMR diff --git a/configure.ac b/configure.ac index cced754c5f..7f3f2e92f7 100755 --- a/configure.ac +++ b/configure.ac @@ -2144,7 +2144,6 @@ AC_CONFIG_FILES([Makefile src/mod/codecs/mod_com_g729/Makefile src/mod/codecs/mod_g723_1/Makefile src/mod/codecs/mod_g729/Makefile - src/mod/codecs/mod_h26x/Makefile src/mod/codecs/mod_ilbc/Makefile src/mod/codecs/mod_opus/Makefile src/mod/codecs/mod_openh264/Makefile diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 429110e2f6..fcb007735f 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -478,7 +478,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-g723-1 (= \${binary:Version}), freeswitch-mod-g729 (= \${binary:Version}), freeswitch-mod-amr (= \${binary:Version}), - freeswitch-mod-h26x (= \${binary:Version}), freeswitch-mod-sndfile (= \${binary:Version}), freeswitch-mod-native-file (= \${binary:Version}), freeswitch-mod-local-stream (= \${binary:Version}), @@ -687,7 +686,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-codec2 (= \${binary:Version}), freeswitch-mod-g723-1 (= \${binary:Version}), freeswitch-mod-g729 (= \${binary:Version}), - freeswitch-mod-h26x (= \${binary:Version}), freeswitch-mod-opus (= \${binary:Version}), freeswitch-mod-silk (= \${binary:Version}), freeswitch-mod-spandsp (= \${binary:Version}), @@ -711,7 +709,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-codec2-dbg (= \${binary:Version}), freeswitch-mod-g723-1-dbg (= \${binary:Version}), freeswitch-mod-g729-dbg (= \${binary:Version}), - freeswitch-mod-h26x-dbg (= \${binary:Version}), freeswitch-mod-opus-dbg (= \${binary:Version}), freeswitch-mod-silk-dbg (= \${binary:Version}), freeswitch-mod-spandsp-dbg (= \${binary:Version}), diff --git a/debian/control-modules b/debian/control-modules index 813247deba..bf0d700871 100755 --- a/debian/control-modules +++ b/debian/control-modules @@ -278,10 +278,6 @@ Module: codecs/mod_g729 Description: mod_g729 Adds mod_g729. -Module: codecs/mod_h26x -Description: mod_h26x - Adds mod_h26x. - Module: codecs/mod_ilbc Section: non-free/comm Description: mod_ilbc diff --git a/freeswitch.spec b/freeswitch.spec index 1864521459..495e8f1564 100755 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -631,14 +631,6 @@ Conflicts: codec-com-g729 %description codec-passthru-g729 Pass-through g729 Codec support for FreeSWITCH open source telephony platform -%package codec-h26x -Summary: H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description codec-h26x -H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform - %package codec-ilbc Summary: iLCB Codec support for FreeSWITCH open source telephony platform Group: System/Libraries @@ -1169,7 +1161,6 @@ Requires: freeswitch-codec-passthru-amr Requires: freeswitch-codec-bv Requires: freeswitch-codec-passthru-g723_1 Requires: freeswitch-codec-passthru-g729 -Requires: freeswitch-codec-h26x Requires: freeswitch-codec-ilbc Requires: freeswitch-codec-siren Requires: freeswitch-database-pgsql @@ -1258,7 +1249,7 @@ ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_comm # ###################################################################################################################### CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2 codecs/mod_g723_1 \ - codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_opus codecs/mod_silk \ + codecs/mod_g729 codecs/mod_ilbc codecs/mod_opus codecs/mod_silk \ codecs/mod_siren codecs/mod_theora" # @@ -1952,9 +1943,6 @@ fi %files codec-passthru-g729 %{MODINSTDIR}/mod_g729.so* -%files codec-h26x -%{MODINSTDIR}/mod_h26x.so* - %files codec-ilbc %{MODINSTDIR}/mod_ilbc.so* diff --git a/src/mod/codecs/mod_h26x/Makefile.am b/src/mod/codecs/mod_h26x/Makefile.am deleted file mode 100644 index 93dd847499..0000000000 --- a/src/mod/codecs/mod_h26x/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/build/modmake.rulesam -MODNAME=mod_h26x - -mod_LTLIBRARIES = mod_h26x.la -mod_h26x_la_SOURCES = mod_h26x.c -mod_h26x_la_CFLAGS = $(AM_CFLAGS) -mod_h26x_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_h26x_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj b/src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj deleted file mode 100644 index 8cfb292c2a..0000000000 --- a/src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj +++ /dev/null @@ -1,143 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mod_h26x - {2C3C2423-234B-4772-8899-D3B137E5CA35} - mod_h26x - Win32Proj - - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - %(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories) - - - - - $(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories) - false - - - - - - - X64 - - - %(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories) - - - - - $(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories) - false - - - MachineX64 - - - - - %(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories) - - - - - $(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories) - false - - - - - - - X64 - - - %(RootDir)%(Directory)..\..\..\..\libs\libresample\include;%(AdditionalIncludeDirectories) - - - - - $(ProjectDir)..\..\..\..\libs\libresample\win;%(AdditionalLibraryDirectories) - false - - - MachineX64 - - - - - - - - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} - false - - - - - - \ No newline at end of file diff --git a/src/mod/codecs/mod_h26x/mod_h26x.c b/src/mod/codecs/mod_h26x/mod_h26x.c deleted file mode 100644 index 4d82322936..0000000000 --- a/src/mod/codecs/mod_h26x/mod_h26x.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005-2014, Anthony Minessale II - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * Anthony Minessale II - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Anthony Minessale II - * - * - * mod_h26x.c -- H26X Signed Linear Codec - * - */ - -#include - -SWITCH_MODULE_LOAD_FUNCTION(mod_h26x_load); -SWITCH_MODULE_DEFINITION(mod_h26x, mod_h26x_load, NULL, NULL); - -static switch_status_t switch_h26x_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - int encoding, decoding; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding)) { - return SWITCH_STATUS_FALSE; - } else { - if (codec->fmtp_in) { - codec->fmtp_out = switch_core_strdup(codec->memory_pool, codec->fmtp_in); - } - return SWITCH_STATUS_SUCCESS; - } -} - -static switch_status_t switch_h26x_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - return SWITCH_STATUS_FALSE; -} - -static switch_status_t switch_h26x_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - return SWITCH_STATUS_FALSE; -} - -static switch_status_t switch_h26x_destroy(switch_codec_t *codec) -{ - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_MODULE_LOAD_FUNCTION(mod_h26x_load) -{ - switch_codec_interface_t *codec_interface; - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_CODEC(codec_interface, "H.264 Video (passthru)"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_VIDEO, 97, "H264", NULL, 90000, 90000, 0, - 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); - SWITCH_ADD_CODEC(codec_interface, "H.263 Video (passthru)"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_VIDEO, 34, "H263", NULL, 90000, 90000, 0, - 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); - SWITCH_ADD_CODEC(codec_interface, "H.263+ Video (passthru)"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_VIDEO, 115, "H263-1998", NULL, 90000, 90000, 0, - 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); - SWITCH_ADD_CODEC(codec_interface, "H.263++ Video (passthru)"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_VIDEO, 121, "H263-2000", NULL, 90000, 90000, 0, - 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); - SWITCH_ADD_CODEC(codec_interface, "H.261 Video (passthru)"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_VIDEO, 31, "H261", NULL, 90000, 90000, 0, - 0, 0, 0, 0, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:t - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet: - */ diff --git a/w32/Setup/Setup.2017.wixproj b/w32/Setup/Setup.2017.wixproj index fe6522bbc1..afb0177b2c 100644 --- a/w32/Setup/Setup.2017.wixproj +++ b/w32/Setup/Setup.2017.wixproj @@ -401,14 +401,6 @@ Binaries;Content;Satellites INSTALLFOLDER - - mod_h26x - {2c3c2423-234b-4772-8899-d3b137e5ca35} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - mod_ilbc {d3ec0aff-76fc-4210-a825-9a17410660a3}