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.tags/n0.8
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=2 | refs=2 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=2 | refs=2 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
directpred=1 | directpred=1 | ||||
flags2=+fastpskip | flags2=+fastpskip | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
refs=16 | refs=16 | ||||
directpred=1 | directpred=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
directpred=1 | directpred=1 | ||||
flags2=+fastpskip | flags2=+fastpskip | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
refs=2 | refs=2 | ||||
directpred=1 | directpred=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
refs=4 | refs=4 | ||||
directpred=1 | directpred=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
directpred=1 | directpred=1 | ||||
flags2=+fastpskip | flags2=+fastpskip | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=3 | refs=3 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=16 | bf=16 | ||||
refs=16 | refs=16 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=16 | bf=16 | ||||
refs=16 | refs=16 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=5 | refs=5 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=8 | refs=8 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=0 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=0 | b_strategy=0 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=0 | bf=0 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=0 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=0 | b_strategy=0 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=0 | bf=0 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=1 | b_strategy=1 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=3 | bf=3 | ||||
refs=1 | refs=1 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=8 | bf=8 | ||||
refs=16 | refs=16 | ||||
@@ -11,8 +11,8 @@ sc_threshold=40 | |||||
i_qfactor=0.71 | i_qfactor=0.71 | ||||
b_strategy=2 | b_strategy=2 | ||||
qcomp=0.6 | qcomp=0.6 | ||||
qmin=10 | |||||
qmax=51 | |||||
qmin=0 | |||||
qmax=69 | |||||
qdiff=4 | qdiff=4 | ||||
bf=8 | bf=8 | ||||
refs=1 | refs=1 | ||||
@@ -117,8 +117,8 @@ static const AVOption options[]={ | |||||
{"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, | {"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}, | {"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}, | {"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}, | {"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}, | {"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}, | {"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}, | ||||