Commit e600ab66a7 for freeswitch.com
commit e600ab66a75eb5db3a0bb03fefe4b070b7bd8853
Author: Andrey Volk <andywolk@gmail.com>
Date: Mon Dec 23 21:29:05 2024 +0300
[mod_theora] Remove from tree
diff --git a/build/modules.conf.in b/build/modules.conf.in
index d30c5f0177..4ce889c3ae 100755
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -61,7 +61,6 @@ codecs/mod_g729
codecs/mod_opus
#codecs/mod_silk
#codecs/mod_siren
-#codecs/mod_theora
#databases/mod_mariadb
databases/mod_pgsql
dialplans/mod_dialplan_asterisk
diff --git a/build/modules.conf.most b/build/modules.conf.most
index 40a61c8daa..b0c6cf5673 100755
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@@ -60,7 +60,6 @@ codecs/mod_ilbc
codecs/mod_opus
codecs/mod_silk
codecs/mod_siren
-codecs/mod_theora
#databases/mod_mariadb
databases/mod_pgsql
dialplans/mod_dialplan_asterisk
diff --git a/configure.ac b/configure.ac
index 7474353205..579af2795e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2156,7 +2156,6 @@ AC_CONFIG_FILES([Makefile
src/mod/codecs/mod_silk/Makefile
src/mod/codecs/mod_siren/Makefile
src/mod/codecs/mod_skel_codec/Makefile
- src/mod/codecs/mod_theora/Makefile
src/mod/databases/mod_mariadb/Makefile
src/mod/databases/mod_pgsql/Makefile
src/mod/dialplans/mod_dialplan_asterisk/Makefile
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index ce5adea315..2938661c50 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -688,7 +688,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
freeswitch-mod-opus (= \${binary:Version}),
freeswitch-mod-silk (= \${binary:Version}),
freeswitch-mod-spandsp (= \${binary:Version}),
- freeswitch-mod-theora (= \${binary:Version}),
Suggests:
freeswitch-mod-ilbc (= \${binary:Version}),
freeswitch-mod-siren (= \${binary:Version})
@@ -711,7 +710,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
freeswitch-mod-opus-dbg (= \${binary:Version}),
freeswitch-mod-silk-dbg (= \${binary:Version}),
freeswitch-mod-spandsp-dbg (= \${binary:Version}),
- freeswitch-mod-theora-dbg (= \${binary:Version}),
Suggests:
freeswitch-mod-ilbc-dbg (= \${binary:Version}),
freeswitch-mod-siren-dbg (= \${binary:Version})
diff --git a/debian/control-modules b/debian/control-modules
index 101fab9e08..3a9aa9c5b6 100755
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -308,10 +308,6 @@ Module: codecs/mod_skel_codec
Description: Adds mod_skel_codec
Adds mod_skel_codec.
-Module: codecs/mod_theora
-Description: mod_theora
- Adds mod_theora.
-
Module: codecs/mod_yuv
Description: Adds mod_yuv
Adds mod_yuv.
diff --git a/freeswitch.spec b/freeswitch.spec
index 1d98356588..55d094f127 100755
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -683,14 +683,6 @@ see http://www.polycom.com/usa/en/company/about_us/technology/siren_g7221/siren_
and http://www.polycom.com/usa/en/company/about_us/technology/siren14_g7221c/siren14_g7221c.html
At the time of this packaging, Polycom does not charge for licensing.
-%package codec-theora
-Summary: Theora Video Codec support for FreeSWITCH open source telephony platform
-Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description codec-theora
-Theora Video Codec support for FreeSWITCH open source telephony platform.
-
######################################################################################################################
# FreeSWITCH Database Modules
######################################################################################################################
@@ -1242,7 +1234,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_ilbc codecs/mod_opus codecs/mod_silk \
- codecs/mod_siren codecs/mod_theora"
+ codecs/mod_siren"
#
######################################################################################################################
@@ -1947,9 +1939,6 @@ fi
%files codec-siren
%{MODINSTDIR}/mod_siren.so*
-%files codec-theora
-%{MODINSTDIR}/mod_theora.so*
-
######################################################################################################################
#
# FreeSWITCH Database Modules
diff --git a/src/mod/codecs/mod_theora/Makefile.am b/src/mod/codecs/mod_theora/Makefile.am
deleted file mode 100644
index 1226a05a73..0000000000
--- a/src/mod/codecs/mod_theora/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_theora
-
-mod_LTLIBRARIES = mod_theora.la
-mod_theora_la_SOURCES = mod_theora.c
-mod_theora_la_CFLAGS = $(AM_CFLAGS)
-mod_theora_la_LIBADD = $(switch_builddir)/libfreeswitch.la
-mod_theora_la_LDFLAGS = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_theora/mod_theora.c b/src/mod/codecs/mod_theora/mod_theora.c
deleted file mode 100644
index e1733d44fc..0000000000
--- a/src/mod/codecs/mod_theora/mod_theora.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
- * Copyright (C) 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- *
- * 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 <anthm@freeswitch.org>
- * Portions created by the Initial Developer are Copyright (C)
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Anthony Minessale II <anthm@freeswitch.org>
- *
- *
- * mod_theora.c -- THEORA Video Codec
- *
- */
-
-#include <switch.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_theora_load);
-SWITCH_MODULE_DEFINITION(mod_theora, mod_theora_load, NULL, NULL);
-
-static switch_status_t switch_theora_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_theora_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_theora_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_theora_destroy(switch_codec_t *codec)
-{
- return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_theora_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, "THEORA Video (passthru)");
- switch_core_codec_add_implementation(pool, codec_interface,
- SWITCH_CODEC_TYPE_VIDEO, 99, "THEORA", NULL, 90000, 90000, 0,
- 0, 0, 0, 0, 1, 1, switch_theora_init, switch_theora_encode, switch_theora_decode, switch_theora_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:
- */