From 48539c278d33f77132732f7120c3c02c630e7c32 Mon Sep 17 00:00:00 2001
From: Seven Du <dujinfang@x-y-t.cn>
Date: Mon, 1 Oct 2018 22:09:38 +0800
Subject: [PATCH] FS-11425 update example configs

---
 conf/vanilla/autoload_configs/av.conf.xml     | 35 ++++++++--
 conf/vanilla/autoload_configs/vpx.conf.xml    | 67 +++++++++++++++++--
 .../mod_av/autoload_configs/av.conf.xml       | 29 +++++++-
 3 files changed, 118 insertions(+), 13 deletions(-)

diff --git a/conf/vanilla/autoload_configs/av.conf.xml b/conf/vanilla/autoload_configs/av.conf.xml
index 5a53668c4d..43e8514ce1 100644
--- a/conf/vanilla/autoload_configs/av.conf.xml
+++ b/conf/vanilla/autoload_configs/av.conf.xml
@@ -11,10 +11,6 @@
     <!-- integer of cpus, or 'auto', or 'cpu/<divisor>/<max> -->
     <param name="dec-threads" value="1"/>
     <param name="enc-threads" value="cpu/2/4"/>
-    <param name="h263-profile" value="H263"/>
-    <param name="h263+-profile" value="H263+"/>
-    <param name="h264-profile" value="H264"/>
-    <param name="h265-profile" value="H265"/>
   </settings>
 
   <profiles>
@@ -25,10 +21,10 @@
     </profile>
 
     <profile name="H264">
-      <!-- <param name="dec-threads" value="cpu/2/4"/> -->
-      <!-- <param name="enc-threads" value="1"/> -->
+      <!-- <param name="dec-threads" value="1"/> -->
+      <!-- <param name="enc-threads" value="cpu/2/4"/> -->
 
-      <!-- <param name="profile" value="2"/> -->
+      <!-- <param name="profile" value="baseline"/> -->
       <!-- <param name="level" value="41"/> -->
       <!-- <param name="timebase" value="1/90"/> -->
 
@@ -136,6 +132,31 @@ enum AVColorRange {
 
     <profile name="H265">
     </profile>
+
+    <profile name="conference">
+      <param name="dec-threads" value="1"/>
+      <param name="enc-threads" value="cpu/2/4"/>
+
+      <codecs>
+        <!-- profiles will be parsed at runtime
+          to overwrite this profile params if codec matches -->
+        <codec name="H263" profile="H263"/>
+        <codec name="H264" profile="H264"/>
+        <codec name="H264" profile="conference-H264"/>
+      </codecs>
+    </profile>
+
+    <profile name="conference-H264">
+      <options>
+        <option name="preset" value="veryfast"/>
+        <option name="intra_refresh" value="1"/>
+        <option name="tune" value="animation+zerolatency"/>
+        <option name="sc_threshold" value="40"/>
+        <option name="b_strategy" value="1"/>
+        <option name="crf" value="10"/>
+      </options>
+    </profile>
+
   </profiles>
 </configuration>
 
diff --git a/conf/vanilla/autoload_configs/vpx.conf.xml b/conf/vanilla/autoload_configs/vpx.conf.xml
index c64e593d9c..e269cbc999 100644
--- a/conf/vanilla/autoload_configs/vpx.conf.xml
+++ b/conf/vanilla/autoload_configs/vpx.conf.xml
@@ -1,5 +1,7 @@
 <configuration name="vpx.conf" description="VPX Config">
   <settings>
+    <!-- <param name="debug" value="1"/> -->
+
     <!-- max bitrate the system support, truncate if over limit -->
     <!-- <param name="max-bitrate" value="5mb"/> -->
 
@@ -11,9 +13,6 @@
     <!-- integer of cpus, or 'auto', or 'cpu/<divisor>/<max> -->
     <param name="dec-threads" value="cpu/2/4"/>
     <param name="enc-threads" value="1"/>
-    <param name="vp8-profile" value="vp8"/>
-    <param name="vp9-profile" value="vp9"/>
-    <param name="vp10-profile" value="vp10"/>
   </settings>
 
   <profiles>
@@ -22,7 +21,6 @@
       <!-- <param name="enc-threads" value="1"/> -->
 
       <param name="g-profile" value="2"/>
-      <param name="g-timebase" value="1/1000"/>
       <!-- DEFULT | PARTITIONS -->
       <param name="g-error-resilient" value="PARTITIONS"/>
       <!-- ONE_PASS, FIRST_PASS, LAST_PASS"/> -->
@@ -121,5 +119,66 @@
 
     <profile name="vp10">
     </profile>
+
+    <profile name="conference">
+      <param name="dec-threads" value="4"/>
+      <param name="enc-threads" value="4"/>
+      <codecs>
+        <!-- profiles will be parsed at runtime
+          to overwrite this profile params if codec matches -->
+        <codec name="vp8" profile="vp8"/>
+        <codec name="vp8" profile="conference-vp8"/>
+        <codec name="vp9" profile="vp9"/>
+      </codecs>
+    </profile>
+
+    <profile name="conference-vp8">
+      <param name="dec-threads" value="cpu/2/4"/>
+      <param name="enc-threads" value="cpu/2/4"/>
+      <param name="g-profile" value="2"/>
+      <!-- DEFULT | PARTITIONS -->
+      <param name="g-error-resilient" value="PARTITIONS"/>
+      <!-- ONE_PASS, FIRST_PASS, LAST_PASS"/> -->
+      <!-- <param name="g-pass" value="ONE_PASS"/> -->
+      <!-- <param name="g-lag-in-frames" value="0"/> -->
+      <param name="rc-dropframe-thresh" value="0"/>
+      <param name="rc-resize-allowed" value="1"/>
+      <!-- <param name="rc-scaled-width" value="0"/> -->
+      <!-- <param name="rc-scaled-height" value="0"/> -->
+      <!-- <param name="rc-resize-up-thresh" value="0"/> -->
+      <!-- <param name="rc-resize-down-thresh" value="0"/> -->
+      <!-- VBR, CBR, CQ, Q -->
+      <param name="rc-end-usage" value="CBR"/>
+      <!-- bps -->
+      <param name="rc-target-bitrate" value="1mb"/>
+      <param name="rc-min-quantizer" value="0"/>
+      <param name="rc-max-quantizer" value="63"/>
+      <param name="rc-undershoot-pct" value="100"/>
+      <param name="rc-overshoot-pct" value="50"/>
+      <param name="rc-buf-sz" value="5000"/>
+      <param name="rc-buf-initial-sz" value="1000"/>
+      <param name="rc-buf-optimal-sz" value="1000"/>
+      <!-- <param name="rc-2pass-vbr-bias-pct" value="0"/> -->
+      <!-- <param name="rc-2pass-vbr-minsection-pct" value="0"/> -->
+      <!-- <param name="rc-2pass-vbr-maxsection-pct" value="0"/> -->
+      <!-- AUTO, DISABLED -->
+      <param name="kf-mode" value="AUTO"/>
+      <param name="kf-min-dist" value="0"/>
+      <param name="kf-max-dist" value="240"/>
+      <!-- <param name="ss-number-layers" value="0"/> -->
+      <!-- <param name="ts-number-layers" value="0"/> -->
+      <!-- <param name="ts-periodicity" value="0"/> -->
+      <!-- <param name="temporal-layering-mode" value="0"/> -->
+
+      <!-- params SET by codec_control -->
+      <param name="lossless" value="0"/>
+      <!-- cpuused -8..8 -->
+      <param name="cpuused" value="-6"/>
+      <!-- cpu string or integer -->
+      <param name="token-parts" value="cpu/2/3"/>
+      <param name="static-thresh" value="100"/>
+      <param name="noise-sensitivity" value="1"/>
+      <!-- <param name="max-intra-bitrate-pct" value="0"/> -->
+    </profile>
   </profiles>
 </configuration>
diff --git a/src/mod/applications/mod_av/autoload_configs/av.conf.xml b/src/mod/applications/mod_av/autoload_configs/av.conf.xml
index 27b8140094..a8e27cdf31 100644
--- a/src/mod/applications/mod_av/autoload_configs/av.conf.xml
+++ b/src/mod/applications/mod_av/autoload_configs/av.conf.xml
@@ -21,8 +21,8 @@
     </profile>
 
     <profile name="H264">
-      <!-- <param name="dec-threads" value="cpu/2/4"/> -->
-      <!-- <param name="enc-threads" value="1"/> -->
+      <!-- <param name="dec-threads" value="1"/> -->
+      <!-- <param name="enc-threads" value="cpu/2/4"/> -->
 
       <!-- <param name="profile" value="baseline"/> -->
       <!-- <param name="level" value="41"/> -->
@@ -132,6 +132,31 @@ enum AVColorRange {
 
     <profile name="H265">
     </profile>
+
+    <profile name="conference">
+      <param name="dec-threads" value="1"/>
+      <param name="enc-threads" value="cpu/2/4"/>
+
+      <codecs>
+        <!-- profiles will be parsed at runtime
+          to overwrite this profile params if codec matches -->
+        <codec name="H263" profile="H263"/>
+        <codec name="H264" profile="H264"/>
+        <codec name="H264" profile="conference-H264"/>
+      </codecs>
+    </profile>
+
+    <profile name="conference-H264">
+      <options>
+        <option name="preset" value="veryfast"/>
+        <option name="intra_refresh" value="1"/>
+        <option name="tune" value="animation+zerolatency"/>
+        <option name="sc_threshold" value="40"/>
+        <option name="b_strategy" value="1"/>
+        <option name="crf" value="10"/>
+      </options>
+    </profile>
+
   </profiles>
 </configuration>