Skip to content

F
ffmpeg-mt
Commit 16aef6d5 authored by bcoudurier's avatar bcoudurier
Browse files
Options

Enable mbtree by default, and remove it from presets 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22671 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 501df494
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
ffpresets/libx264-baseline.ffpreset
View file @ 16aef6d5
coder=0 coder=0
bf=0 bf=0
flags2=-wpred-dct8x8+mbtree flags2=-wpred-dct8x8
wpredp=0 wpredp=0
ffpresets/libx264-default.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=3 refs=3
directpred=1 directpred=1
trellis=1 trellis=1
flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree flags2=+mixed_refs+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-fast.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=2 refs=2
directpred=1 directpred=1
trellis=1 trellis=1
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-fast_firstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=1 refs=1
directpred=1 directpred=1
trellis=0 trellis=0
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-fastfirstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=1 refs=1
directpred=3 directpred=3
trellis=0 trellis=0
flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-hq.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=4 refs=4
directpred=3 directpred=3
trellis=1 trellis=1
flags2=+wpred+mixed_refs+dct8x8+fastpskip+mbtree flags2=+wpred+mixed_refs+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-ipod320.ffpreset
View file @ 16aef6d5
coder=0 coder=0
bf=0 bf=0
flags2=-wpred-dct8x8+mbtree flags2=-wpred-dct8x8
level=13 level=13
maxrate=768000 maxrate=768000
bufsize=3000000 bufsize=3000000
......
ffpresets/libx264-ipod640.ffpreset
View file @ 16aef6d5
coder=0 coder=0
bf=0 bf=0
refs=1 refs=1
flags2=-wpred-dct8x8+mbtree flags2=-wpred-dct8x8
level=30 level=30
maxrate=10000000 maxrate=10000000
bufsize=10000000 bufsize=10000000
......
ffpresets/libx264-lossless_fast.ffpreset
View file @ 16aef6d5
...@@ -15,6 +15,6 @@ qmin=10 ...@@ -15,6 +15,6 @@ qmin=10
qmax=51 qmax=51
qdiff=4 qdiff=4
directpred=1 directpred=1
flags2=+fastpskip+mbtree flags2=+fastpskip
cqp=0 cqp=0
wpredp=0 wpredp=0
ffpresets/libx264-lossless_max.ffpreset
View file @ 16aef6d5
...@@ -16,6 +16,6 @@ qmax=51 ...@@ -16,6 +16,6 @@ qmax=51
qdiff=4 qdiff=4
refs=16 refs=16
directpred=1 directpred=1
flags2=+mixed_refs+dct8x8+fastpskip+mbtree flags2=+mixed_refs+dct8x8+fastpskip
cqp=0 cqp=0
wpredp=2 wpredp=2
ffpresets/libx264-lossless_medium.ffpreset
View file @ 16aef6d5
...@@ -15,6 +15,6 @@ qmin=10 ...@@ -15,6 +15,6 @@ qmin=10
qmax=51 qmax=51
qdiff=4 qdiff=4
directpred=1 directpred=1
flags2=+fastpskip+mbtree flags2=+fastpskip
cqp=0 cqp=0
wpredp=2 wpredp=2
ffpresets/libx264-lossless_slow.ffpreset
View file @ 16aef6d5
...@@ -16,6 +16,6 @@ qmax=51 ...@@ -16,6 +16,6 @@ qmax=51
qdiff=4 qdiff=4
refs=2 refs=2
directpred=1 directpred=1
flags2=+dct8x8+fastpskip+mbtree flags2=+dct8x8+fastpskip
cqp=0 cqp=0
wpredp=2 wpredp=2
ffpresets/libx264-lossless_slower.ffpreset
View file @ 16aef6d5
...@@ -16,6 +16,6 @@ qmax=51 ...@@ -16,6 +16,6 @@ qmax=51
qdiff=4 qdiff=4
refs=4 refs=4
directpred=1 directpred=1
flags2=+mixed_refs+dct8x8+fastpskip+mbtree flags2=+mixed_refs+dct8x8+fastpskip
cqp=0 cqp=0
wpredp=2 wpredp=2
ffpresets/libx264-lossless_ultrafast.ffpreset
View file @ 16aef6d5
...@@ -15,5 +15,5 @@ qmin=10 ...@@ -15,5 +15,5 @@ qmin=10
qmax=51 qmax=51
qdiff=4 qdiff=4
directpred=1 directpred=1
flags2=+fastpskip+mbtree flags2=+fastpskip
cqp=0 cqp=0
ffpresets/libx264-main.ffpreset
View file @ 16aef6d5
flags2=-dct8x8+mbtree flags2=-dct8x8
ffpresets/libx264-max.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=16 refs=16
directpred=3 directpred=3
trellis=2 trellis=2
flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree flags2=+wpred+mixed_refs+dct8x8-fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-medium.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=3 refs=3
directpred=1 directpred=1
trellis=1 trellis=1
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-medium_firstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=1 refs=1
directpred=1 directpred=1
trellis=0 trellis=0
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-normal.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=2 refs=2
directpred=3 directpred=3
trellis=0 trellis=0
flags2=+wpred+dct8x8+fastpskip+mbtree flags2=+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-placebo.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=16 ...@@ -18,5 +18,5 @@ bf=16
refs=16 refs=16
directpred=3 directpred=3
trellis=2 trellis=2
flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-placebo_firstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=16 ...@@ -18,5 +18,5 @@ bf=16
refs=16 refs=16
directpred=3 directpred=3
trellis=2 trellis=2
flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-slow.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=5 refs=5
directpred=3 directpred=3
trellis=1 trellis=1
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-slow_firstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=1 refs=1
directpred=3 directpred=3
trellis=0 trellis=0
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-slower.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=8 refs=8
directpred=3 directpred=3
trellis=2 trellis=2
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-slower_firstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=1 refs=1
directpred=3 directpred=3
trellis=0 trellis=0
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-slowfirstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=3 ...@@ -18,5 +18,5 @@ bf=3
refs=1 refs=1
directpred=3 directpred=3
trellis=0 trellis=0
flags2=+wpred+dct8x8+fastpskip+mbtree flags2=+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-veryslow.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=8 ...@@ -18,5 +18,5 @@ bf=8
refs=16 refs=16
directpred=3 directpred=3
trellis=2 trellis=2
flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
wpredp=2 wpredp=2
ffpresets/libx264-veryslow_firstpass.ffpreset
View file @ 16aef6d5
...@@ -18,5 +18,5 @@ bf=8 ...@@ -18,5 +18,5 @@ bf=8
refs=1 refs=1
directpred=3 directpred=3
trellis=0 trellis=0
flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
wpredp=2 wpredp=2
libavcodec/options.c
View file @ 16aef6d5
...@@ -307,7 +307,7 @@ static const AVOption options[]={ ...@@ -307,7 +307,7 @@ static const AVOption options[]={
{"nr", "noise reduction", OFFSET(noise_reduction), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"nr", "noise reduction", OFFSET(noise_reduction), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
{"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
{"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR|CODEC_FLAG2_PSY, 0, UINT_MAX, V|A|E|D, "flags2"}, {"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR|CODEC_FLAG2_PSY|CODEC_FLAG2_MBTREE, 0, UINT_MAX, V|A|E|D, "flags2"},
{"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
{"antialias", "MP3 antialias algorithm", OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"}, {"antialias", "MP3 antialias algorithm", OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"},
{"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"}, {"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment