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.

diff --git a/ffpresets/libx264-fast.ffpreset b/ffpresets/libx264-fast.ffpreset
index cac6534e55b542e9a8665ac18fe4f38961c34e66..0fc1f22403f51867885f78fb072f74138927147a 100644 (file)
--- 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 65ec0112e0394680a92b77a43e7d69d1b7eecb8c..cdcbbbf227823a07c15f3a9c58f5b318d0a05418 100644 (file)
--- 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 a32eed3cc5ac3e346ed371104233bf8b09f9177a..3156cd80280fa1f2272386d0ed3afe2d3f7be853 100644 (file)
--- 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 c777eb4e231c39a1e470284e0d43b2638e1fe159..9bcf18ae9ddcf211b64b856895b3616cca065954 100644 (file)
--- 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 ea08d3c00b52a32a2b442dcd03ee2f77bc24c910..b7696b5bcbb1c058e3a9cee2ff758213ae52cac6 100644 (file)
--- 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 8c049c9c9369c10f96334351b664b1bf954821e7..75c387f1625714347a6967b2b7d6547d3e4092ad 100644 (file)
--- 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 558be6c931177fc28eeeef91bf486d4d42131139..116e3343ce84ea06fe1e8cf9a2b369185755bfdb 100644 (file)
--- 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 ff641cf40f1d93369c28281c4e3e5ed48a4d4bbe..0d496f6e29ba113518c55656a466e47e115bbbc3 100644 (file)
--- 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 854f74b2365b3bcb65a5fdefc1d34b4ac40a25d5..672e0cd637a96c75a28d294c88ff0c0b91bf881f 100644 (file)
--- 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 1c429f21ffcc5dd0bb0585aa4e5704bb2a7029a1..a2eda65edf890524537e4ff20657cbf376dd598c 100644 (file)
--- 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 039f1d603c9f6c5c9f3b80f246ca5059515cb21b..3c90ec5d624d4fd09c7b39f17d606aa752ad7855 100644 (file)
--- 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 e4159892d0ca23070993e15a10285f7b3fd2f5f5..2ad0a9cc256ca07458a2ae65669a9133dcac42dd 100644 (file)
--- 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 fae2222da8cd655320c36b06a6641defcfd76455..9f4719f71d5d6478eeafd456c7674ae0bb03a095 100644 (file)
--- 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 fae2222da8cd655320c36b06a6641defcfd76455..9f4719f71d5d6478eeafd456c7674ae0bb03a095 100644 (file)
--- 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 0f3f4d4b4156333ed57f06354b1631db70f85288..dabe0ae14e76a904e3394b5176a7019bebe42c97 100644 (file)
--- 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 89e74e45ca4d7bbe8b5659c654b815f7e02da581..4af64dbe32643ea54f8d362f8f5faf41460882de 100644 (file)
--- 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 f3a412c03ef67d9a4777ff249d766ba9119e8d2f..239ee68cb446151919b014e54d3004e727fa2d71 100644 (file)
--- 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 aa1eb1e9631681e5d642cfa8882e8dbb73f01954..4b5b420c29c00a712bb9c66ceca5e8e1ecb43f76 100644 (file)
--- 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 bcd459930e47902129c5f1a54ee37f39c0138703..fb2ab8c44f24e1ebe8554f2d767890fa8ee6c869 100644 (file)
--- 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 ef06b1d5629ad3b341fc3eb259bd9d009835a91c..55ff9a2b7f92b52e26ec5d351fb6a9f1c24f10dc 100644 (file)
--- 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 b6d208080a68f4d8989834e9353da8ffef10a903..28dc0eb8360e95418acb43b0bcbcfcb51046488b 100644 (file)
--- 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 b6d208080a68f4d8989834e9353da8ffef10a903..28dc0eb8360e95418acb43b0bcbcfcb51046488b 100644 (file)
--- 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 16ca594abe1159d9ea522abfc09c07f1ee6554ed..bfa3d8fad22a06ebd45fa4fdc85f3cd91728d4c4 100644 (file)
--- 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 39eaf3e24bcd9b5675271a157bc7914801bb19a9..ac2332df4473d907fc2eb5e2e7ddcaead82dc619 100644 (file)
--- 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 a0606255d3e67d6f38e137f36968da592f94e044..e07aeb82faee81ec6e1436213bba250dc08b97ea 100644 (file)
--- 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 6e7079bbe012858b1516abf278fe0caef48cecc8..e17c04b20b3d4a083c77a9efe07fe6437bec030d 100644 (file)
--- 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 369ee5d334302d8dee2e641bf8ac65e1096f88bc..ff4cc2dad174dfe19df8212a2a6c0407714c214a 100644 (file)
--- 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},