From 03354862cbadbbd0ee6871c7c8b0d233415fc957 Mon Sep 17 00:00:00 2001 From: Jason Garrett-Glaser <darkshikari@gmail.com> Date: Mon, 14 Sep 2009 09:59:32 +0000 Subject: [PATCH] Update preset files to jive somewhat better with more recent x264 API. Originally committed as revision 19837 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffpresets/libx264-default.ffpreset | 7 +++++-- ffpresets/libx264-fastfirstpass.ffpreset | 2 +- ffpresets/libx264-hq.ffpreset | 4 ++-- ffpresets/libx264-max.ffpreset | 8 ++++---- ffpresets/libx264-normal.ffpreset | 4 ++-- ffpresets/libx264-slowfirstpass.ffpreset | 4 ++-- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ffpresets/libx264-default.ffpreset b/ffpresets/libx264-default.ffpreset index ec20174c200..1377530e78e 100644 --- a/ffpresets/libx264-default.ffpreset +++ b/ffpresets/libx264-default.ffpreset @@ -3,7 +3,7 @@ flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex -subq=6 +subq=7 me_range=16 g=250 keyint_min=25 @@ -14,5 +14,8 @@ qcomp=0.6 qmin=10 qmax=51 qdiff=4 +bf=3 +refs=3 directpred=1 -flags2=+fastpskip +trellis=1 +flags2=+mixed_refs+wpred+dct8x8+fastpskip diff --git a/ffpresets/libx264-fastfirstpass.ffpreset b/ffpresets/libx264-fastfirstpass.ffpreset index aaad4615d0b..20aecf1c834 100644 --- a/ffpresets/libx264-fastfirstpass.ffpreset +++ b/ffpresets/libx264-fastfirstpass.ffpreset @@ -14,7 +14,7 @@ qcomp=0.6 qmin=10 qmax=51 qdiff=4 -bf=4 +bf=3 refs=1 directpred=3 trellis=0 diff --git a/ffpresets/libx264-hq.ffpreset b/ffpresets/libx264-hq.ffpreset index cdf67eb0675..32b64f1799e 100644 --- a/ffpresets/libx264-hq.ffpreset +++ b/ffpresets/libx264-hq.ffpreset @@ -14,8 +14,8 @@ qcomp=0.6 qmin=10 qmax=51 qdiff=4 -bf=4 +bf=3 refs=4 directpred=3 trellis=1 -flags2=+bpyramid+wpred+mixed_refs+dct8x8+fastpskip +flags2=+wpred+mixed_refs+dct8x8+fastpskip diff --git a/ffpresets/libx264-max.ffpreset b/ffpresets/libx264-max.ffpreset index afdde53469c..fe498bb297d 100644 --- a/ffpresets/libx264-max.ffpreset +++ b/ffpresets/libx264-max.ffpreset @@ -3,8 +3,8 @@ flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 me_method=tesa -subq=9 -me_range=32 +subq=10 +me_range=24 g=250 keyint_min=25 sc_threshold=40 @@ -14,8 +14,8 @@ qcomp=0.6 qmin=10 qmax=51 qdiff=4 -bf=4 +bf=3 refs=16 directpred=3 trellis=2 -flags2=+bpyramid+wpred+mixed_refs+dct8x8-fastpskip +flags2=+wpred+mixed_refs+dct8x8-fastpskip diff --git a/ffpresets/libx264-normal.ffpreset b/ffpresets/libx264-normal.ffpreset index 99ac2e319af..c0a6c8ec1e6 100644 --- a/ffpresets/libx264-normal.ffpreset +++ b/ffpresets/libx264-normal.ffpreset @@ -14,8 +14,8 @@ qcomp=0.6 qmin=10 qmax=51 qdiff=4 -bf=4 +bf=3 refs=2 directpred=3 trellis=0 -flags2=+bpyramid+wpred+dct8x8+fastpskip +flags2=+wpred+dct8x8+fastpskip diff --git a/ffpresets/libx264-slowfirstpass.ffpreset b/ffpresets/libx264-slowfirstpass.ffpreset index 7358d446d23..280c336dc98 100644 --- a/ffpresets/libx264-slowfirstpass.ffpreset +++ b/ffpresets/libx264-slowfirstpass.ffpreset @@ -14,8 +14,8 @@ qcomp=0.6 qmin=10 qmax=51 qdiff=4 -bf=4 +bf=3 refs=1 directpred=3 trellis=0 -flags2=+bpyramid+wpred+dct8x8+fastpskip +flags2=+wpred+dct8x8+fastpskip -- GitLab