Skip to content

Commit ca9430e

Browse files
andywolkandywolk
authored
Merge pull request #2725 from signalwire/h26x
[mod_h26x] Remove from tree
2 parents 0bcc789 + d4fd3cc commit ca9430e

File tree

17 files changed

+1
-341
lines changed

17 files changed

+1
-341
lines changed

‎Freeswitch.2017.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_
230230
EndProject
231231
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.2017.vcxproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}"
232232
EndProject
233-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_h26x", "src\mod\codecs\mod_h26x\mod_h26x.2017.vcxproj", "{2C3C2423-234B-4772-8899-D3B137E5CA35}"
234-
EndProject
235233
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_esf", "src\mod\applications\mod_esf\mod_esf.2017.vcxproj", "{3850D93A-5F24-4922-BC1C-74D08C37C256}"
236234
EndProject
237235
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
885883
{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.Build.0 = Release Passthrough|Win32
886884
{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.ActiveCfg = Release Passthrough|x64
887885
{8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.Build.0 = Release Passthrough|x64
888-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|Win32.ActiveCfg = Release|x64
889-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.ActiveCfg = Release|x64
890-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.All|x64.Build.0 = Release|x64
891-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.ActiveCfg = Debug|Win32
892-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.Build.0 = Debug|Win32
893-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.ActiveCfg = Debug|x64
894-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.Build.0 = Debug|x64
895-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.ActiveCfg = Release|Win32
896-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.Build.0 = Release|Win32
897-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.ActiveCfg = Release|x64
898-
{2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.Build.0 = Release|x64
899886
{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|Win32.ActiveCfg = Release|x64
900887
{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.ActiveCfg = Release|x64
901888
{3850D93A-5F24-4922-BC1C-74D08C37C256}.All|x64.Build.0 = Release|x64
@@ -2469,7 +2456,6 @@ Global
24692456
{988CACF7-3FCB-4992-BE69-77872AE67DC8} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
24702457
{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
24712458
{8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
2472-
{2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
24732459
{3850D93A-5F24-4922-BC1C-74D08C37C256} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
24742460
{2CA40887-1622-46A1-A7F9-17FD7E7E545B} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
24752461
{D7F1E3F2-A3F4-474C-8555-15122571AF52} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}

‎build/modules.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ codecs/mod_b64
5757
#codecs/mod_com_g729
5858
codecs/mod_g723_1
5959
codecs/mod_g729
60-
codecs/mod_h26x
6160
#codecs/mod_ilbc
6261
codecs/mod_opus
6362
#codecs/mod_silk

‎build/modules.conf.most

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ codecs/mod_codec2
5656
#codecs/mod_com_g729
5757
codecs/mod_g723_1
5858
codecs/mod_g729
59-
codecs/mod_h26x
6059
codecs/mod_ilbc
6160
codecs/mod_opus
6261
codecs/mod_silk

‎conf/insideout/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<load module="mod_g729"/>
6060
<load module="mod_amr"/>
6161
<!--<load module="mod_ilbc"/>-->
62-
<load module="mod_h26x"/>
6362
<!--<load module="mod_siren"/>-->
6463

6564
<!-- File Format Interfaces -->

‎conf/insideout/vars.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@
5959
G729 - G729 in passthru mode. (mod_g729)
6060
G723 - G723.1 in passthru mode. (mod_g723_1)
6161
AMR - AMR in passthru mode. (mod_amr)
62-
63-
These are the passthru video codecs: (mod_h26x)
64-
65-
H261 - H.261 Video
66-
H263 - H.263 Video
67-
H263-1998 - H.263-1998 Video
68-
H263-2000 - H.263-2000 Video
69-
H264 - H.264 Video
7062
7163
-->
7264
<X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/>

‎conf/sbc/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<load module="mod_g729"/>
4343
<load module="mod_amr"/>
4444
<!--<load module="mod_ilbc"/>-->
45-
<load module="mod_h26x"/>
4645
<!--<load module="mod_siren"/>-->
4746

4847
<!-- Timers -->

‎conf/sbc/vars.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@
5858
G723 - G723.1 in passthru mode. (mod_g723_1)
5959
AMR - AMR in passthru mode. (mod_amr)
6060
61-
These are the passthru video codecs: (mod_h26x)
62-
63-
H261 - H.261 Video
64-
H263 - H.263 Video
65-
H263-1998 - H.263-1998 Video
66-
H263-2000 - H.263-2000 Video
67-
H264 - H.264 Video
68-
6961
-->
7062
<X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/>
7163
<X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/>

‎conf/vanilla/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<load module="mod_g729"/>
8585
<load module="mod_amr"/>
8686
<!--<load module="mod_ilbc"/>-->
87-
<!--<load module="mod_h26x"/>-->
8887
<load module="mod_b64"/>
8988
<!--<load module="mod_siren"/>-->
9089
<load module="mod_opus"/>

‎conf/vanilla/vars.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,6 @@
205205
G723 - G723.1 in passthru mode. (mod_g723_1)
206206
AMR - AMR in passthru mode. (mod_amr)
207207
208-
These are the passthru video codecs: (mod_h26x)
209-
210-
H261 - H.261 Video
211-
H263 - H.263 Video
212-
H263-1998 - H.263-1998 Video
213-
H263-2000 - H.263-2000 Video
214-
H264 - H.264 Video
215-
216208
RTP Dynamic Payload Numbers currently used in FreeSWITCH and their purpose.
217209
218210
96 - AMR

‎configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2144,7 +2144,6 @@ AC_CONFIG_FILES([Makefile
21442144
src/mod/codecs/mod_com_g729/Makefile
21452145
src/mod/codecs/mod_g723_1/Makefile
21462146
src/mod/codecs/mod_g729/Makefile
2147-
src/mod/codecs/mod_h26x/Makefile
21482147
src/mod/codecs/mod_ilbc/Makefile
21492148
src/mod/codecs/mod_opus/Makefile
21502149
src/mod/codecs/mod_openh264/Makefile

‎debian/bootstrap.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
478478
freeswitch-mod-g723-1 (= \${binary:Version}),
479479
freeswitch-mod-g729 (= \${binary:Version}),
480480
freeswitch-mod-amr (= \${binary:Version}),
481-
freeswitch-mod-h26x (= \${binary:Version}),
482481
freeswitch-mod-sndfile (= \${binary:Version}),
483482
freeswitch-mod-native-file (= \${binary:Version}),
484483
freeswitch-mod-local-stream (= \${binary:Version}),
@@ -687,7 +686,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
687686
freeswitch-mod-codec2 (= \${binary:Version}),
688687
freeswitch-mod-g723-1 (= \${binary:Version}),
689688
freeswitch-mod-g729 (= \${binary:Version}),
690-
freeswitch-mod-h26x (= \${binary:Version}),
691689
freeswitch-mod-opus (= \${binary:Version}),
692690
freeswitch-mod-silk (= \${binary:Version}),
693691
freeswitch-mod-spandsp (= \${binary:Version}),
@@ -711,7 +709,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
711709
freeswitch-mod-codec2-dbg (= \${binary:Version}),
712710
freeswitch-mod-g723-1-dbg (= \${binary:Version}),
713711
freeswitch-mod-g729-dbg (= \${binary:Version}),
714-
freeswitch-mod-h26x-dbg (= \${binary:Version}),
715712
freeswitch-mod-opus-dbg (= \${binary:Version}),
716713
freeswitch-mod-silk-dbg (= \${binary:Version}),
717714
freeswitch-mod-spandsp-dbg (= \${binary:Version}),

‎debian/control-modules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,6 @@ Module: codecs/mod_g729
278278
Description: mod_g729
279279
Adds mod_g729.
280280

281-
Module: codecs/mod_h26x
282-
Description: mod_h26x
283-
Adds mod_h26x.
284-
285281
Module: codecs/mod_ilbc
286282
Section: non-free/comm
287283
Description: mod_ilbc

‎freeswitch.spec

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -631,14 +631,6 @@ Conflicts: codec-com-g729
631631
%description codec-passthru-g729
632632
Pass-through g729 Codec support for FreeSWITCH open source telephony platform
633633

634-
%package codec-h26x
635-
Summary: H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform
636-
Group: System/Libraries
637-
Requires: %{name} = %{version}-%{release}
638-
639-
%description codec-h26x
640-
H.263/H.264 Video Codec support for FreeSWITCH open source telephony platform
641-
642634
%package codec-ilbc
643635
Summary: iLCB Codec support for FreeSWITCH open source telephony platform
644636
Group: System/Libraries
@@ -1169,7 +1161,6 @@ Requires: freeswitch-codec-passthru-amr
11691161
Requires: freeswitch-codec-bv
11701162
Requires: freeswitch-codec-passthru-g723_1
11711163
Requires: freeswitch-codec-passthru-g729
1172-
Requires: freeswitch-codec-h26x
11731164
Requires: freeswitch-codec-ilbc
11741165
Requires: freeswitch-codec-siren
11751166
Requires: freeswitch-database-pgsql
@@ -1258,7 +1249,7 @@ ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_comm
12581249
#
12591250
######################################################################################################################
12601251
CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2 codecs/mod_g723_1 \
1261-
codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_opus codecs/mod_silk \
1252+
codecs/mod_g729 codecs/mod_ilbc codecs/mod_opus codecs/mod_silk \
12621253
codecs/mod_siren codecs/mod_theora"
12631254
#
12641255

@@ -1952,9 +1943,6 @@ fi
19521943
%files codec-passthru-g729
19531944
%{MODINSTDIR}/mod_g729.so*
19541945

1955-
%files codec-h26x
1956-
%{MODINSTDIR}/mod_h26x.so*
1957-
19581946
%files codec-ilbc
19591947
%{MODINSTDIR}/mod_ilbc.so*
19601948

‎src/mod/codecs/mod_h26x/Makefile.am

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/mod/codecs/mod_h26x/mod_h26x.2017.vcxproj

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)