diff options
| author | jstebbins <[email protected]> | 2009-09-25 17:02:31 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-09-25 17:02:31 +0000 |
| commit | a374242fe6973db162a5d9809fd54d4e0b861c03 (patch) | |
| tree | ae044ffdf6911d46bd7b6779be6c9eb5286c3a07 /gtk | |
| parent | 7d3099c1490d3ff43c220218fadf2c97afd043a2 (diff) | |
Lingui: make mbtree default follow the state of bframes
when bframes are 0, mbtree default is 0 and user can manually set mbtree to 1
when bframes are 1, mbtree default is 1 and user can manually set mbtree to 0
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2839 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/src/x264handler.c | 48 |
1 files changed, 46 insertions, 2 deletions
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c index f1c4bfa5c..6ad1cfe93 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); @@ -432,7 +433,20 @@ ghb_x264_parse_options(signal_user_data_t *ud, const gchar *options) { if (!x264_opt_map[jj].found) { - gchar *val = strdup(x264_opt_map[jj].def_val); + gchar *val; + + if (x264_opt_map[jj].opt_syns == x264_mbtree_syns) + { + int bframes = ghb_lookup_bframes(options); + if (bframes > 0) + val = strdup("1"); + else + val = strdup("0"); + } + else + { + val = strdup(x264_opt_map[jj].def_val); + } switch(x264_opt_map[jj].type) { case X264_OPT_INT: @@ -728,6 +742,28 @@ ghb_lookup_aqmode(const gchar *options) 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; +} + // Construct the x264 options string // The result is allocated, so someone must free it at some point. static gchar* @@ -811,7 +847,15 @@ 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; + if (find_syn_match(opt, x264_mbtree_syns) >= 0 && bframes == 0) + { + def_val = "0"; + } + else + { + def_val = x264_opt_get_default(opt); + } if (strcmp(val, def_val) == 0) { // Matches the default, so remove it |