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 c7ac200d15e3240972d269df768068f0e3bb9c2f)

Jason Garrett-Glaser committed 15 years ago

Commit a97b9321 parent 2c855ce27 files · +54 −54Browse files

Unified · Split

27 files

ffpresets/libx264-fast.ffpreset +2 −2
ffpresets/libx264-fast_firstpass.ffpreset +2 −2
ffpresets/libx264-faster.ffpreset +2 −2
ffpresets/libx264-faster_firstpass.ffpreset +2 −2
ffpresets/libx264-lossless_fast.ffpreset +2 −2
ffpresets/libx264-lossless_max.ffpreset +2 −2
ffpresets/libx264-lossless_medium.ffpreset +2 −2
ffpresets/libx264-lossless_slow.ffpreset +2 −2
ffpresets/libx264-lossless_slower.ffpreset +2 −2
ffpresets/libx264-lossless_ultrafast.ffpreset +2 −2
ffpresets/libx264-medium.ffpreset +2 −2
ffpresets/libx264-medium_firstpass.ffpreset +2 −2
ffpresets/libx264-placebo.ffpreset +2 −2
ffpresets/libx264-placebo_firstpass.ffpreset +2 −2
ffpresets/libx264-slow.ffpreset +2 −2
ffpresets/libx264-slow_firstpass.ffpreset +2 −2
ffpresets/libx264-slower.ffpreset +2 −2
ffpresets/libx264-slower_firstpass.ffpreset +2 −2
ffpresets/libx264-superfast.ffpreset +2 −2
ffpresets/libx264-superfast_firstpass.ffpreset +2 −2
ffpresets/libx264-ultrafast.ffpreset +2 −2
ffpresets/libx264-ultrafast_firstpass.ffpreset +2 −2
ffpresets/libx264-veryfast.ffpreset +2 −2
ffpresets/libx264-veryfast_firstpass.ffpreset +2 −2
ffpresets/libx264-veryslow.ffpreset +2 −2
ffpresets/libx264-veryslow_firstpass.ffpreset +2 −2
libavcodec/options.c +2 −2

ffpresets/libx264-fast.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=2

ffpresets/libx264-fast_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-faster.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=2

ffpresets/libx264-faster_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-lossless_fast.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	directpred=1
18	18	flags2=+fastpskip

ffpresets/libx264-lossless_max.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	refs=16
18	18	directpred=1

ffpresets/libx264-lossless_medium.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	directpred=1
18	18	flags2=+fastpskip

ffpresets/libx264-lossless_slow.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	refs=2
18	18	directpred=1

ffpresets/libx264-lossless_slower.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	refs=4
18	18	directpred=1

ffpresets/libx264-lossless_ultrafast.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	directpred=1
18	18	flags2=+fastpskip

ffpresets/libx264-medium.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=3

ffpresets/libx264-medium_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-placebo.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=16
18	18	refs=16

ffpresets/libx264-placebo_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=16
18	18	refs=16

ffpresets/libx264-slow.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=5

ffpresets/libx264-slow_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-slower.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=8

ffpresets/libx264-slower_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-superfast.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-superfast_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-ultrafast.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=0 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=0
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=0
18	18	refs=1

ffpresets/libx264-ultrafast_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=0 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=0
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=0
18	18	refs=1

ffpresets/libx264-veryfast.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-veryfast_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=1
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=3
18	18	refs=1

ffpresets/libx264-veryslow.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=8
18	18	refs=16

ffpresets/libx264-veryslow_firstpass.ffpreset+2−2

@@ -11,8 +11,8 @@ sc_threshold=40 · 10 unmodified lines
11	11	i_qfactor=0.71
12	12	b_strategy=2
13	13	qcomp=0.6
14		−qmin=10
15		−qmax=51
	14	+qmin=0
	15	+qmax=69
16	16	qdiff=4
17	17	bf=8
18	18	refs=1

libavcodec/options.c+2−2

@@ -117,8 +117,8 @@ static const AVOption options[]={ · 116 unmodified lines
117	117	{"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
118	118	{"qcomp", "video quantizer scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, 0.5, -FLT_MAX, FLT_MAX, V\|E},
119	119	{"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, 0.5, 0, FLT_MAX, V\|E},
120		−{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 63, V\|E},
121		−{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 63, V\|E},
	120	+{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 69, V\|E},
	121	+{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 69, V\|E},
122	122	{"qdiff", "max difference between the quantizer scale (VBR)", OFFSET(max_qdiff), FF_OPT_TYPE_INT, 3, INT_MIN, INT_MAX, V\|E},
123	123	{"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, 0, FF_MAX_B_FRAMES, V\|E},
124	124	{"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},

Update qmin/qmax values for libx264 presets

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code