LinGui: Constant Quality Slider now QP/RF based

Nearest percentage is also shown for reference


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

13 files changed, 290 insertions, 346 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 914b34468..c68bb49e1 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1120,6 +1120,7 @@ void
 vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 	gdouble vqmin, vqmax, step, page;
+	gboolean inverted;
 	gint digits;
 	gint vcodec;
 
@@ -1127,16 +1128,13 @@ vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	ghb_check_dependency(ud, widget);
 	ghb_clear_presets_selection(ud);
 	ghb_live_reset(ud);
-	ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits);
+	ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
 	GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
 	gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
 	gtk_range_set_increments (GTK_RANGE(qp), step, page);
 	gtk_scale_set_digits(GTK_SCALE(qp), digits);
+	gtk_range_set_inverted (GTK_RANGE(qp), inverted);
 	vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
-	if (vcodec != HB_VCODEC_X264 && vcodec != HB_VCODEC_FFMPEG)
-	{
-		ghb_ui_update(ud, "directqp", ghb_boolean_value(FALSE));
-	}
 }
 
 void
@@ -2808,22 +2806,41 @@ format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 gchar*
 format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
-	if (ghb_settings_get_boolean(ud->settings, "directqp"))
+	gdouble percent;
+
+	gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+	switch (vcodec)
 	{
-		gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
-		// Only x264 and ffmpeg currently support direct qp/crf entry
-		if (vcodec != HB_VCODEC_X264 && vcodec != HB_VCODEC_FFMPEG)
+		case HB_VCODEC_X264:
 		{
-			val *= 100;
-			return g_strdup_printf("%.1f", val);
-		}
-		return g_strdup_printf("%d", (gint)val);
-	}
-	else
-	{
-		val *= 100;
-		return g_strdup_printf("%.1f", val);
+			gboolean crf;
+			crf = ghb_settings_get_boolean(ud->settings, "constant_rate_factor");
+			percent = 100. * (51 - val) / 51.;
+			if (crf)
+				return g_strdup_printf("RF: %.1f / %.1f%%", val, percent);
+			else
+				return g_strdup_printf("QP: %.1f / %.1f%%", val, percent);
+		} break;
+
+		case HB_VCODEC_XVID:
+		case HB_VCODEC_FFMPEG:
+		{
+			percent = 100. * (30 - (val - 1)) / 30.;
+			return g_strdup_printf("QP: %d / %.1f%%", (int)val, percent);
+		} break;
+
+		case HB_VCODEC_THEORA:
+		{
+			percent = 100. * val / 63.;
+			return g_strdup_printf("QP: %d / %.1f%%", (int)val, percent);
+		} break;
+
+		default:
+		{
+			percent = 0;
+		} break;
 	}
+	return g_strdup_printf("QP: %.1f / %.1f%%", val, percent);
 }
 
 static void
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 1d2f35018..3046ccb71 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1649,6 +1649,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkHScale" id="VideoQualitySlider">
+                                            <property name="width_request">200</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -3270,26 +3271,6 @@ the required multiple.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="directqp">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text">HandBrake allows entry of QP/CRF values for x264 
-and FFMPEG instead of the percentage metric.
-This preference is associated with the current
-preset only.
-
-You *MUST* save the current preset to preserve
-this setting.</property>
-                            <property name="label" translatable="yes">Allow direct QP/CRF</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="vcodec_changed_cb"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkCheckButton" id="EncodeLogLocation">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -3303,7 +3284,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">5</property>
+                            <property name="position">4</property>
                           </packing>
                         </child>
 
@@ -3346,7 +3327,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">6</property>
+                            <property name="position">5</property>
                           </packing>
                         </child>
 
@@ -3384,7 +3365,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">7</property>
+                            <property name="position">6</property>
                           </packing>
                         </child>
 
@@ -3397,7 +3378,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">8</property>
+                            <property name="position">7</property>
                           </packing>
                         </child>
                         <child>
@@ -3409,7 +3390,7 @@ location as the movie.</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">9</property>
+                            <property name="position">8</property>
                           </packing>
                         </child>
                       </object>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 227d96373..fe6b7c41c 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -529,41 +529,46 @@ ghb_vquality_range(
 	gdouble *max,
 	gdouble *step,
 	gdouble *page,
-	gint *digits)
+	gint *digits,
+	gboolean *inverted)
 {
-	if (ghb_settings_get_boolean(ud->settings, "directqp"))
+	gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+	*step = 1;
+	*page = 10;
+	*digits = 0;
+	switch (vcodec)
 	{
-		gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
-		// Only x264 and ffmpeg currently support direct qp/crf entry
-		*step = 1;
-		*page = 10;
-		*digits = 0;
-		if (vcodec == HB_VCODEC_X264)
+		case HB_VCODEC_X264:
 		{
 			*min = 0;
 			*max = 51;
-		}
-		else if (vcodec == HB_VCODEC_FFMPEG)
+			*step = 0.1;
+			*digits = 3;
+			*inverted = TRUE;
+		} break;
+
+		case HB_VCODEC_XVID:
+		case HB_VCODEC_FFMPEG:
 		{
-			*min = 0;
+			*min = 1;
 			*max = 31;
-		}
-		else
+			*inverted = TRUE;
+		} break;
+
+		case HB_VCODEC_THEORA:
 		{
 			*min = 0;
-			*max = 1.0;
-			*step = 0.001;
-			*page = 0.1;
+			*max = 63;
+			*inverted = FALSE;
+		} break;
+
+		default:
+		{
+			*min = 0;
+			*max = 100;
 			*digits = 3;
-		}
-	}
-	else
-	{
-		*min = 0;
-		*max = 1.0;
-		*step = 0.001;
-		*page = 0.1;
-		*digits = 3;
+			*inverted = FALSE;
+		} break;
 	}
 }
 
@@ -3048,38 +3053,32 @@ ghb_validate_vquality(GValue *settings)
 	vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
 	if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
 	{
-		if (!ghb_settings_get_boolean(settings, "directqp"))
+		switch (vcodec)
 		{
-			vquality *= 100.0;
-			if (vcodec != HB_VCODEC_X264)
-			{
-				min = 68;
-				max = 97;
-			}
-			else
-			{
-				min = 40;
-				max = 70;
-			}
-		}
-		else
-		{
-			if (vcodec == HB_VCODEC_X264)
+			case HB_VCODEC_X264:
 			{
 				min = 16;
 				max = 30;
-			}
-			else if (vcodec == HB_VCODEC_FFMPEG)
+			} break;
+
+			case HB_VCODEC_XVID:
+			case HB_VCODEC_FFMPEG:
 			{
 				min = 1;
 				max = 8;
-			}
-			else
+			} break;
+
+			case HB_VCODEC_THEORA:
 			{
-				min = 68;
-				max = 97;
-				vquality *= 100.0;
-			}
+				min = 0;
+				max = 63;
+			} break;
+
+			default:
+			{
+				min = 48;
+				max = 62;
+			} break;
 		}
 		if (vquality < min || vquality > max)
 		{
@@ -3303,11 +3302,6 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
 	{
 		gdouble vquality;
 		vquality = ghb_settings_get_double(js, "VideoQualitySlider");
-		if (!ghb_settings_get_boolean(js, "directqp"))
-		{
-			if (vquality == 0.0) vquality = 0.01;
-			if (vquality == 1.0) vquality = 0.0;
-		}
 		job->vquality =  vquality;
 		job->vbitrate = 0;
 	}
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index 69fd0efd4..dc37d990f 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -91,7 +91,8 @@ void ghb_vquality_range(
 	gdouble *max,
 	gdouble *step,
 	gdouble *page,
-	gint *digits);
+	gint *digits,
+	gboolean *inverted);
 //const gchar* ghb_get_rate_string(gint rate, gint type);
 void ghb_combo_init(GtkBuilder *builder);
 void ghb_backend_init(gint debug);
diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index d1e5e5430..6cd672ef3 100644
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -176,8 +176,6 @@
 		<string>none</string>
 		<key>PictureDetelecineCustom</key>
 		<string></string>
-		<key>directqp</key>
-		<false />
 		<key>SubtitlesForced</key>
 		<true />
 		<key>VideoFramerate</key>
diff --git a/gtk/src/makedeps.c b/gtk/src/makedeps.c
index 87ab6ace4..0c28c5abc 100644
--- a/gtk/src/makedeps.c
+++ b/gtk/src/makedeps.c
@@ -58,7 +58,6 @@ static dependency_t dep_map[] =
 	{"VideoEncoder", "x264_tab", "x264", FALSE, FALSE},
 	{"VideoEncoder", "x264_tab_label", "x264", FALSE, FALSE},
 	{"VideoEncoder", "Mp4iPodCompatible", "x264", FALSE, FALSE},
-	{"VideoEncoder", "directqp", "x264|ffmpeg", FALSE, FALSE},
 	{"AudioEncoder", "AudioBitrate", "ac3|dts", TRUE, FALSE},
 	{"AudioEncoder", "AudioSamplerate", "ac3|dts", TRUE, FALSE},
 	{"AudioEncoder", "AudioMixdown", "ac3|dts", TRUE, FALSE},
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index dd186f8da..203a911e8 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -16,6 +16,7 @@
 #include <glib/gstdio.h>
 #include <string.h>
 #include <gtk/gtk.h>
+#include "hb.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"
@@ -2192,6 +2193,43 @@ import_xlat_preset(GValue *dict)
 	} break;
 	}
 	import_value_xlat(dict);
+
+	gdouble vquality;
+	const GValue *gval;
+
+	vquality = ghb_value_double(preset_dict_get_value(dict, "VideoQualitySlider"));
+	if (vquality < 1.0)
+	{
+		gint vcodec;
+
+		gval = preset_dict_get_value(dict, "VideoEncoder");
+		vcodec = ghb_lookup_combo_int("VideoEncoder", gval);
+		switch (vcodec)
+		{
+			case HB_VCODEC_X264:
+			{
+				vquality = 51. - vquality * 51.;
+			} break;
+
+			case HB_VCODEC_XVID:
+			case HB_VCODEC_FFMPEG:
+			{
+				vquality = 31. - vquality * 30.;
+			} break;
+
+			case HB_VCODEC_THEORA:
+			{
+				vquality = vquality * 63.;
+			} break;
+
+			default:
+			{
+				vquality = 0.;
+			} break;
+		}
+		ghb_dict_insert(dict, g_strdup("VideoQualitySlider"), 
+						ghb_double_value_new(vquality));
+	}
 }
 
 static void
@@ -3184,10 +3222,14 @@ presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_
 
 			gdouble vqmin, vqmax, step, page;
 			gint digits;
-			ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits);
+			gboolean inverted;
+
+			ghb_vquality_range(ud, &vqmin, &vqmax, &step, 
+								&page, &digits, &inverted);
 			gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
 			gtk_range_set_increments (GTK_RANGE(qp), step, page);
 			gtk_scale_set_digits(GTK_SCALE(qp), digits);
+			gtk_range_set_inverted (GTK_RANGE(qp), inverted);
 
 			gchar *text;
 			gint crop[4];
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 68be7791b..55e1e9a05 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -243,16 +243,8 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		// Constant quality
 		vqvalue = ghb_settings_get_double(settings, "VideoQualitySlider");
 		vq_desc = "Constant Quality:";
-		if (ghb_settings_get_boolean(settings, "directqp"))
-		{
-			vqstr = g_strdup_printf("%d", (gint)vqvalue);
-			vq_units = "(crf)";
-		}
-		else
-		{
-			vqstr = g_strdup_printf("%.1f", 100*vqvalue);
-			vq_units = "%";
-		}
+		vqstr = g_strdup_printf("%d", (gint)vqvalue);
+		vq_units = "(crf)";
 	}
 	fps = ghb_settings_get_string(settings, "VideoFramerate");
 	if (strcmp("source", fps) == 0)
diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 902cc6871..689c141eb 100644
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -2594,6 +2594,8 @@
 "                                        &lt;child&gt;\n"
 "                                          &lt;object class=&quot;GtkHSc"
 "ale&quot; id=&quot;VideoQualitySlider&quot;&gt;\n"
+"                                            &lt;property name=&quot;wid"
+"th_request&quot;&gt;200&lt;/property&gt;\n"
 "                                            &lt;property name=&quot;vis"
 "ible&quot;&gt;True&lt;/property&gt;\n"
 "                                            &lt;property name=&quot;can"
@@ -5337,35 +5339,6 @@
 "                        &lt;/child&gt;\n"
 "                        &lt;child&gt;\n"
 "                          &lt;object class=&quot;GtkCheckButton&quot; i"
-"d=&quot;directqp&quot;&gt;\n"
-"                            &lt;property name=&quot;visible&quot;&gt;Tr"
-"ue&lt;/property&gt;\n"
-"                            &lt;property name=&quot;can_focus&quot;&gt;"
-"True&lt;/property&gt;\n"
-"                            &lt;property name=&quot;tooltip_text&quot;&"
-"gt;HandBrake allows entry of QP/CRF values for x264 \n"
-"and FFMPEG instead of the percentage metric.\n"
-"This preference is associated with the current\n"
-"preset only.\n"
-"\n"
-"You *MUST* save the current preset to preserve\n"
-"this setting.&lt;/property&gt;\n"
-"                            &lt;property name=&quot;label&quot; transla"
-"table=&quot;yes&quot;&gt;Allow direct QP/CRF&lt;/property&gt;\n"
-"                            &lt;property name=&quot;draw_indicator&quot"
-";&gt;True&lt;/property&gt;\n"
-"                            &lt;signal name=&quot;toggled&quot; handler"
-"=&quot;vcodec_changed_cb&quot;/&gt;\n"
-"                          &lt;/object&gt;\n"
-"                          &lt;packing&gt;\n"
-"                            &lt;property name=&quot;expand&quot;&gt;Fal"
-"se&lt;/property&gt;\n"
-"                            &lt;property name=&quot;position&quot;&gt;4"
-"&lt;/property&gt;\n"
-"                          &lt;/packing&gt;\n"
-"                        &lt;/child&gt;\n"
-"                        &lt;child&gt;\n"
-"                          &lt;object class=&quot;GtkCheckButton&quot; i"
 "d=&quot;EncodeLogLocation&quot;&gt;\n"
 "                            &lt;property name=&quot;visible&quot;&gt;Tr"
 "ue&lt;/property&gt;\n"
@@ -5387,7 +5360,7 @@
 "                          &lt;packing&gt;\n"
 "                            &lt;property name=&quot;expand&quot;&gt;Fal"
 "se&lt;/property&gt;\n"
-"                            &lt;property name=&quot;position&quot;&gt;5"
+"                            &lt;property name=&quot;position&quot;&gt;4"
 "&lt;/property&gt;\n"
 "                          &lt;/packing&gt;\n"
 "                        &lt;/child&gt;\n"
@@ -5454,7 +5427,7 @@
 "                          &lt;packing&gt;\n"
 "                            &lt;property name=&quot;expand&quot;&gt;Fal"
 "se&lt;/property&gt;\n"
-"                            &lt;property name=&quot;position&quot;&gt;6"
+"                            &lt;property name=&quot;position&quot;&gt;5"
 "&lt;/property&gt;\n"
 "                          &lt;/packing&gt;\n"
 "                        &lt;/child&gt;\n"
@@ -5511,7 +5484,7 @@
 "                          &lt;packing&gt;\n"
 "                            &lt;property name=&quot;expand&quot;&gt;Fal"
 "se&lt;/property&gt;\n"
-"                            &lt;property name=&quot;position&quot;&gt;7"
+"                            &lt;property name=&quot;position&quot;&gt;6"
 "&lt;/property&gt;\n"
 "                          &lt;/packing&gt;\n"
 "                        &lt;/child&gt;\n"
@@ -5531,7 +5504,7 @@
 "                          &lt;packing&gt;\n"
 "                            &lt;property name=&quot;expand&quot;&gt;Fal"
 "se&lt;/property&gt;\n"
-"                            &lt;property name=&quot;position&quot;&gt;8"
+"                            &lt;property name=&quot;position&quot;&gt;7"
 "&lt;/property&gt;\n"
 "                          &lt;/packing&gt;\n"
 "                        &lt;/child&gt;\n"
@@ -5550,7 +5523,7 @@
 "                          &lt;packing&gt;\n"
 "                            &lt;property name=&quot;expand&quot;&gt;Fal"
 "se&lt;/property&gt;\n"
-"                            &lt;property name=&quot;position&quot;&gt;9"
+"                            &lt;property name=&quot;position&quot;&gt;8"
 "&lt;/property&gt;\n"
 "                          &lt;/packing&gt;\n"
 "                        &lt;/child&gt;\n"
@@ -11118,8 +11091,6 @@
 "			<false />\n"
 "			<key>constant_rate_factor</key>\n"
 "			<true />\n"
-"			<key>directqp</key>\n"
-"			<false />\n"
 "			<key>x264Option</key>\n"
 "			<string></string>\n"
 "		</dict>\n"
@@ -11195,11 +11166,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -11283,11 +11254,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -11373,11 +11344,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -11480,11 +11451,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -11566,11 +11537,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -11675,11 +11646,11 @@
 "							<key>PictureDeblock</key>\n"
 "							<integer>0</integer>\n"
 "							<key>PictureDeinterlace</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureDenoise</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureDetelecine</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureHeight</key>\n"
 "							<integer>0</integer>\n"
 "							<key>PictureKeepRatio</key>\n"
@@ -11767,11 +11738,11 @@
 "							<key>PictureDeblock</key>\n"
 "							<integer>0</integer>\n"
 "							<key>PictureDeinterlace</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureDenoise</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureDetelecine</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureHeight</key>\n"
 "							<integer>0</integer>\n"
 "							<key>PictureKeepRatio</key>\n"
@@ -11858,11 +11829,11 @@
 "							<key>PictureDeblock</key>\n"
 "							<integer>0</integer>\n"
 "							<key>PictureDeinterlace</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureDenoise</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureDetelecine</key>\n"
-"							<string>0</string>\n"
+"							<integer>0</integer>\n"
 "							<key>PictureHeight</key>\n"
 "							<integer>0</integer>\n"
 "							<key>PictureKeepRatio</key>\n"
@@ -11965,11 +11936,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12052,11 +12023,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12149,13 +12120,13 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDecomb</key>\n"
-"					<string>2</string>\n"
+"					<integer>2</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>2</string>\n"
+"					<integer>2</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12420,13 +12391,13 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDecomb</key>\n"
-"					<string>2</string>\n"
+"					<integer>2</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>2</string>\n"
+"					<integer>2</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12523,11 +12494,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>208</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12609,11 +12580,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12693,11 +12664,11 @@
 "					<key>PictureDeblock</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureDeinterlace</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDenoise</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureDetelecine</key>\n"
-"					<string>0</string>\n"
+"					<integer>0</integer>\n"
 "					<key>PictureHeight</key>\n"
 "					<integer>0</integer>\n"
 "					<key>PictureKeepRatio</key>\n"
@@ -12809,7 +12780,6 @@
 "			<string>x264_tab</string>\n"
 "			<string>x264_tab_label</string>\n"
 "			<string>Mp4iPodCompatible</string>\n"
-"			<string>directqp</string>\n"
 "		</array>\n"
 "		<key>VideoTwoPass</key>\n"
 "		<array>\n"
@@ -13138,15 +13108,6 @@
 "				<false />\n"
 "			</array>\n"
 "		</array>\n"
-"		<key>directqp</key>\n"
-"		<array>\n"
-"			<array>\n"
-"				<string>VideoEncoder</string>\n"
-"				<string>x264|ffmpeg</string>\n"
-"				<false />\n"
-"				<false />\n"
-"			</array>\n"
-"		</array>\n"
 "		<key>end_chapter</key>\n"
 "		<array>\n"
 "			<array>\n"
diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index fa5aed47c..ad2f33944 100644
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -1654,6 +1654,7 @@
                                         &lt;/child&gt;
                                         &lt;child&gt;
                                           &lt;object class=&quot;GtkHScale&quot; id=&quot;VideoQualitySlider&quot;&gt;
+                                            &lt;property name=&quot;width_request&quot;&gt;200&lt;/property&gt;
                                             &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                                             &lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
                                             &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
@@ -3275,26 +3276,6 @@ the required multiple.&lt;/property&gt;
                           &lt;/packing&gt;
                         &lt;/child&gt;
                         &lt;child&gt;
-                          &lt;object class=&quot;GtkCheckButton&quot; id=&quot;directqp&quot;&gt;
-                            &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
-                            &lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
-                            &lt;property name=&quot;tooltip_text&quot;&gt;HandBrake allows entry of QP/CRF values for x264 
-and FFMPEG instead of the percentage metric.
-This preference is associated with the current
-preset only.
-
-You *MUST* save the current preset to preserve
-this setting.&lt;/property&gt;
-                            &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Allow direct QP/CRF&lt;/property&gt;
-                            &lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
-                            &lt;signal name=&quot;toggled&quot; handler=&quot;vcodec_changed_cb&quot;/&gt;
-                          &lt;/object&gt;
-                          &lt;packing&gt;
-                            &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                            &lt;property name=&quot;position&quot;&gt;4&lt;/property&gt;
-                          &lt;/packing&gt;
-                        &lt;/child&gt;
-                        &lt;child&gt;
                           &lt;object class=&quot;GtkCheckButton&quot; id=&quot;EncodeLogLocation&quot;&gt;
                             &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                             &lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
@@ -3308,7 +3289,7 @@ location as the movie.&lt;/property&gt;
                           &lt;/object&gt;
                           &lt;packing&gt;
                             &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                            &lt;property name=&quot;position&quot;&gt;5&lt;/property&gt;
+                            &lt;property name=&quot;position&quot;&gt;4&lt;/property&gt;
                           &lt;/packing&gt;
                         &lt;/child&gt;
 
@@ -3351,7 +3332,7 @@ location as the movie.&lt;/property&gt;
                           &lt;/object&gt;
                           &lt;packing&gt;
                             &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                            &lt;property name=&quot;position&quot;&gt;6&lt;/property&gt;
+                            &lt;property name=&quot;position&quot;&gt;5&lt;/property&gt;
                           &lt;/packing&gt;
                         &lt;/child&gt;
 
@@ -3389,7 +3370,7 @@ location as the movie.&lt;/property&gt;
                           &lt;/object&gt;
                           &lt;packing&gt;
                             &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                            &lt;property name=&quot;position&quot;&gt;7&lt;/property&gt;
+                            &lt;property name=&quot;position&quot;&gt;6&lt;/property&gt;
                           &lt;/packing&gt;
                         &lt;/child&gt;
 
@@ -3402,7 +3383,7 @@ location as the movie.&lt;/property&gt;
                           &lt;/object&gt;
                           &lt;packing&gt;
                             &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                            &lt;property name=&quot;position&quot;&gt;8&lt;/property&gt;
+                            &lt;property name=&quot;position&quot;&gt;7&lt;/property&gt;
                           &lt;/packing&gt;
                         &lt;/child&gt;
                         &lt;child&gt;
@@ -3414,7 +3395,7 @@ location as the movie.&lt;/property&gt;
                           &lt;/object&gt;
                           &lt;packing&gt;
                             &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
-                            &lt;property name=&quot;position&quot;&gt;9&lt;/property&gt;
+                            &lt;property name=&quot;position&quot;&gt;8&lt;/property&gt;
                           &lt;/packing&gt;
                         &lt;/child&gt;
                       &lt;/object&gt;
@@ -5600,8 +5581,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<false />
 			<key>constant_rate_factor</key>
 			<true />
-			<key>directqp</key>
-			<false />
 			<key>x264Option</key>
 			<string></string>
 		</dict>
@@ -5677,11 +5656,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -5762,11 +5741,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -5849,11 +5828,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -5954,11 +5933,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -6037,11 +6016,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -6143,11 +6122,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 							<key>PictureDeblock</key>
 							<integer>0</integer>
 							<key>PictureDeinterlace</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureDenoise</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureDetelecine</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureHeight</key>
 							<integer>0</integer>
 							<key>PictureKeepRatio</key>
@@ -6230,11 +6209,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 							<key>PictureDeblock</key>
 							<integer>0</integer>
 							<key>PictureDeinterlace</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureDenoise</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureDetelecine</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureHeight</key>
 							<integer>0</integer>
 							<key>PictureKeepRatio</key>
@@ -6317,11 +6296,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 							<key>PictureDeblock</key>
 							<integer>0</integer>
 							<key>PictureDeinterlace</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureDenoise</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureDetelecine</key>
-							<string>0</string>
+							<integer>0</integer>
 							<key>PictureHeight</key>
 							<integer>0</integer>
 							<key>PictureKeepRatio</key>
@@ -6421,11 +6400,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -6508,11 +6487,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -6604,13 +6583,13 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDecomb</key>
-					<string>2</string>
+					<integer>2</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>2</string>
+					<integer>2</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -6867,13 +6846,13 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDecomb</key>
-					<string>2</string>
+					<integer>2</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>2</string>
+					<integer>2</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -6967,11 +6946,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>208</integer>
 					<key>PictureKeepRatio</key>
@@ -7052,11 +7031,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -7135,11 +7114,11 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 					<key>PictureDeblock</key>
 					<integer>0</integer>
 					<key>PictureDeinterlace</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDenoise</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureDetelecine</key>
-					<string>0</string>
+					<integer>0</integer>
 					<key>PictureHeight</key>
 					<integer>0</integer>
 					<key>PictureKeepRatio</key>
@@ -7249,7 +7228,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>x264_tab</string>
 			<string>x264_tab_label</string>
 			<string>Mp4iPodCompatible</string>
-			<string>directqp</string>
 		</array>
 		<key>VideoTwoPass</key>
 		<array>
@@ -7578,15 +7556,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 				<false />
 			</array>
 		</array>
-		<key>directqp</key>
-		<array>
-			<array>
-				<string>VideoEncoder</string>
-				<string>x264|ffmpeg</string>
-				<false />
-				<false />
-			</array>
-		</array>
 		<key>end_chapter</key>
 		<array>
 			<array>
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index a3e8eeaec..a2d33c561 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -58,11 +58,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -143,11 +143,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -230,11 +230,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -335,11 +335,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -418,11 +418,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -524,11 +524,11 @@
 						<key>PictureDeblock</key>
 						<integer>0</integer>
 						<key>PictureDeinterlace</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureDenoise</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureDetelecine</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureHeight</key>
 						<integer>0</integer>
 						<key>PictureKeepRatio</key>
@@ -611,11 +611,11 @@
 						<key>PictureDeblock</key>
 						<integer>0</integer>
 						<key>PictureDeinterlace</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureDenoise</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureDetelecine</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureHeight</key>
 						<integer>0</integer>
 						<key>PictureKeepRatio</key>
@@ -698,11 +698,11 @@
 						<key>PictureDeblock</key>
 						<integer>0</integer>
 						<key>PictureDeinterlace</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureDenoise</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureDetelecine</key>
-						<string>0</string>
+						<integer>0</integer>
 						<key>PictureHeight</key>
 						<integer>0</integer>
 						<key>PictureKeepRatio</key>
@@ -802,11 +802,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -889,11 +889,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -985,13 +985,13 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDecomb</key>
-				<string>2</string>
+				<integer>2</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>2</string>
+				<integer>2</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -1248,13 +1248,13 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDecomb</key>
-				<string>2</string>
+				<integer>2</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>2</string>
+				<integer>2</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -1348,11 +1348,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>208</integer>
 				<key>PictureKeepRatio</key>
@@ -1433,11 +1433,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -1516,11 +1516,11 @@
 				<key>PictureDeblock</key>
 				<integer>0</integer>
 				<key>PictureDeinterlace</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDenoise</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<string>0</string>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
diff --git a/gtk/src/widget_deps b/gtk/src/widget_deps
index 690c1a0d7..31d3e5917 100644
--- a/gtk/src/widget_deps
+++ b/gtk/src/widget_deps
@@ -53,7 +53,6 @@
 		<string>x264_tab</string>
 		<string>x264_tab_label</string>
 		<string>Mp4iPodCompatible</string>
-		<string>directqp</string>
 	</array>
 	<key>VideoTwoPass</key>
 	<array>
diff --git a/gtk/src/widget_reverse_deps b/gtk/src/widget_reverse_deps
index 9a45951e5..c573d6069 100644
--- a/gtk/src/widget_reverse_deps
+++ b/gtk/src/widget_reverse_deps
@@ -263,15 +263,6 @@
 			<false />
 		</array>
 	</array>
-	<key>directqp</key>
-	<array>
-		<array>
-			<string>VideoEncoder</string>
-			<string>x264|ffmpeg</string>
-			<false />
-			<false />
-		</array>
-	</array>
 	<key>end_chapter</key>
 	<array>
 		<array>