LinGui: change how x264 options are handled

[handbrake-jp/handbrake-jp-git.git] / gtk / src / standard_presets

diff --git a/gtk/src/standard_presets b/gtk/src/standard_presets
index ebd7cce..68e03bd 100755 (executable)
--- a/gtk/src/standard_presets
+++ b/gtk/src/standard_presets
@@ -3,18 +3,7 @@ preset_description=HandBrake's settings for the Microsoft Xbox 360.
 container=mp4
 chapter_markers=disable
 video_codec=x264
-x264_refs=2
-x264_mixed_refs=enable
-x264_bframes=3
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_direct=auto
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=5
-x264_analyse=all
-x264_no_fast_pskip=enable
-x264_options=level=40:filter=-2,-1
+x264_options=level=40:ref=2:mixed-refs:bframes=3:bime:weightb:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1
 vquality_type_bitrate=enable
 video_bitrate=2000
 video_target_size=700
@@ -29,6 +18,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=enable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -40,19 +30,7 @@ preset_description=HandBrake's settings for cartoons, anime, and CGI.
 container=mkv
 chapter_markers=enable
 video_codec=x264
-x264_refs=5
-x264_mixed_refs=enable
-x264_bframes=6
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_direct=auto
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=5
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
-x264_options=nr=150:filter=2,2
+x264_options=ref=5:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2
 vquality_type_bitrate=enable
 video_bitrate=1000
 video_target_size=700
@@ -68,6 +46,7 @@ keep_aspect=enable
 deinterlace=slower
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -80,13 +59,7 @@ container=m4v
 large_mp4=enable
 chapter_markers=enable
 video_codec=x264
-x264_refs=1
-x264_bframes=3
-x264_me=umh
-x264_subme=5
-x264_trellis=fmb
-x264_no_fast_pskip=enable
-x264_cabac=disable
+x264_options=bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0
 vquality_type_bitrate=enable
 video_bitrate=2500
 video_target_size=700
@@ -101,6 +74,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -113,22 +87,7 @@ preset_description=HandBrake's settings maxed out for slowest encoding and highe
 container=mkv
 chapter_markers=enable
 video_codec=x264
-x264_refs=16
-x264_mixed_refs=enable
-x264_bframes=16
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_brdo=enable
-x264_direct=auto
-x264_bpyramid=enable
-x264_me=esa
-x264_merange=64
-x264_subme=7
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
-x264_no_dct_decimate=enable
-x264_options=filter=-2,-1
+x264_options=ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1
 vquality_type_bitrate=enable
 video_bitrate=1800
 video_target_size=700
@@ -144,6 +103,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=ac3
@@ -170,6 +130,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -181,19 +142,7 @@ preset_description=HandBrake's preset for people without a lot of money to waste
 container=mp4
 chapter_markers=enable
 video_codec=x264
-x264_refs=3
-x264_mixed_refs=enable
-x264_bframes=16
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_brdo=enable
-x264_bpyramid=enable
-x264_direct=auto
-x264_me=umh
-x264_subme=6
-x264_trellis=fmb
-x264_analyse=all
-x264_no_fast_pskip=enable
+x264_options=ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip
 vquality_type_target=enable
 video_bitrate=1600
 video_target_size=695
@@ -210,6 +159,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -235,6 +185,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -246,17 +197,7 @@ preset_description=HandBrake's preset for consistently excellent quality in one
 container=mkv
 chapter_markers=enable
 video_codec=x264
-x264_refs=3
-x264_mixed_refs=enable
-x264_bframes=3
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_brdo=enable
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=6
-x264_analyse=all
-x264_options=filter=-2,-1
+x264_options=ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh
 vquality_type_constant=enable
 video_bitrate=2000
 video_target_size=700
@@ -271,6 +212,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=ac3
@@ -282,18 +224,7 @@ preset_description=HandBrake's preset for true high profile x264 quality. A good
 container=mkv
 chapter_markers=enable
 video_codec=x264
-x264_refs=5
-x264_mixed_refs=enable
-x264_bframes=3
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_brdo=enable
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=7
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
+x264_options=ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip
 vquality_type_bitrate=enable
 video_bitrate=1600
 video_target_size=700
@@ -309,6 +240,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=ac3
@@ -320,19 +252,7 @@ preset_description=HandBrake's preset for feature films.
 container=mkv
 chapter_markers=enable
 video_codec=x264
-x264_refs=3
-x264_mixed_refs=enable
-x264_bframes=6
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_brdo=enable
-x264_direct=auto
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=7
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
+x264_options=ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip
 vquality_type_bitrate=enable
 video_bitrate=1800
 video_target_size=700
@@ -348,6 +268,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=ac3
@@ -360,14 +281,7 @@ container=mp4
 ipod_file=enable
 chapter_markers=enable
 video_codec=x264
-x264_refs=1
-x264_me=umh
-x264_subme=6
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
-x264_cabac=disable
-x264_options=level=30
+x264_options=level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1
 vquality_type_bitrate=enable
 video_bitrate=960
 video_target_size=700
@@ -383,6 +297,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -395,14 +310,7 @@ container=mp4
 ipod_file=enable
 chapter_markers=enable
 video_codec=x264
-x264_refs=1
-x264_me=umh
-x264_subme=6
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
-x264_cabac=disable
-x264_options=level=30:vbv-maxrate=1500:vbv-bufsize=2000
+x264_options=level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1
 vquality_type_bitrate=enable
 video_bitrate=1500
 video_target_size=700
@@ -418,6 +326,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -430,13 +339,7 @@ container=mp4
 ipod_file=enable
 chapter_markers=enable
 video_codec=x264
-x264_refs=1
-x264_me=umh
-x264_subme=6
-x264_analyse=all
-x264_no_fast_pskip=enable
-x264_cabac=disable
-x264_options=level=30:vbv-maxrate=768:vbv-bufsize=2000
+x264_options=level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1
 vquality_type_bitrate=enable
 video_bitrate=700
 video_target_size=700
@@ -452,6 +355,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -463,10 +367,7 @@ preset_description=HandBrake's normal, default settings.
 container=mp4
 chapter_markers=enable
 video_codec=x264
-x264_refs=2
-x264_bframes=2
-x264_me=umh
-x264_subme=5
+x264_options=ref=2:bframes=2:subme=5:me=umh
 vquality_type_bitrate=enable
 video_bitrate=1500
 video_target_size=700
@@ -482,6 +383,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -491,7 +393,6 @@ subtitles=disable
 [PSP]
 preset_description=HandBrake's settings for the Sony PlayStation Portable.
 container=mp4
-chapter_markers=enable
 video_codec=ffmpeg
 vquality_type_bitrate=enable
 video_bitrate=1024
@@ -509,6 +410,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -520,9 +422,7 @@ preset_description=HandBrake's settings for the Sony PlayStation 3.
 container=mp4
 chapter_markers=disable
 video_codec=x264
-x264_me=umh
-x264_subme=5
-x264_options=level=41
+x264_options=level=41:subme=5:me=umh
 vquality_type_bitrate=enable
 video_bitrate=2500
 video_target_size=700
@@ -537,6 +437,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -548,18 +449,7 @@ preset_description=HandBrake's high quality settings for use with QuickTime. It
 container=m4v
 chapter_markers=enable
 video_codec=x264
-x264_refs=3
-x264_mixed_refs=enable
-x264_bframes=3
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_direct=auto
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=5
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
+x264_options=ref=3:mixed-refs:bframes=3:bime:weightb:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip
 vquality_type_bitrate=enable
 video_bitrate=2000
 video_target_size=700
@@ -575,6 +465,7 @@ keep_aspect=enable
 deinterlace=none
 detelecine=disable
 denoise=none
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac
@@ -586,20 +477,7 @@ preset_description=HandBrake's settings for video from television.
 container=mkv
 chapter_markers=enable
 video_codec=x264
-x264_refs=3
-x264_mixed_refs=enable
-x264_bframes=6
-x264_bime=enable
-x264_weighted_bframes=enable
-x264_brdo=enable
-x264_direct=auto
-x264_bpyramid=enable
-x264_me=umh
-x264_subme=6
-x264_analyse=all
-x264_trellis=fmb
-x264_no_fast_pskip=enable
-x264_options=nr=150
+x264_options=ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip
 vquality_type_bitrate=enable
 video_bitrate=1300
 video_target_size=700
@@ -615,6 +493,7 @@ keep_aspect=enable
 deinterlace=slower
 detelecine=disable
 denoise=weak
+decomb=disable
 variable_frame_rate=disable
 deblock=disable
 pref_audio_codec1=faac