]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7508: remove mod_vp8 which has been replaced by mod_vpx
authorMichael Jerris <mike@jerris.com>
Thu, 23 Apr 2015 17:44:17 +0000 (12:44 -0500)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:25 +0000 (12:47 -0500)
build/modules.conf.in
conf/insideout/autoload_configs/modules.conf.xml
conf/rayo/autoload_configs/modules.conf.xml
conf/sbc/autoload_configs/modules.conf.xml
conf/vanilla/autoload_configs/modules.conf.xml
configure.ac
debian/control-modules
freeswitch.spec
src/mod/codecs/mod_vp8/Makefile.am [deleted file]
src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj [deleted file]
src/mod/codecs/mod_vp8/mod_vp8.c [deleted file]

index 0b67c2a80dd97a8433c24ccecc39d2490bfabde9..baed6bda721b50b9a138db37839fb83df58b9085 100644 (file)
@@ -66,7 +66,7 @@ codecs/mod_b64
 codecs/mod_g723_1
 codecs/mod_g729
 codecs/mod_h26x
-codecs/mod_vp8
+codecs/mod_vpx
 #codecs/mod_ilbc
 #codecs/mod_isac
 #codecs/mod_mp4v
index 7d056a5b2a1edb10a73b6768bd64033b17001935..22f35c6cf344f8784d70a02052c5b63c0b826c4a 100644 (file)
@@ -63,7 +63,7 @@
     <load module="mod_amr"/>
     <!--<load module="mod_ilbc"/>-->
     <load module="mod_h26x"/>
-    <load module="mod_vp8"/>
+    <load module="mod_vpx"/>
     <!--<load module="mod_siren"/>-->
 
     <!-- File Format Interfaces -->
index 6480354bffa41d3484e13d6097882c3192ac6f0c..3a2ace10ade32fb853849cf1615ff129af303ff0 100644 (file)
@@ -30,7 +30,7 @@
     <load module="mod_opus"/>
     <load module="mod_ilbc"/>
     <load module="mod_h26x"/>
-    <load module="mod_vp8"/>
+    <load module="mod_vpx"/>
 
     <!-- File Format Interfaces -->
     <load module="mod_sndfile"/>
index 20a8718a6bff06562576346051b2822a5369ddd3..940c82b7a98854aa5e2f5ac509b7630f8e937179 100644 (file)
@@ -42,7 +42,7 @@
     <load module="mod_amr"/>
     <!--<load module="mod_ilbc"/>-->
     <load module="mod_h26x"/>
-    <load module="mod_vp8"/>
+    <load module="mod_vpx"/>
     <!--<load module="mod_siren"/>-->
 
     <!-- Timers -->
index e8672357676be6c2f0ce6d31d2fe1f56fc391b49..d9ab33046126b51c2781a9f602b61ec81024660e 100644 (file)
@@ -88,7 +88,7 @@
     <load module="mod_amr"/>
     <!--<load module="mod_ilbc"/>-->
     <load module="mod_h26x"/>
-    <load module="mod_vp8"/>
+    <load module="mod_vpx"/>
     <load module="mod_b64"/>
     <!--<load module="mod_siren"/>-->
     <!--<load module="mod_isac"/>-->
index 1458e24954793b0b9a77777fba0bd81ed0e79149..9758d9486a03d368f5291d8031964d473a684a2e 100644 (file)
@@ -1693,7 +1693,6 @@ AC_CONFIG_FILES([Makefile
                src/mod/codecs/mod_siren/Makefile
                src/mod/codecs/mod_skel_codec/Makefile
                src/mod/codecs/mod_theora/Makefile
-               src/mod/codecs/mod_vp8/Makefile
                src/mod/codecs/mod_vpx/Makefile
                src/mod/dialplans/mod_dialplan_asterisk/Makefile
                src/mod/dialplans/mod_dialplan_directory/Makefile
index 2ccc1a3c9d79a8a3e1df6b52d4c905bcd1009430..8b6575daa71afdc189993e7582e4ff138b646289 100644 (file)
@@ -345,8 +345,8 @@ Module: codecs/mod_theora
 Description: mod_theora
  Adds mod_theora.
 
-Module: codecs/mod_vp8
-Description: VP8 video codec
+Module: codecs/mod_vpx
+Description: VP8/VP9 video codec
  This module adds the VP8 video codec, also known as WebM.
 
 ## mod/dialplans
index 344724f3916a0edaf4a619f62abc08aac7f4c301..2ce5398046f2fb44dab08748745721cb9ea46641 100644 (file)
@@ -722,12 +722,12 @@ Requires:       %{name} = %{version}-%{release}
 %description codec-isac
 iSAC Codec support for FreeSWITCH open source telephony platform
 
-%package codec-vp8
+%package codec-vpx
 Summary:        vp8 Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 
-%description codec-vp8
+%description codec-vpx
 iSAC Codec support for FreeSWITCH open source telephony platform
 
 %package codec-mp4v
@@ -1407,7 +1407,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_isac codecs/mod_mp4v codecs/mod_opus codecs/mod_silk \
-               codecs/mod_siren codecs/mod_theora codecs/mod_vp8"
+               codecs/mod_siren codecs/mod_theora codecs/mod_vpx"
 #
 %if %{build_sng_tc}
 CODECS_MODULES+="codecs/mod_sangoma_codec"
@@ -2078,8 +2078,8 @@ fi
 %files codec-mp4v
 %{MODINSTDIR}/mod_mp4v.so*
 
-%files codec-vp8
-%{MODINSTDIR}/mod_vp8.so*
+%files codec-vpx
+%{MODINSTDIR}/mod_vpx.so*
 
 %files codec-opus
 %{MODINSTDIR}/mod_opus.so*
diff --git a/src/mod/codecs/mod_vp8/Makefile.am b/src/mod/codecs/mod_vp8/Makefile.am
deleted file mode 100644 (file)
index bd0bd7a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/build/modmake.rulesam
-MODNAME=mod_vp8
-
-mod_LTLIBRARIES = mod_vp8.la
-mod_vp8_la_SOURCES  = mod_vp8.c
-mod_vp8_la_CFLAGS   = $(AM_CFLAGS)
-mod_vp8_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
-mod_vp8_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
diff --git a/src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj b/src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj
deleted file mode 100644 (file)
index 8177bd6..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectName>mod_vp8</ProjectName>\r
-    <ProjectGuid>{ABFD88E1-7710-4BCC-AC34-56038DAC9652}</ProjectGuid>\r
-    <RootNamespace>mod_vp8</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <PlatformToolset>v110</PlatformToolset>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_release.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_debug.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_release.props" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-    <Import Project="..\..\..\..\w32\module_debug.props" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-    </ClCompile>\r
-    <Link>\r
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="mod_vp8.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2012.vcxproj">\r
-      <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>\r
diff --git a/src/mod/codecs/mod_vp8/mod_vp8.c b/src/mod/codecs/mod_vp8/mod_vp8.c
deleted file mode 100644 (file)
index 6eb56fd..0000000
+++ /dev/null
@@ -1,120 +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>
- * Seven Du <dujinfang@gmail.com>
- *
- * mod_vp8.c -- VP8 Video Codec
- *
- */
-
-#include <switch.h>
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_vp8_load);
-SWITCH_MODULE_DEFINITION(mod_vp8, mod_vp8_load, NULL, NULL);
-
-static switch_status_t switch_vp8_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_vp8_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_vp8_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_vp8_destroy(switch_codec_t *codec)
-{
-       return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_MODULE_LOAD_FUNCTION(mod_vp8_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, "VP8 Video (passthru)");
-
-       switch_core_codec_add_implementation(pool, codec_interface,
-                                                                                SWITCH_CODEC_TYPE_VIDEO, 99, "VP8", NULL, 90000, 90000, 0,
-                                                                                0, 0, 0, 0, 1, 1, switch_vp8_init, switch_vp8_encode, switch_vp8_decode, switch_vp8_destroy);
-
-       SWITCH_ADD_CODEC(codec_interface, "VP9 Video (passthru)");
-
-       switch_core_codec_add_implementation(pool, codec_interface,
-                                                                                SWITCH_CODEC_TYPE_VIDEO, 99, "VP9", NULL, 90000, 90000, 0,
-                                                                                0, 0, 0, 0, 1, 1, switch_vp8_init, switch_vp8_encode, switch_vp8_decode, switch_vp8_destroy);
-
-       SWITCH_ADD_CODEC(codec_interface, "red Video (passthru)");
-       switch_core_codec_add_implementation(pool, codec_interface,
-                                                                                SWITCH_CODEC_TYPE_VIDEO, 103, "red", NULL, 90000, 90000, 0,
-                                                                                0, 0, 0, 0, 1, 1, switch_vp8_init, switch_vp8_encode, switch_vp8_decode, switch_vp8_destroy);
-
-       SWITCH_ADD_CODEC(codec_interface, "ulpfec Video (passthru)");
-       switch_core_codec_add_implementation(pool, codec_interface,
-                                                                                SWITCH_CODEC_TYPE_VIDEO, 104, "ulpfec", NULL, 90000, 90000, 0,
-                                                                                0, 0, 0, 0, 1, 1, switch_vp8_init, switch_vp8_encode, switch_vp8_decode, switch_vp8_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:
- */