From c7ac200d15e3240972d269df768068f0e3bb9c2f Mon Sep 17 00:00:00 2001
From: Jason Garrett-Glaser <jason@x264.com>
Date: Tue, 8 Feb 2011 15:51:15 -0800
Subject: [PATCH] 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.
---
ffpresets/libx264-fast.ffpreset | 4 ++--
ffpresets/libx264-fast_firstpass.ffpreset | 4 ++--
ffpresets/libx264-faster.ffpreset | 4 ++--
ffpresets/libx264-faster_firstpass.ffpreset | 4 ++--
ffpresets/libx264-lossless_fast.ffpreset | 4 ++--
ffpresets/libx264-lossless_max.ffpreset | 4 ++--
ffpresets/libx264-lossless_medium.ffpreset | 4 ++--
ffpresets/libx264-lossless_slow.ffpreset | 4 ++--
ffpresets/libx264-lossless_slower.ffpreset | 4 ++--
ffpresets/libx264-lossless_ultrafast.ffpreset | 4 ++--
ffpresets/libx264-medium.ffpreset | 4 ++--
ffpresets/libx264-medium_firstpass.ffpreset | 4 ++--
ffpresets/libx264-placebo.ffpreset | 4 ++--
ffpresets/libx264-placebo_firstpass.ffpreset | 4 ++--
ffpresets/libx264-slow.ffpreset | 4 ++--
ffpresets/libx264-slow_firstpass.ffpreset | 4 ++--
ffpresets/libx264-slower.ffpreset | 4 ++--
ffpresets/libx264-slower_firstpass.ffpreset | 4 ++--
ffpresets/libx264-superfast.ffpreset | 4 ++--
ffpresets/libx264-superfast_firstpass.ffpreset | 4 ++--
ffpresets/libx264-ultrafast.ffpreset | 4 ++--
ffpresets/libx264-ultrafast_firstpass.ffpreset | 4 ++--
ffpresets/libx264-veryfast.ffpreset | 4 ++--
ffpresets/libx264-veryfast_firstpass.ffpreset | 4 ++--
ffpresets/libx264-veryslow.ffpreset | 4 ++--
ffpresets/libx264-veryslow_firstpass.ffpreset | 4 ++--
libavcodec/options.c | 4 ++--
27 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/ffpresets/libx264-fast.ffpreset b/ffpresets/libx264-fast.ffpreset
index cac6534e55b..0fc1f22403f 100644
--- 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
diff --git a/ffpresets/libx264-fast_firstpass.ffpreset b/ffpresets/libx264-fast_firstpass.ffpreset
index 65ec0112e03..cdcbbbf2278 100644
--- 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
diff --git a/ffpresets/libx264-faster.ffpreset b/ffpresets/libx264-faster.ffpreset
index a32eed3cc5a..3156cd80280 100644
--- 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
diff --git a/ffpresets/libx264-faster_firstpass.ffpreset b/ffpresets/libx264-faster_firstpass.ffpreset
index c777eb4e231..9bcf18ae9dd 100644
--- 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
diff --git a/ffpresets/libx264-lossless_fast.ffpreset b/ffpresets/libx264-lossless_fast.ffpreset
index ea08d3c00b5..b7696b5bcbb 100644
--- 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
diff --git a/ffpresets/libx264-lossless_max.ffpreset b/ffpresets/libx264-lossless_max.ffpreset
index 8c049c9c936..75c387f1625 100644
--- 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
diff --git a/ffpresets/libx264-lossless_medium.ffpreset b/ffpresets/libx264-lossless_medium.ffpreset
index 558be6c9311..116e3343ce8 100644
--- 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
diff --git a/ffpresets/libx264-lossless_slow.ffpreset b/ffpresets/libx264-lossless_slow.ffpreset
index ff641cf40f1..0d496f6e29b 100644
--- 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
diff --git a/ffpresets/libx264-lossless_slower.ffpreset b/ffpresets/libx264-lossless_slower.ffpreset
index 854f74b2365..672e0cd637a 100644
--- 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
diff --git a/ffpresets/libx264-lossless_ultrafast.ffpreset b/ffpresets/libx264-lossless_ultrafast.ffpreset
index 1c429f21ffc..a2eda65edf8 100644
--- 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
diff --git a/ffpresets/libx264-medium.ffpreset b/ffpresets/libx264-medium.ffpreset
index 039f1d603c9..3c90ec5d624 100644
--- 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
diff --git a/ffpresets/libx264-medium_firstpass.ffpreset b/ffpresets/libx264-medium_firstpass.ffpreset
index e4159892d0c..2ad0a9cc256 100644
--- 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
diff --git a/ffpresets/libx264-placebo.ffpreset b/ffpresets/libx264-placebo.ffpreset
index fae2222da8c..9f4719f71d5 100644
--- 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
diff --git a/ffpresets/libx264-placebo_firstpass.ffpreset b/ffpresets/libx264-placebo_firstpass.ffpreset
index fae2222da8c..9f4719f71d5 100644
--- 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
diff --git a/ffpresets/libx264-slow.ffpreset b/ffpresets/libx264-slow.ffpreset
index 0f3f4d4b415..dabe0ae14e7 100644
--- 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
diff --git a/ffpresets/libx264-slow_firstpass.ffpreset b/ffpresets/libx264-slow_firstpass.ffpreset
index 89e74e45ca4..4af64dbe326 100644
--- 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
diff --git a/ffpresets/libx264-slower.ffpreset b/ffpresets/libx264-slower.ffpreset
index f3a412c03ef..239ee68cb44 100644
--- 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
diff --git a/ffpresets/libx264-slower_firstpass.ffpreset b/ffpresets/libx264-slower_firstpass.ffpreset
index aa1eb1e9631..4b5b420c29c 100644
--- 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
diff --git a/ffpresets/libx264-superfast.ffpreset b/ffpresets/libx264-superfast.ffpreset
index bcd459930e4..fb2ab8c44f2 100644
--- 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
diff --git a/ffpresets/libx264-superfast_firstpass.ffpreset b/ffpresets/libx264-superfast_firstpass.ffpreset
index ef06b1d5629..55ff9a2b7f9 100644
--- 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
diff --git a/ffpresets/libx264-ultrafast.ffpreset b/ffpresets/libx264-ultrafast.ffpreset
index b6d208080a6..28dc0eb8360 100644
--- 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
diff --git a/ffpresets/libx264-ultrafast_firstpass.ffpreset b/ffpresets/libx264-ultrafast_firstpass.ffpreset
index b6d208080a6..28dc0eb8360 100644
--- 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
diff --git a/ffpresets/libx264-veryfast.ffpreset b/ffpresets/libx264-veryfast.ffpreset
index 16ca594abe1..bfa3d8fad22 100644
--- 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
diff --git a/ffpresets/libx264-veryfast_firstpass.ffpreset b/ffpresets/libx264-veryfast_firstpass.ffpreset
index 39eaf3e24bc..ac2332df447 100644
--- 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
diff --git a/ffpresets/libx264-veryslow.ffpreset b/ffpresets/libx264-veryslow.ffpreset
index a0606255d3e..e07aeb82fae 100644
--- 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
diff --git a/ffpresets/libx264-veryslow_firstpass.ffpreset b/ffpresets/libx264-veryslow_firstpass.ffpreset
index 6e7079bbe01..e17c04b20b3 100644
--- 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
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 369ee5d3343..ff4cc2dad17 100644
--- 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},
--
GitLab