diff --git a/build/modules.conf.in b/build/modules.conf.in
index 0b67c2a80d..baed6bda72 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -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
diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml
index 7d056a5b2a..22f35c6cf3 100644
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@@ -63,7 +63,7 @@
-
+
diff --git a/conf/rayo/autoload_configs/modules.conf.xml b/conf/rayo/autoload_configs/modules.conf.xml
index 6480354bff..3a2ace10ad 100644
--- a/conf/rayo/autoload_configs/modules.conf.xml
+++ b/conf/rayo/autoload_configs/modules.conf.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/conf/sbc/autoload_configs/modules.conf.xml b/conf/sbc/autoload_configs/modules.conf.xml
index 20a8718a6b..940c82b7a9 100644
--- a/conf/sbc/autoload_configs/modules.conf.xml
+++ b/conf/sbc/autoload_configs/modules.conf.xml
@@ -42,7 +42,7 @@
-
+
diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index e867235767..d9ab330461 100644
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -88,7 +88,7 @@
-
+
diff --git a/configure.ac b/configure.ac
index 1458e24954..9758d9486a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/debian/control-modules b/debian/control-modules
index 2ccc1a3c9d..8b6575daa7 100644
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -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
diff --git a/freeswitch.spec b/freeswitch.spec
index 344724f391..2ce5398046 100644
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -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
index bd0bd7af05..0000000000
--- a/src/mod/codecs/mod_vp8/Makefile.am
+++ /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
index 8177bd67fa..0000000000
--- a/src/mod/codecs/mod_vp8/mod_vp8.2012.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- mod_vp8
- {ABFD88E1-7710-4BCC-AC34-56038DAC9652}
- mod_vp8
- Win32Proj
-
-
-
- DynamicLibrary
- MultiByte
- v110
-
-
- DynamicLibrary
- MultiByte
- v110
-
-
- DynamicLibrary
- MultiByte
- v110
-
-
- DynamicLibrary
- MultiByte
- v110
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
- X64
-
-
-
-
-
-
- false
-
-
- MachineX64
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
- X64
-
-
-
-
-
-
- false
-
-
- MachineX64
-
-
-
-
-
-
-
- {202d7a4e-760d-4d0e-afa1-d7459ced30ff}
- false
-
-
-
-
-
-
diff --git a/src/mod/codecs/mod_vp8/mod_vp8.c b/src/mod/codecs/mod_vp8/mod_vp8.c
deleted file mode 100644
index 6eb56fdb1e..0000000000
--- a/src/mod/codecs/mod_vp8/mod_vp8.c
+++ /dev/null
@@ -1,120 +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
- * Seven Du
- *
- * mod_vp8.c -- VP8 Video Codec
- *
- */
-
-#include
-
-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:
- */