X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fx264handler.c;h=61adaa0b020822e82d1f9fe0a8d07945415e4869;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=2b6b8830feb853b9055b42c75012e0ff662df2c1;hpb=d265084c7c550b700a4d7a89dab6fe655891c2c6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 2b6b8830..61adaa0b 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -20,6 +20,7 @@
 #include "hb-backend.h"
 #include "x264handler.h"
 
+gint ghb_lookup_bframes(const gchar *options);
 static void x264_opt_update(signal_user_data_t *ud, GtkWidget *widget);
 static gchar* sanitize_x264opts(signal_user_data_t *ud, const gchar *options);
 
@@ -36,7 +37,7 @@ x264_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 		x264_opt_update(ud, widget);
 		ignore_options_update = FALSE;
 	}
-	ghb_check_dependency(ud, widget);
+	ghb_check_dependency(ud, widget, NULL);
 	ghb_clear_presets_selection(ud);
 }
 
@@ -52,7 +53,7 @@ x264_me_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 		x264_opt_update(ud, widget);
 		ignore_options_update = FALSE;
 	}
-	ghb_check_dependency(ud, widget);
+	ghb_check_dependency(ud, widget, NULL);
 	ghb_clear_presets_selection(ud);
 	widget = GHB_WIDGET(ud->builder, "x264_merange");
 	me = ghb_settings_combo_int(ud->settings, "x264_me");
@@ -119,6 +120,9 @@ x264_focus_out_cb(GtkWidget *widget, GdkEventFocus *event,
 
 enum
 {
+	X264_OPT_NONE,
+	X264_OPT_BOOL_NONE,
+	X264_OPT_INT_NONE,
 	X264_OPT_DEBLOCK,
 	X264_OPT_PSY,
 	X264_OPT_INT,
@@ -146,12 +150,14 @@ static gchar *x264_bpyramid_syns[] = {"b-pyramid", "b_pyramid", NULL};
 static gchar *x264_me_syns[] = {"me", NULL};
 static gchar *x264_merange_syns[] = {"merange", "me-range", "me_range", NULL};
 static gchar *x264_subme_syns[] = {"subme", "subq", NULL};
+static gchar *x264_aqmode_syns[] = {"aq-mode", NULL};
 static gchar *x264_analyse_syns[] = {"analyse", "partitions", NULL};
 static gchar *x264_8x8dct_syns[] = {"8x8dct", NULL};
 static gchar *x264_deblock_syns[] = {"deblock", "filter", NULL};
 static gchar *x264_trellis_syns[] = {"trellis", NULL};
 static gchar *x264_pskip_syns[] = {"no-fast-pskip", "no_fast_pskip", NULL};
 static gchar *x264_psy_syns[] = {"psy-rd", "psy_rd", NULL};
+static gchar *x264_mbtree_syns[] = {"mbtree", NULL};
 static gchar *x264_decimate_syns[] = 
 	{"no-dct-decimate", "no_dct_decimate", NULL};
 static gchar *x264_cabac_syns[] = {"cabac", NULL};
@@ -180,6 +186,7 @@ struct x264_opt_map_s x264_opt_map[] =
 	{x264_me_syns, "x264_me", "hex", X264_OPT_COMBO},
 	{x264_merange_syns, "x264_merange", "16", X264_OPT_INT},
 	{x264_subme_syns, "x264_subme", "7", X264_OPT_COMBO},
+	{x264_aqmode_syns, "x264_aqmode", "1", X264_OPT_INT_NONE},
 	{x264_analyse_syns, "x264_analyse", "some", X264_OPT_COMBO},
 	{x264_8x8dct_syns, "x264_8x8dct", "1", X264_OPT_BOOL},
 	{x264_deblock_syns, "x264_deblock_alpha", "0,0", X264_OPT_DEBLOCK},
@@ -190,6 +197,7 @@ struct x264_opt_map_s x264_opt_map[] =
 	{x264_cabac_syns, "x264_cabac", "1", X264_OPT_BOOL},
 	{x264_psy_syns, "x264_psy_rd", "1,0", X264_OPT_PSY},
 	{x264_psy_syns, "x264_psy_trell", "1,0", X264_OPT_PSY},
+	{x264_mbtree_syns, "x264_mbtree", "1", X264_OPT_BOOL_NONE},
 };
 #define X264_OPT_MAP_SIZE (sizeof(x264_opt_map)/sizeof(struct x264_opt_map_s))
 
@@ -217,6 +225,17 @@ x264_update_int(signal_user_data_t *ud, const gchar *name, const gchar *val)
 	ghb_ui_update(ud, name, ghb_int64_value(ival));
 }
 
+static void
+x264_update_int_setting(signal_user_data_t *ud, const gchar *name, const gchar *val)
+{
+	gint ival;
+
+	if (val == NULL) return;
+	ival = g_strtod (val, NULL);
+	ghb_settings_set_value(ud->settings, name, ghb_int64_value(ival));
+	ghb_check_dependency(ud, NULL, name);
+}
+
 static gchar *true_str[] =
 {
 	"true",
@@ -247,6 +266,17 @@ x264_update_bool(signal_user_data_t *ud, const gchar *name, const gchar *val)
 }
 
 static void
+x264_update_bool_setting(signal_user_data_t *ud, const gchar *name, const gchar *val)
+{
+	if (val == NULL)
+		ghb_settings_set_value(ud->settings, name, ghb_boolean_value(1));
+	else
+		ghb_settings_set_value(ud->settings, name, ghb_boolean_value(str_is_true(val)));
+
+	ghb_check_dependency(ud, NULL, name);
+}
+
+static void
 x264_update_combo(signal_user_data_t *ud, const gchar *name, const gchar *val)
 {
 	GtkTreeModel *store;
@@ -416,6 +446,12 @@ ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options)
 					x264_opt_map[jj+1].found = TRUE;
 					x264_update_psy(ud, val);
 					break;
+				case X264_OPT_BOOL_NONE:
+					x264_update_bool_setting(ud, x264_opt_map[jj].name, val);
+					break;
+				case X264_OPT_INT_NONE:
+					x264_update_int_setting(ud, x264_opt_map[jj].name, val);
+					break;
 				}
 				break;
 			}
@@ -445,6 +481,12 @@ ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options)
 			case X264_OPT_PSY:
 				x264_update_psy(ud, val);
 				break;
+			case X264_OPT_BOOL_NONE:
+				x264_update_bool_setting(ud, x264_opt_map[jj].name, val);
+				break;
+			case X264_OPT_INT_NONE:
+				x264_update_int_setting(ud, x264_opt_map[jj].name, val);
+				break;
 			}
 			x264_opt_map[jj].found = TRUE;
 			g_free(val);
@@ -481,7 +523,7 @@ static void
 x264_opt_update(signal_user_data_t *ud, GtkWidget *widget)
 {
 	gint jj;
-	const gchar *name = gtk_widget_get_name(widget);
+	const gchar *name = ghb_get_setting_key(widget);
 	gchar **opt_syns = NULL;
 	const gchar *def_val = NULL;
 	gint type;
@@ -680,7 +722,7 @@ x264_lookup_value(gchar **opts, gchar **opt_syns)
 }
 
 gint
-ghb_lookup_badapt(gchar *options)
+ghb_lookup_badapt(const gchar *options)
 {
 	gint ret = 0;
 	gchar *result;
@@ -701,6 +743,72 @@ ghb_lookup_badapt(gchar *options)
 	return ret;
 }
 
+gint
+ghb_lookup_aqmode(const gchar *options)
+{
+	gint ret = 0;
+	gchar *result;
+	gchar **split;
+	
+	if (options == NULL)
+		options = "";
+
+	split = g_strsplit(options, ":", -1);
+
+	result = x264_lookup_value(split, x264_aqmode_syns);
+	g_strfreev(split);
+	if (result != NULL)
+	{
+		ret = g_strtod(result, NULL);
+		g_free(result);
+	}
+	return ret;
+}
+
+gint
+ghb_lookup_bframes(const gchar *options)
+{
+	gint ret = 0;
+	gchar *result;
+	gchar **split;
+	
+	if (options == NULL)
+		options = "";
+
+	split = g_strsplit(options, ":", -1);
+
+	result = x264_lookup_value(split, x264_bframes_syns);
+	g_strfreev(split);
+	if (result != NULL)
+	{
+		ret = g_strtod(result, NULL);
+		g_free(result);
+	}
+	return ret;
+}
+
+gint
+ghb_lookup_mbtree(const gchar *options)
+{
+	gint ret = ghb_lookup_bframes(options) != 0;
+	gchar *result;
+	gchar **split;
+	
+	if (options == NULL)
+		options = "";
+
+	split = g_strsplit(options, ":", -1);
+
+	result = x264_lookup_value(split, x264_mbtree_syns);
+	g_strfreev(split);
+	if (result != NULL)
+	{
+		ret = g_strtod(result, NULL);
+		g_free(result);
+	}
+	return ret;
+}
+
 // Construct the x264 options string
 // The result is allocated, so someone must free it at some point.
 static gchar*
@@ -716,17 +824,17 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
 	{
 		x264_remove_opt(split, x264_psy_syns);
 	}
+	gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis");
 	if (subme == 10)
 	{
-		gdouble psy_rd = ghb_settings_get_double(ud->settings, "x264_psy_rd");
-		if (psy_rd == 0.0)
+		gint aqmode = ghb_lookup_aqmode(options);
+		if (trell != 2 || aqmode == 0)
 		{
 			gint pos = x264_find_opt(split, x264_subme_syns);
 			g_free(split[pos]);
 			split[pos] = g_strdup_printf("subme=9");
 		}
 	}
-	gint trell = ghb_settings_combo_int(ud->settings, "x264_trellis");
 	if (trell < 1)
 	{
 		gint psy;
@@ -779,7 +887,8 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
 		{
 			val = "1";
 		}
-		const gchar *def_val = x264_opt_get_default(opt);
+		const gchar *def_val;
+		def_val = x264_opt_get_default(opt);
 		if (strcmp(val, def_val) == 0)
 		{
 			// Matches the default, so remove it