Update qmin/qmax values for libx264 presets

Also allow qmin/qmax to go up to 69 (the current max value for libx264). This will have to increase when we add 9/10-bit support. (cherry picked from commit c7ac200d15)
14 years ago · a97b9325cb
parent 2c855cea85
commit a97b9325cb
27 changed files with 54 additions and 54 deletions
--- a/ffpresets/libx264-fast.ffpreset
+++ b/ffpresets/libx264-fast.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=2
--- a/ffpresets/libx264-fast_firstpass.ffpreset
+++ b/ffpresets/libx264-fast_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-faster.ffpreset
+++ b/ffpresets/libx264-faster.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=2
--- a/ffpresets/libx264-faster_firstpass.ffpreset
+++ b/ffpresets/libx264-faster_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-lossless_fast.ffpreset
+++ b/ffpresets/libx264-lossless_fast.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 directpred=1
 flags2=+fastpskip
--- a/ffpresets/libx264-lossless_max.ffpreset
+++ b/ffpresets/libx264-lossless_max.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 refs=16
 directpred=1
--- a/ffpresets/libx264-lossless_medium.ffpreset
+++ b/ffpresets/libx264-lossless_medium.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 directpred=1
 flags2=+fastpskip
--- a/ffpresets/libx264-lossless_slow.ffpreset
+++ b/ffpresets/libx264-lossless_slow.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 refs=2
 directpred=1
--- a/ffpresets/libx264-lossless_slower.ffpreset
+++ b/ffpresets/libx264-lossless_slower.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 refs=4
 directpred=1
--- a/ffpresets/libx264-lossless_ultrafast.ffpreset
+++ b/ffpresets/libx264-lossless_ultrafast.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 directpred=1
 flags2=+fastpskip
--- a/ffpresets/libx264-medium.ffpreset
+++ b/ffpresets/libx264-medium.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=3
--- a/ffpresets/libx264-medium_firstpass.ffpreset
+++ b/ffpresets/libx264-medium_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-placebo.ffpreset
+++ b/ffpresets/libx264-placebo.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=16
 refs=16
--- a/ffpresets/libx264-placebo_firstpass.ffpreset
+++ b/ffpresets/libx264-placebo_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=16
 refs=16
--- a/ffpresets/libx264-slow.ffpreset
+++ b/ffpresets/libx264-slow.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=5
--- a/ffpresets/libx264-slow_firstpass.ffpreset
+++ b/ffpresets/libx264-slow_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-slower.ffpreset
+++ b/ffpresets/libx264-slower.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=8
--- a/ffpresets/libx264-slower_firstpass.ffpreset
+++ b/ffpresets/libx264-slower_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-superfast.ffpreset
+++ b/ffpresets/libx264-superfast.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-superfast_firstpass.ffpreset
+++ b/ffpresets/libx264-superfast_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-ultrafast.ffpreset
+++ b/ffpresets/libx264-ultrafast.ffpreset
@ -11,8 +11,8 @@ sc_threshold=0
 i_qfactor=0.71
 b_strategy=0
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=0
 refs=1
--- a/ffpresets/libx264-ultrafast_firstpass.ffpreset
+++ b/ffpresets/libx264-ultrafast_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=0
 i_qfactor=0.71
 b_strategy=0
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=0
 refs=1
--- a/ffpresets/libx264-veryfast.ffpreset
+++ b/ffpresets/libx264-veryfast.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-veryfast_firstpass.ffpreset
+++ b/ffpresets/libx264-veryfast_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=1
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=3
 refs=1
--- a/ffpresets/libx264-veryslow.ffpreset
+++ b/ffpresets/libx264-veryslow.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=8
 refs=16
--- a/ffpresets/libx264-veryslow_firstpass.ffpreset
+++ b/ffpresets/libx264-veryslow_firstpass.ffpreset
@ -11,8 +11,8 @@ sc_threshold=40
 i_qfactor=0.71
 b_strategy=2
 qcomp=0.6
-qmin=10
-qmax=51
+qmin=0
+qmax=69
 qdiff=4
 bf=8
 refs=1
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@ -117,8 +117,8 @@ static const AVOption options[]={
 {"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"qcomp", "video quantizer scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, 0.5, -FLT_MAX, FLT_MAX, V|E},
 {"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, 0.5, 0, FLT_MAX, V|E},
-{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 63, V|E},
-{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 63, V|E},
+{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 69, V|E},
+{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 69, V|E},
 {"qdiff", "max difference between the quantizer scale (VBR)", OFFSET(max_qdiff), FF_OPT_TYPE_INT, 3, INT_MIN, INT_MAX, V|E},
 {"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, 0, FF_MAX_B_FRAMES, V|E},
 {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, 1.25, -FLT_MAX, FLT_MAX, V|E},