LinGui: fix a couple problems with the preset translation tool

change my presets file to use the settings generated by the translation tool
also tidy up a display problem with x264 options


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1632 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 483 insertions, 367 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 8a95722d8..df6a17b55 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1458,10 +1458,17 @@ x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 		GtkWidget *textview;
 		textview = GTK_WIDGET(GHB_WIDGET(ud->builder, "x264_options"));
 		ghb_widget_to_setting(ud->settings, textview);
-		const gchar *options;
-		options = ghb_settings_get_string(ud->settings, "x264_options");
+		gchar *options;
+		options = (gchar*)ghb_settings_get_string(ud->settings, "x264_options");
 		ignore_options_update = TRUE;
 		ghb_x264_parse_options(ud, options);
+		if (!GTK_WIDGET_HAS_FOCUS(textview))
+		{
+			options = ghb_sanitize_x264opts(ud, options);
+			ghb_ui_update(ud, "x264_options", options);
+			ghb_x264_parse_options(ud, options);
+			g_free(options);
+		}
 		ignore_options_update = FALSE;
 	}
 }
diff --git a/gtk/src/preset_xlat.c b/gtk/src/preset_xlat.c
index 1c77e7716..e393dbe36 100644
--- a/gtk/src/preset_xlat.c
+++ b/gtk/src/preset_xlat.c
@@ -176,6 +176,18 @@ gchar *audio_mix[2];
 gchar *audio_drc[2];
 
 static void
+add_keys(parse_data_t *pd)
+{
+	// These are needed to override default values that
+	// are not set in the xml file (yet)
+	const gchar *val;
+	// Check to see if its really not set. Future xml versions will set it.
+	val = (const gchar*)g_hash_table_lookup(pd->settings, "decomb");
+	if (!val)
+		g_hash_table_insert(pd->settings, g_strdup("decomb"), g_strdup("0"));
+}
+
+static void
 do_one(gchar **strs, GString *res)
 {
 	gint ii;
@@ -390,6 +402,7 @@ end_element(
 	else if (IS_TAG(name, "dict"))
 	{
 		gint ii;
+		add_keys(pd);
 		do_audio(pd);
 		clear_audio();
 		save_preset(pd);
@@ -482,6 +495,15 @@ text_data(
 				val = "slower";
 			}
 		}
+		else if (IS_KEY(pd->key, "VideoQualitySlider"))
+		{
+			gdouble dval;
+			dval = g_strtod(val, NULL);
+			dval *= 100;
+			if (pd->value) g_free(pd->value);
+			pd->value = g_strdup_printf("%d", (gint)dval);
+			return;
+		}
 		else if (IS_KEY(pd->key, "Audio1Samplerate") ||
 				IS_KEY(pd->key, "Audio2Samplerate"))
 		{
@@ -587,7 +609,7 @@ static xlat_t values[] =
 	{"AAC (faac)", "faac"},
 	{"AC3 Passthru", "ac3"},
 	{"H.264 (x264)", "x264"},
-	{"MPEG-4 (FFmpeg)", "x264"},
+	{"MPEG-4 (FFmpeg)", "ffmpeg"},
 	{"Dolby Pro Logic II", "dpl2"},
 	{"Auto", "auto"},
 	{"MKV file", "mkv"},
diff --git a/gtk/src/standard_presets b/gtk/src/standard_presets
index 7b05a0775..b0056bc76 100755
--- a/gtk/src/standard_presets
+++ b/gtk/src/standard_presets
@@ -1,500 +1,587 @@
-[Xbox 360]
-preset_description=HandBrake's settings for the Microsoft Xbox 360.
-container=mp4
-chapter_markers=disable
-video_codec=x264
-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
-video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=enable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
 
 [Animation]
 preset_description=HandBrake's settings for cartoons, anime, and CGI.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mkv
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=slower
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1000
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=slower
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+x264_options=ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2
 
 [AppleTV]
 preset_description=HandBrake's settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance.
-container=m4v
-large_mp4=enable
-chapter_markers=enable
+subtitle_lang=none
+pref_audio_codec=faac,ac3
+pref_audio_bitrate=160,160
+pref_audio_rate=48,source
+pref_audio_mix=dpl2,none
+pref_audio_drc=1,1
+chapter_markers=1
+container=mp4
+large_mp4=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-x264_options=bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0
-vquality_type_bitrate=enable
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=2500
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac,ac3
-pref_audio_bitrate=160
-subtitles=disable
+x264_options=bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0
 
 [Bedlam]
 preset_description=HandBrake's settings maxed out for slowest encoding and highest quality. Use at your own risk. So slow it's not just insane...it's a trip to the looney bin.
+subtitle_lang=none
+pref_audio_codec=ac3
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=none
+pref_audio_drc=1
+chapter_markers=1
 container=mkv
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1800
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=ac3
-pref_audio_bitrate=160
-subtitles=disable
+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
 
 [Blind]
 preset_description=HandBrake's preset for impatient people who don't care about picture quality.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=128
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
-chapter_markers=enable
+autocrop=1
+autoscale=0
+max_width=512
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=ffmpeg
-vquality_type_bitrate=enable
+two_pass=0
+turbo=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=512
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=disable
-max_width=512
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=128
-subtitles=disable
+x264_options=
 
 [Broke]
 preset_description=HandBrake's preset for people without a lot of money to waste on hard drives. Tries to maximize quality for burning to CDs, so you can party like it's 1999.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=128
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
-chapter_markers=enable
+autocrop=1
+autoscale=0
+max_width=640
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_target=1
 video_bitrate=1600
 video_target_size=695
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=disable
-max_width=640
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=128
-subtitles=disable
+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
 
 [Classic]
 preset_description=HandBrake's traditional, faster, lower-quality settings.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=0
 container=mp4
-chapter_markers=disable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=ffmpeg
-vquality_type_bitrate=enable
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1000
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+x264_options=
 
 [Constant Quality Rate]
 preset_description=HandBrake's preset for consistently excellent quality in one pass, with the downside of entirely unpredictable file sizes and bitrates.
+subtitle_lang=none
+pref_audio_codec=ac3
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=none
+pref_audio_drc=1
+chapter_markers=1
 container=mkv
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=0
+turbo=0
+variable_frame_rate=0
+framerate=source
+vquality_type_constant=1
 video_bitrate=2000
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=ac3
-pref_audio_bitrate=160
-subtitles=disable
+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
 
 [Deux Six Quatre]
 preset_description=HandBrake's preset for true high profile x264 quality. A good balance of quality and speed, based on community standards found in the wild. This preset will give you a much better sense of x264's capabilities than vanilla main profile.
+subtitle_lang=none
+pref_audio_codec=ac3
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=none
+pref_audio_drc=1
+chapter_markers=1
 container=mkv
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1600
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=ac3
-pref_audio_bitrate=160
-subtitles=disable
+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
 
 [Film]
 preset_description=HandBrake's preset for feature films.
+subtitle_lang=none
+pref_audio_codec=ac3
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=none
+pref_audio_drc=1
+chapter_markers=1
 container=mkv
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1800
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=ac3
-pref_audio_bitrate=160
-subtitles=disable
+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
 
 [iPhone / iPod Touch]
 preset_description=HandBrake's settings for the iPhone and iPod Touch.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=128
+pref_audio_rate=48
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
-ipod_file=enable
-chapter_markers=enable
+ipod_file=1
+autocrop=1
+autoscale=0
+max_width=480
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-x264_options=level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1
-vquality_type_bitrate=enable
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=960
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=disable
-max_width=480
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=128
-subtitles=disable
+x264_options=level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1
 
 [iPod High-Rez]
 preset_description=HandBrake's high resolution settings for the iPod. Good video quality, great for viewing on a TV using your iPod
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=48
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
-ipod_file=enable
-chapter_markers=enable
+ipod_file=1
+autocrop=1
+autoscale=0
+max_width=640
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1500
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=disable
-max_width=640
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+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
 
 [iPod Low-Rez]
 preset_description=HandBrake's low resolution settings for the iPod. Optimized for great playback on the iPod screen, with smaller file size.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=48
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
-ipod_file=enable
-chapter_markers=enable
+ipod_file=1
+autocrop=1
+autoscale=0
+max_width=320
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=700
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=disable
-max_width=320
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+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
 
 [Normal]
 preset_description=HandBrake's normal, default settings.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-x264_options=ref=2:bframes=2:subme=5:me=umh
-vquality_type_bitrate=enable
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1500
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+x264_options=ref=2:bframes=2:subme=5:me=umh
 
 [PSP]
 preset_description=HandBrake's settings for the Sony PlayStation Portable.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=128
+pref_audio_rate=48
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mp4
+autocrop=1
+autoscale=0
+max_width=368
+max_height=208
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=ffmpeg
-vquality_type_bitrate=enable
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1024
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=disable
-max_width=368
-max_height=208
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=128
-subtitles=disable
+x264_options=
 
 [PS3]
 preset_description=HandBrake's settings for the Sony PlayStation 3.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=48
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=0
 container=mp4
-chapter_markers=disable
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-x264_options=level=41:subme=5:me=umh
-vquality_type_bitrate=enable
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=2500
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=disable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+x264_options=level=41:subme=5:me=umh
 
 [QuickTime]
 preset_description=HandBrake's high quality settings for use with QuickTime. It can be slow, so use it when the Normal preset doesn't look good enough.
-container=m4v
-chapter_markers=enable
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
+container=mp4
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=2000
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=enable
-keep_aspect=enable
-deinterlace=none
-detelecine=disable
-denoise=none
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
-pref_audio_codec=faac
-pref_audio_bitrate=160
-subtitles=disable
+x264_options=ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip
 
 [Television]
 preset_description=HandBrake's settings for video from television.
+subtitle_lang=none
+pref_audio_codec=faac
+pref_audio_bitrate=160
+pref_audio_rate=source
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=1
 container=mkv
-chapter_markers=enable
+autocrop=1
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=0
+keep_aspect=1
+detelecine=0
+decomb=0
+deinterlace=slower
+denoise=1
+grayscale=0
+deblock=0
 video_codec=x264
-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
+two_pass=1
+turbo=1
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
 video_bitrate=1300
 video_target_size=700
 video_quality=64
-grayscale=disable
-two_pass=enable
-turbo=enable
-autocrop=enable
-autoscale=enable
-round_dimensions=enable
-anamorphic=disable
-keep_aspect=enable
-deinterlace=slower
-detelecine=disable
-denoise=weak
-decomb=disable
-variable_frame_rate=disable
-deblock=disable
+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
+
+[Xbox 360]
+preset_description=HandBrake's settings for the Microsoft Xbox 360.
+subtitle_lang=none
 pref_audio_codec=faac
 pref_audio_bitrate=160
-subtitles=disable
+pref_audio_rate=48
+pref_audio_mix=dpl2
+pref_audio_drc=1
+chapter_markers=0
+container=mp4
+autoscale=1
+max_width=0
+max_height=0
+anamorphic=1
+keep_aspect=0
+detelecine=0
+decomb=0
+deinterlace=none
+denoise=0
+grayscale=0
+deblock=0
+video_codec=x264
+two_pass=0
+variable_frame_rate=0
+framerate=source
+vquality_type_bitrate=1
+video_bitrate=2000
+video_target_size=700
+video_quality=64
+x264_options=level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1