FS-11425 remove vp10

diff --git a/conf/vanilla/autoload_configs/vpx.conf.xml b/conf/vanilla/autoload_configs/vpx.conf.xml
index e269cbc999641bc82f9a5b6312f8a837122c294d..44840994d851dd99b572afb04a2f7a3c8fbc3276 100644 (file)
--- a/conf/vanilla/autoload_configs/vpx.conf.xml
+++ b/conf/vanilla/autoload_configs/vpx.conf.xml
@@ -117,9 +117,6 @@
       <param name="vp9e-tune-content" value="SCREEN"/>
     </profile>
 
-    <profile name="vp10">
-    </profile>
-
     <profile name="conference">
       <param name="dec-threads" value="4"/>
       <param name="enc-threads" value="4"/>

diff --git a/src/switch_vpx.c b/src/switch_vpx.c
index 4c479fcf1f7c2589172d37c02c9e39ec26318269..29d17e378070fa4bdaf86743e55c82c0adfb13e5 100644 (file)
--- a/src/switch_vpx.c
+++ b/src/switch_vpx.c
@@ -1542,12 +1542,6 @@ static void init_vp9(my_vpx_cfg_t *my_cfg)
        my_cfg->tune_content = VP9E_CONTENT_SCREEN;
 }
 
-static void init_vp10(my_vpx_cfg_t *my_cfg)
-{
-       // vpx_codec_enc_config_default(vpx_codec_vp9_cx(), &cfg->enc_cfg, 0);
-       my_cfg->cpuused = -6;
-}
-
 static my_vpx_cfg_t *find_cfg_profile(const char *name, switch_bool_t reconfig)
 {
        int i;
@@ -1563,8 +1557,6 @@ static my_vpx_cfg_t *find_cfg_profile(const char *name, switch_bool_t reconfig)
                                init_vp8(vpx_globals.profiles[i]);
                        } else if (!strcmp(name, "vp9")) {
                                init_vp9(vpx_globals.profiles[i]);
-                       } else if (!strcmp(name, "vp10")) {
-                               init_vp10(vpx_globals.profiles[i]);
                        } else {
                                init_vp8(vpx_globals.profiles[i]);
                        }
@@ -1895,14 +1887,6 @@ static void load_config()
                if (!my_cfg->enc_cfg.g_threads) my_cfg->enc_cfg.g_threads = 1;
                if (!my_cfg->dec_cfg.threads) my_cfg->dec_cfg.threads = switch_parse_cpu_string("cpu/2/4");
        }
-
-       my_cfg = find_cfg_profile("vp10", SWITCH_FALSE);
-
-       if (my_cfg) {
-               if (!my_cfg->enc_cfg.g_threads) my_cfg->enc_cfg.g_threads = 1;
-               if (!my_cfg->dec_cfg.threads) my_cfg->dec_cfg.threads = switch_parse_cpu_string("cpu/2/4");
-       }
-
 }
 
 #define VPX_API_SYNTAX "<reload|debug <on|off>>"