FS-11189 add some default config to be consistent if default xml config is missing

diff --git a/conf/vanilla/autoload_configs/vpx.conf.xml b/conf/vanilla/autoload_configs/vpx.conf.xml
index 1228468d3d32519181f496a8ffa6dd526fdb2f5d..111c4890f92ede13f3dfd0f76edb105ce801a97f 100644 (file)
--- a/conf/vanilla/autoload_configs/vpx.conf.xml
+++ b/conf/vanilla/autoload_configs/vpx.conf.xml
@@ -116,6 +116,7 @@
       <param name="token-parts" value="3"/>
       <param name="static-threash" value="1000"/>
       <param name="noise-sensitivity" value="0"/>
+      <!-- DEFAULT or SCREEN -->
       <param name="vp9e-tune-content" value="SCREEN"/>
     </profile>
 

diff --git a/src/switch_vpx.c b/src/switch_vpx.c
index 31ae7c0acd46bdf018a7a602b7b913f0b920912e..558c0a9197002ef2e2ca301ca837c022c88bce49 100644 (file)
--- a/src/switch_vpx.c
+++ b/src/switch_vpx.c
@@ -1383,7 +1383,36 @@ static void load_config()
 
        vpx_globals.max_bitrate = 0;
        vpx_globals.vp8.cpuused = -6;
+       vpx_globals.vp8.enc_cfg.g_profile = 2;
+       vpx_globals.vp8.enc_cfg.g_timebase.den = 1000;
+       vpx_globals.vp8.enc_cfg.g_error_resilient = VPX_ERROR_RESILIENT_PARTITIONS;
+       vpx_globals.vp8.enc_cfg.rc_resize_allowed = 1;
+       vpx_globals.vp8.enc_cfg.rc_end_usage = VPX_CBR;
+       vpx_globals.vp8.enc_cfg.rc_target_bitrate = switch_parse_bandwidth_string("1mb");
+       vpx_globals.vp8.enc_cfg.rc_min_quantizer = 4;
+       vpx_globals.vp8.enc_cfg.rc_max_quantizer = 63;
+       vpx_globals.vp8.enc_cfg.rc_overshoot_pct = 50;
+       vpx_globals.vp8.enc_cfg.rc_buf_sz = 5000;
+       vpx_globals.vp8.enc_cfg.rc_buf_initial_sz = 1000;
+       vpx_globals.vp8.enc_cfg.rc_buf_optimal_sz = 1000;
+       vpx_globals.vp8.enc_cfg.kf_max_dist = 360;
+
        vpx_globals.vp9.cpuused = -6;
+       vpx_globals.vp9.enc_cfg.g_profile = 2;
+       vpx_globals.vp9.enc_cfg.g_timebase.den = 1000;
+       vpx_globals.vp9.enc_cfg.g_error_resilient = VPX_ERROR_RESILIENT_PARTITIONS;
+       vpx_globals.vp9.enc_cfg.rc_resize_allowed = 1;
+       vpx_globals.vp9.enc_cfg.rc_end_usage = VPX_CBR;
+       vpx_globals.vp9.enc_cfg.rc_target_bitrate = switch_parse_bandwidth_string("1mb");
+       vpx_globals.vp9.enc_cfg.rc_min_quantizer = 4;
+       vpx_globals.vp9.enc_cfg.rc_max_quantizer = 63;
+       vpx_globals.vp9.enc_cfg.rc_overshoot_pct = 50;
+       vpx_globals.vp9.enc_cfg.rc_buf_sz = 5000;
+       vpx_globals.vp9.enc_cfg.rc_buf_initial_sz = 1000;
+       vpx_globals.vp9.enc_cfg.rc_buf_optimal_sz = 1000;
+       vpx_globals.vp9.enc_cfg.kf_max_dist = 360;
+       vpx_globals.vp9.tune_content = VP9E_CONTENT_SCREEN;
+
        vpx_globals.vp10.cpuused = -6;
 
        xml = switch_xml_open_cfg("vpx.conf", &cfg, NULL);