summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/ghb.ui4
-rw-r--r--gtk/src/hb-backend.c1
-rw-r--r--gtk/src/x264handler.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 7d037434b..709d59652 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -3248,7 +3248,9 @@ SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest,
6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.
-10, the most powerful and slowest option, requires trellis=2.</property>
+11 disables all early terminations in analysis.
+
+10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always).</property>
<signal handler="x264_widget_changed_cb" name="changed"/>
</object>
<packing>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index a3b9e5106..6a6e29a27 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -359,6 +359,7 @@ static options_map_t d_subme_opts[] =
{"8: RD refine in I/P-frames", "8", 8, "8"},
{"9: RD refine in all frames", "9", 9, "9"},
{"10: QPRD in all frames", "10", 10, "10"},
+ {"11: No early terminations in analysis", "11", 11, "11"},
};
combo_opts_t subme_opts =
{
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 86bdb4a11..0ddd9c52d 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -988,7 +988,7 @@ 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)
+ if (subme >= 10)
{
gint aqmode = ghb_lookup_aqmode(options);
if (trell != 2 || aqmode == 0)