ref: 297e043f7bc26dfbcc9e8ff72df3138ec7723477
parent: 89be330c3e6c4ee79603373a7b29f73199cd87d6
parent: 45e7c49fbab52fdc2995534b515335b9457f7721
author: huili2 <huili2@cisco.com>
date: Tue Sep 26 12:39:26 EDT 2017
Merge pull request #2849 from ruil2/build_error modify the help comments
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -409,7 +409,7 @@
printf (" -deblockIdc Loop filter idc (0: on, 1: off, \n"); printf (" -alphaOffset AlphaOffset(-6..+6): valid range \n"); printf (" -betaOffset BetaOffset (-6..+6): valid range\n");- printf (" -rc rate control mode: 0-quality mode; 1-bitrate mode; 2-bitrate limited mode; -1-rc off \n");+ printf (" -rc rate control mode: -1-rc off; 0-quality mode; 1-bitrate mode; 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;\n"); printf (" -tarb Overall target bitrate\n"); printf (" -maxbrTotal Overall max bitrate\n"); printf (" -maxqp Maximum Qp (default: %d, or for screen content usage: %d)\n", QP_MAX_VALUE, MAX_SCREEN_QP);--- a/testbin/welsenc.cfg
+++ b/testbin/welsenc.cfg
@@ -31,7 +31,8 @@
UseLoadBalancing 1 # under particular slice mode, when multi-threading is used, whether apply dynamic slicing for load balancing
#============================== RATE CONTROL ==============================
-RCMode 0 # 0: quality mode; 1: bitrate mode; # 2: buffer based mode,can't control bitrate; -1: rc off mode;
+RCMode 0 # -1: rc off mode; 0: quality mode; 1: bitrate mode;
+ # 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;
TargetBitrate 5000 # Unit: kbps, controled by EnableRC also
MaxOverallBitrate 0 # Unit: kbps, max bitrate overall, 0 - unspecified
EnableFrameSkip 1 #Enable Frame Skip
--- a/testbin/welsenc_arbitrary_res.cfg
+++ b/testbin/welsenc_arbitrary_res.cfg
@@ -31,7 +31,8 @@
MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#============================== RATE CONTROL ==============================
-RCMode 0 # 0: quality mode; 1: bitrate mode; # 2: buffer based mode,can't control bitrate; -1: rc off mode;
+RCMode 0 # -1: rc off mode; 0: quality mode; 1: bitrate mode;
+ # 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;
TargetBitrate 5000 # Unit: kbps, controled by EnableRC also
MaxOverallBitrate 6000 # Unit: kbps, max bitrate overall
MaxQp 51 # maximum quant
--- a/testbin/welsenc_ios.cfg
+++ b/testbin/welsenc_ios.cfg
@@ -31,7 +31,8 @@
MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#============================== RATE CONTROL ==============================
-RCMode 0 # 0: quality mode; 1: bitrate mode; # 2: buffer based mode,can't control bitrate; -1: rc off mode;
+RCMode 0 # -1: rc off mode; 0: quality mode; 1: bitrate mode;
+ # 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;
TargetBitrate 5000 # Unit: kbps, controled by EnableRC also
MaxOverallBitrate 6000 # Unit: kbps, max bitrate overall
EnableFrameSkip 1 #Enable Frame Skip
--- a/testbin/welsenc_vd_1d.cfg
+++ b/testbin/welsenc_vd_1d.cfg
@@ -31,7 +31,8 @@
MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#============================== RATE CONTROL ==============================
-RCMode 0 # 0: quality mode; 1: bitrate mode; # 2: buffer based mode,can't control bitrate; -1: rc off mode;
+RCMode 0 # -1: rc off mode; 0: quality mode; 1: bitrate mode;
+ # 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;
TargetBitrate 5000 # Unit: kbps, controled by EnableRC also
MaxOverallBitrate 6000 # Unit: kbps, max bitrate overall
MaxQp 51 # maximum quant
--- a/testbin/welsenc_vd_rc.cfg
+++ b/testbin/welsenc_vd_rc.cfg
@@ -31,7 +31,8 @@
MultipleThreadIdc 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
#============================== RATE CONTROL ==============================
-RCMode 0 # 0: quality mode; 1: bitrate mode; # 2: buffer based mode,can't control bitrate; -1: rc off mode;
+RCMode 0 # -1: rc off mode; 0: quality mode; 1: bitrate mode;
+ # 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;
TargetBitrate 600 # Unit: kbps, controled by EnableRC also
MaxOverallBitrate 800 # Unit: kbps, max bitrate overall
MaxQp 51 # maximum quant