Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

FS-11425 remove vp10

This commit is contained in:
Seven Du 2019-01-31 22:15:00 +08:00 committed by Andrey Volk
parent 339f0ff252
commit 4ace287aac
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/vanilla/autoload_configs/vpx.conf.xml
View File

@ -117,9 +117,6 @@
<param name="vp9e-tune-content" value="SCREEN"/> <param name="vp9e-tune-content" value="SCREEN"/>
</profile> </profile>
<profile name="vp10">
</profile>
<profile name="conference"> <profile name="conference">
<param name="dec-threads" value="4"/> <param name="dec-threads" value="4"/>
<param name="enc-threads" value="4"/> <param name="enc-threads" value="4"/>

16
src/switch_vpx.c
View File

@ -1542,12 +1542,6 @@ static void init_vp9(my_vpx_cfg_t *my_cfg)
my_cfg->tune_content = VP9E_CONTENT_SCREEN; 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) static my_vpx_cfg_t *find_cfg_profile(const char *name, switch_bool_t reconfig)
{ {
int i; 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]); init_vp8(vpx_globals.profiles[i]);
} else if (!strcmp(name, "vp9")) { } else if (!strcmp(name, "vp9")) {
init_vp9(vpx_globals.profiles[i]); init_vp9(vpx_globals.profiles[i]);
} else if (!strcmp(name, "vp10")) {
init_vp10(vpx_globals.profiles[i]);
} else { } else {
init_vp8(vpx_globals.profiles[i]); 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->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"); 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>>" #define VPX_API_SYNTAX "<reload|debug <on|off>>"