[SCM] libav/experimental: Add presets for all of the x264 presets, including fastfirstpass versions. Not 100% accurate, since not all x264 options have ffmpeg equivalents yet.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d41f1fa6443226f14d479db55c645056ff2076d2
Author: Lou Logan <lou at fakeoutdoorsman.com>
Date:   Tue Mar 2 03:19:12 2010 +0000

    Add presets for all of the x264 presets, including fastfirstpass versions.
    Not 100% accurate, since not all x264 options have ffmpeg equivalents yet.
    
    Patch by Lou Logan.
    
    Originally committed as revision 22144 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-fast.ffpreset
similarity index 76%
copy from ffpresets/libx264-default.ffpreset
copy to ffpresets/libx264-fast.ffpreset
index a10c633..8040724 100644
--- a/ffpresets/libx264-default.ffpreset
+++ b/ffpresets/libx264-fast.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
 cmp=+chroma
 partitions=+parti8x8+parti4x4+partp8x8+partb8x8
 me_method=hex
-subq=7
+subq=6
 me_range=16
 g=250
 keyint_min=25
@@ -15,8 +15,8 @@ qmin=10
 qmax=51
 qdiff=4
 bf=3
-refs=3
+refs=2
 directpred=1
 trellis=1
-flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fast_firstpass.ffpreset
similarity index 60%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-fast_firstpass.ffpreset
index 7cf6faa..f0fb083 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-fast_firstpass.ffpreset
@@ -1,7 +1,7 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
 subq=2
 me_range=16
@@ -16,7 +16,7 @@ qmax=51
 qdiff=4
 bf=3
 refs=1
-directpred=3
+directpred=1
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-faster.ffpreset
similarity index 74%
copy from ffpresets/libx264-default.ffpreset
copy to ffpresets/libx264-faster.ffpreset
index a10c633..57771f6 100644
--- a/ffpresets/libx264-default.ffpreset
+++ b/ffpresets/libx264-faster.ffpreset
@@ -3,7 +3,7 @@ flags=+loop
 cmp=+chroma
 partitions=+parti8x8+parti4x4+partp8x8+partb8x8
 me_method=hex
-subq=7
+subq=4
 me_range=16
 g=250
 keyint_min=25
@@ -15,8 +15,8 @@ qmin=10
 qmax=51
 qdiff=4
 bf=3
-refs=3
+refs=2
 directpred=1
 trellis=1
-flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree
-wpredp=2
+flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree
+wpredp=1
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-faster_firstpass.ffpreset
similarity index 57%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-faster_firstpass.ffpreset
index 7cf6faa..969fcf9 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-faster_firstpass.ffpreset
@@ -1,7 +1,7 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
 subq=2
 me_range=16
@@ -16,7 +16,7 @@ qmax=51
 qdiff=4
 bf=3
 refs=1
-directpred=3
+directpred=1
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
-wpredp=2
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree
+wpredp=1
diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-medium.ffpreset
similarity index 81%
copy from ffpresets/libx264-default.ffpreset
copy to ffpresets/libx264-medium.ffpreset
index a10c633..245f4d2 100644
--- a/ffpresets/libx264-default.ffpreset
+++ b/ffpresets/libx264-medium.ffpreset
@@ -18,5 +18,5 @@ bf=3
 refs=3
 directpred=1
 trellis=1
-flags2=+mixed_refs+wpred+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-medium_firstpass.ffpreset
similarity index 60%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-medium_firstpass.ffpreset
index 7cf6faa..f0fb083 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-medium_firstpass.ffpreset
@@ -1,7 +1,7 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
 subq=2
 me_range=16
@@ -16,7 +16,7 @@ qmax=51
 qdiff=4
 bf=3
 refs=1
-directpred=3
+directpred=1
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-placebo.ffpreset
similarity index 80%
copy from ffpresets/libx264-max.ffpreset
copy to ffpresets/libx264-placebo.ffpreset
index 4289ab5..447f3d8 100644
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-placebo.ffpreset
@@ -14,9 +14,9 @@ qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=3
+bf=16
 refs=16
 directpred=3
 trellis=2
-flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-placebo_firstpass.ffpreset
similarity index 80%
copy from ffpresets/libx264-max.ffpreset
copy to ffpresets/libx264-placebo_firstpass.ffpreset
index 4289ab5..447f3d8 100644
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-placebo_firstpass.ffpreset
@@ -14,9 +14,9 @@ qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=3
+bf=16
 refs=16
 directpred=3
 trellis=2
-flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-slow.ffpreset
similarity index 79%
copy from ffpresets/libx264-hq.ffpreset
copy to ffpresets/libx264-slow.ffpreset
index eafc52e..955495a 100644
--- a/ffpresets/libx264-hq.ffpreset
+++ b/ffpresets/libx264-slow.ffpreset
@@ -15,8 +15,8 @@ qmin=10
 qmax=51
 qdiff=4
 bf=3
-refs=4
+refs=5
 directpred=3
 trellis=1
-flags2=+wpred+mixed_refs+dct8x8+fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-slow_firstpass.ffpreset
similarity index 60%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-slow_firstpass.ffpreset
index 7cf6faa..e043a66 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-slow_firstpass.ffpreset
@@ -1,7 +1,7 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
 subq=2
 me_range=16
@@ -9,7 +9,7 @@ g=250
 keyint_min=25
 sc_threshold=40
 i_qfactor=0.71
-b_strategy=1
+b_strategy=2
 qcomp=0.6
 qmin=10
 qmax=51
@@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=3
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-slower.ffpreset
similarity index 69%
copy from ffpresets/libx264-max.ffpreset
copy to ffpresets/libx264-slower.ffpreset
index 4289ab5..4c487cc 100644
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-slower.ffpreset
@@ -2,9 +2,9 @@ coder=1
 flags=+loop
 cmp=+chroma
 partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
-me_method=tesa
-subq=10
-me_range=24
+me_method=umh
+subq=9
+me_range=16
 g=250
 keyint_min=25
 sc_threshold=40
@@ -15,8 +15,8 @@ qmin=10
 qmax=51
 qdiff=4
 bf=3
-refs=16
+refs=8
 directpred=3
 trellis=2
-flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-slower_firstpass.ffpreset
similarity index 60%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-slower_firstpass.ffpreset
index 7cf6faa..e043a66 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-slower_firstpass.ffpreset
@@ -1,7 +1,7 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
 subq=2
 me_range=16
@@ -9,7 +9,7 @@ g=250
 keyint_min=25
 sc_threshold=40
 i_qfactor=0.71
-b_strategy=1
+b_strategy=2
 qcomp=0.6
 qmin=10
 qmax=51
@@ -18,5 +18,5 @@ bf=3
 refs=1
 directpred=3
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-ultrafast.ffpreset b/ffpresets/libx264-ultrafast.ffpreset
new file mode 100644
index 0000000..98ebfd6
--- /dev/null
+++ b/ffpresets/libx264-ultrafast.ffpreset
@@ -0,0 +1,22 @@
+coder=0
+flags=-loop
+cmp=+chroma
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
+me_method=dia
+subq=0
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=0
+i_qfactor=0.71
+b_strategy=0
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=0
+refs=1
+directpred=1
+trellis=0
+flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree
+wpredp=0
diff --git a/ffpresets/libx264-ultrafast_firstpass.ffpreset b/ffpresets/libx264-ultrafast_firstpass.ffpreset
new file mode 100644
index 0000000..98ebfd6
--- /dev/null
+++ b/ffpresets/libx264-ultrafast_firstpass.ffpreset
@@ -0,0 +1,22 @@
+coder=0
+flags=-loop
+cmp=+chroma
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
+me_method=dia
+subq=0
+me_range=16
+g=250
+keyint_min=25
+sc_threshold=0
+i_qfactor=0.71
+b_strategy=0
+qcomp=0.6
+qmin=10
+qmax=51
+qdiff=4
+bf=0
+refs=1
+directpred=1
+trellis=0
+flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree
+wpredp=0
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-veryfast.ffpreset
similarity index 55%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-veryfast.ffpreset
index 7cf6faa..e2cb959 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-veryfast.ffpreset
@@ -1,9 +1,9 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=+parti8x8+parti4x4-partp8x8-partb8x8
 me_method=dia
-subq=2
+subq=1
 me_range=16
 g=250
 keyint_min=25
@@ -16,7 +16,7 @@ qmax=51
 qdiff=4
 bf=3
 refs=1
-directpred=3
+directpred=1
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
-wpredp=2
+flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree
+wpredp=0
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-veryfast_firstpass.ffpreset
similarity index 55%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-veryfast_firstpass.ffpreset
index 7cf6faa..5f44bea 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-veryfast_firstpass.ffpreset
@@ -1,9 +1,9 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
-subq=2
+subq=1
 me_range=16
 g=250
 keyint_min=25
@@ -16,7 +16,7 @@ qmax=51
 qdiff=4
 bf=3
 refs=1
-directpred=3
+directpred=1
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
-wpredp=2
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree
+wpredp=0
diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-veryslow.ffpreset
similarity index 76%
copy from ffpresets/libx264-max.ffpreset
copy to ffpresets/libx264-veryslow.ffpreset
index 4289ab5..0863299 100644
--- a/ffpresets/libx264-max.ffpreset
+++ b/ffpresets/libx264-veryslow.ffpreset
@@ -2,7 +2,7 @@ coder=1
 flags=+loop
 cmp=+chroma
 partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
-me_method=tesa
+me_method=umh
 subq=10
 me_range=24
 g=250
@@ -14,9 +14,9 @@ qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=3
+bf=8
 refs=16
 directpred=3
 trellis=2
-flags2=+wpred+mixed_refs+dct8x8-fastpskip+mbtree
+flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip+mbtree
 wpredp=2
diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-veryslow_firstpass.ffpreset
similarity index 54%
copy from ffpresets/libx264-fastfirstpass.ffpreset
copy to ffpresets/libx264-veryslow_firstpass.ffpreset
index 7cf6faa..a000487 100644
--- a/ffpresets/libx264-fastfirstpass.ffpreset
+++ b/ffpresets/libx264-veryslow_firstpass.ffpreset
@@ -1,22 +1,22 @@
 coder=1
 flags=+loop
 cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
+partitions=-parti8x8-parti4x4-partp8x8-partb8x8
 me_method=dia
 subq=2
-me_range=16
+me_range=24
 g=250
 keyint_min=25
 sc_threshold=40
 i_qfactor=0.71
-b_strategy=1
+b_strategy=2
 qcomp=0.6
 qmin=10
 qmax=51
 qdiff=4
-bf=3
+bf=8
 refs=1
 directpred=3
 trellis=0
-flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip+mbtree
+flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip+mbtree
 wpredp=2

-- 
Libav/FFmpeg packaging