Enable mbtree by default, and remove it from presets

Originally committed as revision 22671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2024-11-22 09:02:20 +00:00 · 2010-03-25 19:39:06 +00:00 · 2010-03-25 19:39:06 +00:00 · dac99c359e
commit dac99c359e
parent f3b3b4895a
29 changed files with 29 additions and 29 deletions
--- a/ffpresets/libx264-baseline.ffpreset
+++ b/ffpresets/libx264-baseline.ffpreset
@ -1,4 +1,4 @@
 coder=0
 bf=0
-flags2=-wpred-dct8x8+mbtree
+flags2=-wpred-dct8x8
 wpredp=0
--- a/ffpresets/libx264-default.ffpreset
+++ b/ffpresets/libx264-default.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=3
 directpred=1
 trellis=1
-flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-fast.ffpreset
+++ b/ffpresets/libx264-fast.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=2
 directpred=1
 trellis=1
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-fast_firstpass.ffpreset
+++ b/ffpresets/libx264-fast_firstpass.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=1
 trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-fastfirstpass.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=3
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
+flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-hq.ffpreset
+++ b/ffpresets/libx264-hq.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=4
 directpred=3
 trellis=1
-flags2=+wpred+mixed_refs+dct8x8+fastpskip+mbtree
+flags2=+wpred+mixed_refs+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-ipod320.ffpreset
+++ b/ffpresets/libx264-ipod320.ffpreset
@ -1,6 +1,6 @@
 coder=0
 bf=0
-flags2=-wpred-dct8x8+mbtree
+flags2=-wpred-dct8x8
 level=13
 maxrate=768000
 bufsize=3000000
--- a/ffpresets/libx264-ipod640.ffpreset
+++ b/ffpresets/libx264-ipod640.ffpreset
@ -1,7 +1,7 @@
 coder=0
 bf=0
 refs=1
-flags2=-wpred-dct8x8+mbtree
+flags2=-wpred-dct8x8
 level=30
 maxrate=10000000
 bufsize=10000000
--- a/ffpresets/libx264-lossless_fast.ffpreset
+++ b/ffpresets/libx264-lossless_fast.ffpreset
@ -15,6 +15,6 @@ qmin=10
 qmax=51
 qdiff=4
 directpred=1
-flags2=+fastpskip+mbtree
+flags2=+fastpskip
 cqp=0
 wpredp=0
--- a/ffpresets/libx264-lossless_max.ffpreset
+++ b/ffpresets/libx264-lossless_max.ffpreset
@ -16,6 +16,6 @@ qmax=51
 qdiff=4
 refs=16
 directpred=1
-flags2=+mixed_refs+dct8x8+fastpskip+mbtree
+flags2=+mixed_refs+dct8x8+fastpskip
 cqp=0
 wpredp=2
--- a/ffpresets/libx264-lossless_medium.ffpreset
+++ b/ffpresets/libx264-lossless_medium.ffpreset
@ -15,6 +15,6 @@ qmin=10
 qmax=51
 qdiff=4
 directpred=1
-flags2=+fastpskip+mbtree
+flags2=+fastpskip
 cqp=0
 wpredp=2
--- a/ffpresets/libx264-lossless_slow.ffpreset
+++ b/ffpresets/libx264-lossless_slow.ffpreset
@ -16,6 +16,6 @@ qmax=51
 qdiff=4
 refs=2
 directpred=1
-flags2=+dct8x8+fastpskip+mbtree
+flags2=+dct8x8+fastpskip
 cqp=0
 wpredp=2
--- a/ffpresets/libx264-lossless_slower.ffpreset
+++ b/ffpresets/libx264-lossless_slower.ffpreset
@ -16,6 +16,6 @@ qmax=51
 qdiff=4
 refs=4
 directpred=1
-flags2=+mixed_refs+dct8x8+fastpskip+mbtree
+flags2=+mixed_refs+dct8x8+fastpskip
 cqp=0
 wpredp=2
--- a/ffpresets/libx264-lossless_ultrafast.ffpreset
+++ b/ffpresets/libx264-lossless_ultrafast.ffpreset
@ -15,5 +15,5 @@ qmin=10
 qmax=51
 qdiff=4
 directpred=1
-flags2=+fastpskip+mbtree
+flags2=+fastpskip
 cqp=0
--- a/ffpresets/libx264-main.ffpreset
+++ b/ffpresets/libx264-main.ffpreset
@ -1 +1 @@
-flags2=-dct8x8+mbtree
+flags2=-dct8x8
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-max.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=16
 directpred=3
 trellis=2
-flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree
+flags2=+wpred+mixed_refs+dct8x8-fastpskip
 wpredp=2
--- a/ffpresets/libx264-medium.ffpreset
+++ b/ffpresets/libx264-medium.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=3
 directpred=1
 trellis=1
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-medium_firstpass.ffpreset
+++ b/ffpresets/libx264-medium_firstpass.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=1
 trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-normal.ffpreset
+++ b/ffpresets/libx264-normal.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=2
 directpred=3
 trellis=0
-flags2=+wpred+dct8x8+fastpskip+mbtree
+flags2=+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-placebo.ffpreset
+++ b/ffpresets/libx264-placebo.ffpreset
@ -18,5 +18,5 @@ bf=16
 refs=16
 directpred=3
 trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
 wpredp=2
--- a/ffpresets/libx264-placebo_firstpass.ffpreset
+++ b/ffpresets/libx264-placebo_firstpass.ffpreset
@ -18,5 +18,5 @@ bf=16
 refs=16
 directpred=3
 trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
 wpredp=2
--- a/ffpresets/libx264-slow.ffpreset
+++ b/ffpresets/libx264-slow.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=5
 directpred=3
 trellis=1
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-slow_firstpass.ffpreset
+++ b/ffpresets/libx264-slow_firstpass.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=3
 trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-slower.ffpreset
+++ b/ffpresets/libx264-slower.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=8
 directpred=3
 trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-slower_firstpass.ffpreset
+++ b/ffpresets/libx264-slower_firstpass.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=3
 trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-slowfirstpass.ffpreset
+++ b/ffpresets/libx264-slowfirstpass.ffpreset
@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=3
 trellis=0
-flags2=+wpred+dct8x8+fastpskip+mbtree
+flags2=+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-veryslow.ffpreset
+++ b/ffpresets/libx264-veryslow.ffpreset
@ -18,5 +18,5 @@ bf=8
 refs=16
 directpred=3
 trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
 wpredp=2
--- a/ffpresets/libx264-veryslow_firstpass.ffpreset
+++ b/ffpresets/libx264-veryslow_firstpass.ffpreset
@ -18,5 +18,5 @@ bf=8
 refs=1
 directpred=3
 trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
 wpredp=2
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@ -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},
 {"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},
-{"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},
 {"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"},