falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Enable mbtree by default, and remove it from presets 

Originally committed as revision 22671 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Baptiste Coudurier 15 years ago
parent
f3b3b4895a
commit
dac99c359e
29 changed files with 29 additions and 29 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      ffpresets/libx264-baseline.ffpreset
  2. +1
    -1
      ffpresets/libx264-default.ffpreset
  3. +1
    -1
      ffpresets/libx264-fast.ffpreset
  4. +1
    -1
      ffpresets/libx264-fast_firstpass.ffpreset
  5. +1
    -1
      ffpresets/libx264-fastfirstpass.ffpreset
  6. +1
    -1
      ffpresets/libx264-hq.ffpreset
  7. +1
    -1
      ffpresets/libx264-ipod320.ffpreset
  8. +1
    -1
      ffpresets/libx264-ipod640.ffpreset
  9. +1
    -1
      ffpresets/libx264-lossless_fast.ffpreset
  10. +1
    -1
      ffpresets/libx264-lossless_max.ffpreset
  11. +1
    -1
      ffpresets/libx264-lossless_medium.ffpreset
  12. +1
    -1
      ffpresets/libx264-lossless_slow.ffpreset
  13. +1
    -1
      ffpresets/libx264-lossless_slower.ffpreset
  14. +1
    -1
      ffpresets/libx264-lossless_ultrafast.ffpreset
  15. +1
    -1
      ffpresets/libx264-main.ffpreset
  16. +1
    -1
      ffpresets/libx264-max.ffpreset
  17. +1
    -1
      ffpresets/libx264-medium.ffpreset
  18. +1
    -1
      ffpresets/libx264-medium_firstpass.ffpreset
  19. +1
    -1
      ffpresets/libx264-normal.ffpreset
  20. +1
    -1
      ffpresets/libx264-placebo.ffpreset
  21. +1
    -1
      ffpresets/libx264-placebo_firstpass.ffpreset
  22. +1
    -1
      ffpresets/libx264-slow.ffpreset
  23. +1
    -1
      ffpresets/libx264-slow_firstpass.ffpreset
  24. +1
    -1
      ffpresets/libx264-slower.ffpreset
  25. +1
    -1
      ffpresets/libx264-slower_firstpass.ffpreset
  26. +1
    -1
      ffpresets/libx264-slowfirstpass.ffpreset
  27. +1
    -1
      ffpresets/libx264-veryslow.ffpreset
  28. +1
    -1
      ffpresets/libx264-veryslow_firstpass.ffpreset
  29. +1
    -1
      libavcodec/options.c

+ 1
- 1
ffpresets/libx264-baseline.ffpreset View File

@@ -1,4 +1,4 @@
coder=0 coder=0
bf=0 bf=0
flags2=-wpred-dct8x8+mbtree
flags2=-wpred-dct8x8
wpredp=0 wpredp=0

+ 1
- 1
ffpresets/libx264-default.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-fast.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-fast_firstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-fastfirstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-hq.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-ipod320.ffpreset View File

@@ -1,6 +1,6 @@
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


+ 1
- 1
ffpresets/libx264-ipod640.ffpreset View File

@@ -1,7 +1,7 @@
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


+ 1
- 1
ffpresets/libx264-lossless_fast.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-lossless_max.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-lossless_medium.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-lossless_slow.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-lossless_slower.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-lossless_ultrafast.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-main.ffpreset View File

@@ -1 +1 @@
flags2=-dct8x8+mbtree
flags2=-dct8x8

+ 1
- 1
ffpresets/libx264-max.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-medium.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-medium_firstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-normal.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-placebo.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-placebo_firstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-slow.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-slow_firstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-slower.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-slower_firstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-slowfirstpass.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-veryslow.ffpreset View File

@@ -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

+ 1
- 1
ffpresets/libx264-veryslow_firstpass.ffpreset View File

@@ -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

+ 1
- 1
libavcodec/options.c View File

@@ -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"},


Write Preview
Loading…
Cancel
Save