Skip to content

Commit 122c589

Browse files
authored
Merge pull request #2702 from signalwire/isac
[mod_isac] Remove from tree
2 parents c1eb76c + 6286c51 commit 122c589

File tree

107 files changed

+2
-28091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+2
-28091
lines changed

Freeswitch.2017.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthre
219219
EndProject
220220
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.2017.vcxproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}"
221221
EndProject
222-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iSAC", "src\mod\codecs\mod_isac\mod_iSAC.2017.vcxproj", "{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}"
223-
EndProject
224222
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2017.vcxproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}"
225223
EndProject
226224
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.2017.vcxproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}"
@@ -832,17 +830,6 @@ Global
832830
{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.Build.0 = Release Passthrough|Win32
833831
{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.ActiveCfg = Release Passthrough|x64
834832
{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.Build.0 = Release Passthrough|x64
835-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|Win32.ActiveCfg = Release|x64
836-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|x64.ActiveCfg = Release|x64
837-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|x64.Build.0 = Release|x64
838-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|Win32.ActiveCfg = Debug|Win32
839-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|Win32.Build.0 = Debug|Win32
840-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|x64.ActiveCfg = Debug|x64
841-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|x64.Build.0 = Debug|x64
842-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|Win32.ActiveCfg = Release|Win32
843-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|Win32.Build.0 = Release|Win32
844-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|x64.ActiveCfg = Release|x64
845-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|x64.Build.0 = Release|x64
846833
{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|Win32.ActiveCfg = Release|x64
847834
{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.ActiveCfg = Release|x64
848835
{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.Build.0 = Release|x64
@@ -2516,7 +2503,6 @@ Global
25162503
{0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
25172504
{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
25182505
{FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
2519-
{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
25202506
{9254C4B0-6F60-42B6-BB3A-36D63FC001C7} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
25212507
{4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
25222508
{71A967D5-0E99-4CEF-A587-98836EE6F2EF} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}

LICENSE

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,14 +1578,6 @@ Files: src/include/switch_profile.h
15781578
Copyright: 2009,2010, Sangoma Technologies
15791579
License: BSD-3-clause
15801580

1581-
Files: src/mod/codecs/mod_isac/*
1582-
Copyright: 2011-2012 The WebRTC project authors
1583-
License: BSD-3-clause
1584-
1585-
Files: src/mod/codecs/mod_isac/mod_isac.c
1586-
Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
1587-
License: MPL-1.1
1588-
15891581
Files: libs/srtp/*
15901582
Copyright: 2001-2006, Cisco Systems, Inc.
15911583
2005 Ingate Systems AB

build/modules.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ codecs/mod_g723_1
6666
codecs/mod_g729
6767
codecs/mod_h26x
6868
#codecs/mod_ilbc
69-
#codecs/mod_isac
7069
codecs/mod_opus
7170
#codecs/mod_silk
7271
#codecs/mod_siren

build/modules.conf.most

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ codecs/mod_g723_1
6565
codecs/mod_g729
6666
codecs/mod_h26x
6767
codecs/mod_ilbc
68-
codecs/mod_isac
6968
codecs/mod_opus
7069
codecs/mod_silk
7170
codecs/mod_siren

ci.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ configure_freeswitch()
9292
# "Disable"/"Comment out" mods
9393
sed -i \
9494
-e '/mod_ilbc/s/^/#/g' \
95-
-e '/mod_isac/s/^/#/g' \
9695
-e '/mod_mongo/s/^/#/g' \
9796
-e '/mod_pocketsphinx/s/^/#/g' \
9897
-e '/mod_siren/s/^/#/g' \

conf/vanilla/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
<!--<load module="mod_h26x"/>-->
9494
<load module="mod_b64"/>
9595
<!--<load module="mod_siren"/>-->
96-
<!--<load module="mod_isac"/>-->
9796
<load module="mod_opus"/>
9897

9998
<!-- File Format Interfaces -->

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2157,7 +2157,6 @@ AC_CONFIG_FILES([Makefile
21572157
src/mod/codecs/mod_g729/Makefile
21582158
src/mod/codecs/mod_h26x/Makefile
21592159
src/mod/codecs/mod_ilbc/Makefile
2160-
src/mod/codecs/mod_isac/Makefile
21612160
src/mod/codecs/mod_opus/Makefile
21622161
src/mod/codecs/mod_openh264/Makefile
21632162
src/mod/codecs/mod_silk/Makefile

debian/bootstrap.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
709709
freeswitch-mod-g723-1 (= \${binary:Version}),
710710
freeswitch-mod-g729 (= \${binary:Version}),
711711
freeswitch-mod-h26x (= \${binary:Version}),
712-
freeswitch-mod-isac (= \${binary:Version}),
713712
freeswitch-mod-opus (= \${binary:Version}),
714713
freeswitch-mod-silk (= \${binary:Version}),
715714
freeswitch-mod-spandsp (= \${binary:Version}),
@@ -734,7 +733,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
734733
freeswitch-mod-g723-1-dbg (= \${binary:Version}),
735734
freeswitch-mod-g729-dbg (= \${binary:Version}),
736735
freeswitch-mod-h26x-dbg (= \${binary:Version}),
737-
freeswitch-mod-isac-dbg (= \${binary:Version}),
738736
freeswitch-mod-opus-dbg (= \${binary:Version}),
739737
freeswitch-mod-silk-dbg (= \${binary:Version}),
740738
freeswitch-mod-spandsp-dbg (= \${binary:Version}),

debian/control-modules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,6 @@ Description: mod_ilbc
319319
Adds mod_ilbc.
320320
Build-Depends: libilbc-dev
321321

322-
Module: codecs/mod_isac
323-
Description: mod_isac
324-
Adds mod_isac.
325-
326322
Module: codecs/mod_openh264
327323
Description: Adds mod_openh264
328324
Adds mod_openh264.

debian/copyright

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,14 +1573,6 @@ Files: libs/libcodec2/src/pack.c
15731573
Copyright: 2010 Perens LLC <bruce@perens.com>
15741574
License: GPL-3+
15751575

1576-
Files: src/mod/codecs/mod_isac/*
1577-
Copyright: 2011-2012 The WebRTC project authors
1578-
License: BSD-3-clause
1579-
1580-
Files: src/mod/codecs/mod_isac/mod_isac.c
1581-
Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
1582-
License: MPL-1.1
1583-
15841576
Files: libs/srtp/*
15851577
Copyright: 2001-2006, Cisco Systems, Inc.
15861578
2005 Ingate Systems AB

0 commit comments

Comments
 (0)