LinGui: Changes required by latest x264

Loose b-rdo and bime options.  Allow subme to go to 9.


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

11 files changed, 47 insertions, 290 deletions

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 6e53e8e40..3f523bcc2 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -2598,39 +2598,6 @@
                                         <property name="right_attach">2</property>
                                       </packing>
                                     </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="x264_brdo">
-                                        <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>
-                                        <property name="tooltip-text" translatable="yes">When B-frame rate distortion optimization is enabled, x264 tries several different methods of compression for each part of a frame, and chooses the one that looks the best. You need to use a subpixel motion estimation refinement level of 6 or 7 for this to work.</property>
-                                        <property name="label" translatable="yes">B-Frame Rate Distortion</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="x264_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="x264_bime">
-                                        <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>
-                                        <property name="tooltip-text" translatable="yes">When bidrectional motion estimation refinement is activated, x264 will optimize motion vectors both forwards and backwards in time. This improves quality, and while it slows down encoding, it does not make playback any more difficult.</property>
-                                        <property name="label" translatable="yes">Bidirectional Refinement</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <signal handler="x264_widget_changed_cb" name="toggled"/>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                      </packing>
-                                    </child>
 
                                       </object>
                                       <packing>
@@ -2679,7 +2646,7 @@ You can edit these and add additional options.
 
 Default values will not be shown. The defaults are:
 ref=1:mixed-refs=0:bframes=0:direct=spatial:b-pyramid=0:
-weightb=0:brdo=0:bime=0:me=hex:merange=16:subme=5:
+weightb=0:me=hex:merange=16:subme=5:
 analyse=some:8x8dct=0:deblock=0,0:trellis=0:
 no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                     <property name="wrap_mode">GTK_WRAP_CHAR</property>
@@ -2837,7 +2804,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                                               <object class="GtkComboBox" id="x264_subme">
                                                 <property name="visible">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                                <property name="tooltip-text" translatable="yes">Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 7 is highest quality and slowest.  5 or 6 are commonly used values.</property>
+                                                <property name="tooltip-text" translatable="yes">Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 9 is highest quality and slowest.  5 or 6 are commonly used values.</property>
                                                 <signal handler="x264_widget_changed_cb" name="changed"/>
                                               </object>
                                             </child>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index f2ddbe98a..9eea5a60b 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -163,6 +163,8 @@ static options_map_t d_subme_opts[] =
 	{"5", "5", 5, "5"},
 	{"6", "6", 6, "6"},
 	{"7", "7", 7, "7"},
+	{"8", "8", 8, "8"},
+	{"9", "9", 9, "9"},
 };
 combo_opts_t subme_opts =
 {
diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index 822ed41f6..38593e7f7 100644
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -38,12 +38,8 @@
 		<string>some</string>
 		<key>x264_bframes</key>
 		<integer>0</integer>
-		<key>x264_bime</key>
-		<false />
 		<key>x264_bpyramid</key>
 		<false />
-		<key>x264_brdo</key>
-		<false />
 		<key>x264_cabac</key>
 		<true />
 		<key>x264_deblock_alpha</key>
diff --git a/gtk/src/makedeps.c b/gtk/src/makedeps.c
index 966f2ae78..d0f084c9f 100644
--- a/gtk/src/makedeps.c
+++ b/gtk/src/makedeps.c
@@ -56,13 +56,10 @@ static dependency_t dep_map[] =
 	{"audio_codec", "audio_mix", "ac3", TRUE},
 	{"audio_codec", "audio_drc", "ac3", TRUE},
 	{"x264_bframes", "x264_weighted_bframes", "0", TRUE},
-	{"x264_bframes", "x264_brdo", "0", TRUE},
-	{"x264_bframes", "x264_bime", "0", TRUE},
 	{"x264_bframes", "x264_bpyramid", "<2", TRUE},
 	{"x264_bframes", "x264_direct", "0", TRUE},
 	{"x264_refs", "x264_mixed_refs", "<2", TRUE},
 	{"x264_cabac", "x264_trellis", "TRUE", FALSE},
-	{"x264_subme", "x264_brdo", "<6", TRUE},
 	{"x264_me", "x264_merange", "umh|esa", FALSE},
 	{"chapter_markers", "chapters_list", "TRUE", FALSE},
 	{"use_source_name", "chapters_in_destination", "TRUE", FALSE},
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index d6dcb786b..08ac7b3a2 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -999,7 +999,7 @@ ghb_presets_list_init(
 						   	3, custom ? "black" : "blue", 
 							4, description,
 						   	-1);
-		if (def)
+		if (def && parent)
 		{
 			GtkTreePath *path;
 
diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index 7a54317b3..cde3769a4 100644
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -4235,74 +4235,6 @@
 "ttach&quot;&gt;2&lt;/property&gt;\n"
 "                                      &lt;/packing&gt;\n"
 "                                    &lt;/child&gt;\n"
-"                                    &lt;child&gt;\n"
-"                                      &lt;object class=&quot;GtkCheckBu"
-"tton&quot; id=&quot;x264_brdo&quot;&gt;\n"
-"                                        &lt;property name=&quot;visible"
-"&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;can_foc"
-"us&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;events&"
-"quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;tooltip"
-"-text&quot; translatable=&quot;yes&quot;&gt;When B-frame rate distortio"
-"n optimization is enabled, x264 tries several different methods of comp"
-"ression for each part of a frame, and chooses the one that looks the be"
-"st. You need to use a subpixel motion estimation refinement level of 6 "
-"or 7 for this to work.&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;label&q"
-"uot; translatable=&quot;yes&quot;&gt;B-Frame Rate Distortion&lt;/proper"
-"ty&gt;\n"
-"                                        &lt;property name=&quot;draw_in"
-"dicator&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;signal handler=&quot;x264_w"
-"idget_changed_cb&quot; name=&quot;toggled&quot;/&gt;\n"
-"                                      &lt;/object&gt;\n"
-"                                      &lt;packing&gt;\n"
-"                                        &lt;property name=&quot;top_att"
-"ach&quot;&gt;1&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;bottom_"
-"attach&quot;&gt;2&lt;/property&gt;\n"
-"                                      &lt;/packing&gt;\n"
-"                                    &lt;/child&gt;\n"
-"                                    &lt;child&gt;\n"
-"                                      &lt;object class=&quot;GtkCheckBu"
-"tton&quot; id=&quot;x264_bime&quot;&gt;\n"
-"                                        &lt;property name=&quot;visible"
-"&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;can_foc"
-"us&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;events&"
-"quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B"
-"UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;tooltip"
-"-text&quot; translatable=&quot;yes&quot;&gt;When bidrectional motion es"
-"timation refinement is activated, x264 will optimize motion vectors bot"
-"h forwards and backwards in time. This improves quality, and while it s"
-"lows down encoding, it does not make playback any more difficult.&lt;/p"
-"roperty&gt;\n"
-"                                        &lt;property name=&quot;label&q"
-"uot; translatable=&quot;yes&quot;&gt;Bidirectional Refinement&lt;/prope"
-"rty&gt;\n"
-"                                        &lt;property name=&quot;active&"
-"quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;draw_in"
-"dicator&quot;&gt;True&lt;/property&gt;\n"
-"                                        &lt;signal handler=&quot;x264_w"
-"idget_changed_cb&quot; name=&quot;toggled&quot;/&gt;\n"
-"                                      &lt;/object&gt;\n"
-"                                      &lt;packing&gt;\n"
-"                                        &lt;property name=&quot;left_at"
-"tach&quot;&gt;1&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;right_a"
-"ttach&quot;&gt;2&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;top_att"
-"ach&quot;&gt;1&lt;/property&gt;\n"
-"                                        &lt;property name=&quot;bottom_"
-"attach&quot;&gt;2&lt;/property&gt;\n"
-"                                      &lt;/packing&gt;\n"
-"                                    &lt;/child&gt;\n"
 "\n"
 "                                      &lt;/object&gt;\n"
 "                                      &lt;packing&gt;\n"
@@ -4380,7 +4312,7 @@
 "\n"
 "Default values will not be shown. The defaults are:\n"
 "ref=1:mixed-refs=0:bframes=0:direct=spatial:b-pyramid=0:\n"
-"weightb=0:brdo=0:bime=0:me=hex:merange=16:subme=5:\n"
+"weightb=0:me=hex:merange=16:subme=5:\n"
 "analyse=some:8x8dct=0:deblock=0,0:trellis=0:\n"
 "no-fast-pskip=0:no-dct-decimate=0:cabac=1&lt;/property&gt;\n"
 "                                    &lt;property name=&quot;wrap_mode&q"
@@ -4660,7 +4592,7 @@
 " | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
 "                                                &lt;property name=&quot"
 ";tooltip-text&quot; translatable=&quot;yes&quot;&gt;Determines how moti"
-"on estimation decisions are made. 1 is lowest quality and fastest. 7 is"
+"on estimation decisions are made. 1 is lowest quality and fastest. 9 is"
 " highest quality and slowest.  5 or 6 are commonly used values.&lt;/pro"
 "perty&gt;\n"
 "                                                &lt;signal handler=&quo"
@@ -10146,12 +10078,8 @@
 "			<string>some</string>\n"
 "			<key>x264_bframes</key>\n"
 "			<integer>0</integer>\n"
-"			<key>x264_bime</key>\n"
-"			<false />\n"
 "			<key>x264_bpyramid</key>\n"
 "			<false />\n"
-"			<key>x264_brdo</key>\n"
-"			<false />\n"
 "			<key>x264_cabac</key>\n"
 "			<true />\n"
 "			<key>x264_deblock_alpha</key>\n"
@@ -10377,9 +10305,9 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-"
-"pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter"
-"=2,2</string>\n"
+"			<string>ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me="
+"umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</strin"
+"g>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -10536,9 +10464,9 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>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-fa"
-"st-pskip:no-dct-decimate:filter=-2,-1</string>\n"
+"			<string>ref=16:mixed-refs:bframes=16:weightb:direct=auto:b-pyramid:m"
+"e=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no"
+"-dct-decimate:filter=-2,-1</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -10683,8 +10611,8 @@
 "			<key>vquality_type_target</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:dir"
-"ect=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
+"			<string>ref=3:mixed-refs:bframes=16:weightb:b-pyramid:direct=auto:me"
+"=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -10827,8 +10755,8 @@
 "			<key>vquality_type_constant</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filt"
-"er=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>\n"
+"			<string>ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:tr"
+"ellis=1:analyse=all:8x8dct:me=umh</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -10902,8 +10830,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=u"
-"mh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
+"			<string>ref=5:mixed-refs:bframes=3:weightb:b-pyramid:me=umh:subme=7:"
+"trellis=1:analyse=all:8x8dct:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -10974,9 +10902,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>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</stri"
-"ng>\n"
+"			<string>ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me="
+"umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -11258,8 +11185,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me"
-"=umh:analyse=all:trellis=1:no-fast-pskip</string>\n"
+"			<string>ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:analys"
+"e=all:trellis=1:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -11331,8 +11258,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyrami"
-"d:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>\n"
+"			<string>ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me="
+"umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -11400,9 +11327,8 @@
 "			<key>vquality_type_bitrate</key>\n"
 "			<true />\n"
 "			<key>x264_options</key>\n"
-"			<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direc"
-"t=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>"
-"\n"
+"			<string>level=40:ref=2:mixed-refs:bframes=3:weightb:direct=auto:b-py"
+"ramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>\n"
 "		</dict>\n"
 "		<dict>\n"
 "			<key>anamorphic</key>\n"
@@ -11717,8 +11643,6 @@
 "		<key>x264_bframes</key>\n"
 "		<array>\n"
 "			<string>x264_weighted_bframes</string>\n"
-"			<string>x264_brdo</string>\n"
-"			<string>x264_bime</string>\n"
 "			<string>x264_bpyramid</string>\n"
 "			<string>x264_direct</string>\n"
 "		</array>\n"
@@ -11734,10 +11658,6 @@
 "		<array>\n"
 "			<string>x264_mixed_refs</string>\n"
 "		</array>\n"
-"		<key>x264_subme</key>\n"
-"		<array>\n"
-"			<string>x264_brdo</string>\n"
-"		</array>\n"
 "	</dict>\n"
 "	<key>widget-reverse-deps</key>\n"
 "	<dict>\n"
@@ -12049,14 +11969,6 @@
 "				<false />\n"
 "			</array>\n"
 "		</array>\n"
-"		<key>x264_bime</key>\n"
-"		<array>\n"
-"			<array>\n"
-"				<string>x264_bframes</string>\n"
-"				<string>0</string>\n"
-"				<true />\n"
-"			</array>\n"
-"		</array>\n"
 "		<key>x264_bpyramid</key>\n"
 "		<array>\n"
 "			<array>\n"
@@ -12065,19 +11977,6 @@
 "				<true />\n"
 "			</array>\n"
 "		</array>\n"
-"		<key>x264_brdo</key>\n"
-"		<array>\n"
-"			<array>\n"
-"				<string>x264_bframes</string>\n"
-"				<string>0</string>\n"
-"				<true />\n"
-"			</array>\n"
-"			<array>\n"
-"				<string>x264_subme</string>\n"
-"				<string>&lt;6</string>\n"
-"				<true />\n"
-"			</array>\n"
-"		</array>\n"
 "		<key>x264_direct</key>\n"
 "		<array>\n"
 "			<array>\n"
diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index a9407713d..bc7496a0f 100644
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -2603,39 +2603,6 @@
                                         &lt;property name=&quot;right_attach&quot;&gt;2&lt;/property&gt;
                                       &lt;/packing&gt;
                                     &lt;/child&gt;
-                                    &lt;child&gt;
-                                      &lt;object class=&quot;GtkCheckButton&quot; id=&quot;x264_brdo&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;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
-                                        &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;When B-frame rate distortion optimization is enabled, x264 tries several different methods of compression for each part of a frame, and chooses the one that looks the best. You need to use a subpixel motion estimation refinement level of 6 or 7 for this to work.&lt;/property&gt;
-                                        &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;B-Frame Rate Distortion&lt;/property&gt;
-                                        &lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
-                                        &lt;signal handler=&quot;x264_widget_changed_cb&quot; name=&quot;toggled&quot;/&gt;
-                                      &lt;/object&gt;
-                                      &lt;packing&gt;
-                                        &lt;property name=&quot;top_attach&quot;&gt;1&lt;/property&gt;
-                                        &lt;property name=&quot;bottom_attach&quot;&gt;2&lt;/property&gt;
-                                      &lt;/packing&gt;
-                                    &lt;/child&gt;
-                                    &lt;child&gt;
-                                      &lt;object class=&quot;GtkCheckButton&quot; id=&quot;x264_bime&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;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
-                                        &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;When bidrectional motion estimation refinement is activated, x264 will optimize motion vectors both forwards and backwards in time. This improves quality, and while it slows down encoding, it does not make playback any more difficult.&lt;/property&gt;
-                                        &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Bidirectional Refinement&lt;/property&gt;
-                                        &lt;property name=&quot;active&quot;&gt;True&lt;/property&gt;
-                                        &lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
-                                        &lt;signal handler=&quot;x264_widget_changed_cb&quot; name=&quot;toggled&quot;/&gt;
-                                      &lt;/object&gt;
-                                      &lt;packing&gt;
-                                        &lt;property name=&quot;left_attach&quot;&gt;1&lt;/property&gt;
-                                        &lt;property name=&quot;right_attach&quot;&gt;2&lt;/property&gt;
-                                        &lt;property name=&quot;top_attach&quot;&gt;1&lt;/property&gt;
-                                        &lt;property name=&quot;bottom_attach&quot;&gt;2&lt;/property&gt;
-                                      &lt;/packing&gt;
-                                    &lt;/child&gt;
 
                                       &lt;/object&gt;
                                       &lt;packing&gt;
@@ -2684,7 +2651,7 @@ You can edit these and add additional options.
 
 Default values will not be shown. The defaults are:
 ref=1:mixed-refs=0:bframes=0:direct=spatial:b-pyramid=0:
-weightb=0:brdo=0:bime=0:me=hex:merange=16:subme=5:
+weightb=0:me=hex:merange=16:subme=5:
 analyse=some:8x8dct=0:deblock=0,0:trellis=0:
 no-fast-pskip=0:no-dct-decimate=0:cabac=1&lt;/property&gt;
                                     &lt;property name=&quot;wrap_mode&quot;&gt;GTK_WRAP_CHAR&lt;/property&gt;
@@ -2842,7 +2809,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1&lt;/property&gt;
                                               &lt;object class=&quot;GtkComboBox&quot; id=&quot;x264_subme&quot;&gt;
                                                 &lt;property name=&quot;visible&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;
-                                                &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 7 is highest quality and slowest.  5 or 6 are commonly used values.&lt;/property&gt;
+                                                &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;Determines how motion estimation decisions are made. 1 is lowest quality and fastest. 9 is highest quality and slowest.  5 or 6 are commonly used values.&lt;/property&gt;
                                                 &lt;signal handler=&quot;x264_widget_changed_cb&quot; name=&quot;changed&quot;/&gt;
                                               &lt;/object&gt;
                                             &lt;/child&gt;
@@ -4920,12 +4887,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<string>some</string>
 			<key>x264_bframes</key>
 			<integer>0</integer>
-			<key>x264_bime</key>
-			<false />
 			<key>x264_bpyramid</key>
 			<false />
-			<key>x264_brdo</key>
-			<false />
 			<key>x264_cabac</key>
 			<true />
 			<key>x264_deblock_alpha</key>
@@ -5150,7 +5113,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
+			<string>ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -5302,7 +5265,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>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</string>
+			<string>ref=16:mixed-refs:bframes=16:weightb: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</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -5444,7 +5407,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_target</key>
 			<true />
 			<key>x264_options</key>
-			<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
+			<string>ref=3:mixed-refs:bframes=16:weightb:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -5584,7 +5547,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_constant</key>
 			<true />
 			<key>x264_options</key>
-			<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>
+			<string>ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -5655,7 +5618,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
+			<string>ref=5:mixed-refs:bframes=3:weightb:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -5726,7 +5689,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>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</string>
+			<string>ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -6004,7 +5967,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip</string>
+			<string>ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -6075,7 +6038,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
+			<string>ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -6142,7 +6105,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 			<key>vquality_type_bitrate</key>
 			<true />
 			<key>x264_options</key>
-			<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>
+			<string>level=40:ref=2:mixed-refs:bframes=3:weightb:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>
 		</dict>
 		<dict>
 			<key>anamorphic</key>
@@ -6450,8 +6413,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 		<key>x264_bframes</key>
 		<array>
 			<string>x264_weighted_bframes</string>
-			<string>x264_brdo</string>
-			<string>x264_bime</string>
 			<string>x264_bpyramid</string>
 			<string>x264_direct</string>
 		</array>
@@ -6467,10 +6428,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 		<array>
 			<string>x264_mixed_refs</string>
 		</array>
-		<key>x264_subme</key>
-		<array>
-			<string>x264_brdo</string>
-		</array>
 	</dict>
 	<key>widget-reverse-deps</key>
 	<dict>
@@ -6782,14 +6739,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 				<false />
 			</array>
 		</array>
-		<key>x264_bime</key>
-		<array>
-			<array>
-				<string>x264_bframes</string>
-				<string>0</string>
-				<true />
-			</array>
-		</array>
 		<key>x264_bpyramid</key>
 		<array>
 			<array>
@@ -6798,19 +6747,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
 				<true />
 			</array>
 		</array>
-		<key>x264_brdo</key>
-		<array>
-			<array>
-				<string>x264_bframes</string>
-				<string>0</string>
-				<true />
-			</array>
-			<array>
-				<string>x264_subme</string>
-				<string>&lt;6</string>
-				<true />
-			</array>
-		</array>
 		<key>x264_direct</key>
 		<array>
 			<array>
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 5ae60679d..9d147d58a 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -71,7 +71,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
+		<string>ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -223,7 +223,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>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</string>
+		<string>ref=16:mixed-refs:bframes=16:weightb: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</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -365,7 +365,7 @@
 		<key>vquality_type_target</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
+		<string>ref=3:mixed-refs:bframes=16:weightb:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -505,7 +505,7 @@
 		<key>vquality_type_constant</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>
+		<string>ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -576,7 +576,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
+		<string>ref=5:mixed-refs:bframes=3:weightb:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -647,7 +647,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>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</string>
+		<string>ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -925,7 +925,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip</string>
+		<string>ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -996,7 +996,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
+		<string>ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
@@ -1063,7 +1063,7 @@
 		<key>vquality_type_bitrate</key>
 		<true />
 		<key>x264_options</key>
-		<string>level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>
+		<string>level=40:ref=2:mixed-refs:bframes=3:weightb:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1</string>
 	</dict>
 	<dict>
 		<key>preset_name</key>
diff --git a/gtk/src/widget_deps b/gtk/src/widget_deps
index ceb6c79fb..c7150471f 100644
--- a/gtk/src/widget_deps
+++ b/gtk/src/widget_deps
@@ -92,8 +92,6 @@
 	<key>x264_bframes</key>
 	<array>
 		<string>x264_weighted_bframes</string>
-		<string>x264_brdo</string>
-		<string>x264_bime</string>
 		<string>x264_bpyramid</string>
 		<string>x264_direct</string>
 	</array>
@@ -109,9 +107,5 @@
 	<array>
 		<string>x264_mixed_refs</string>
 	</array>
-	<key>x264_subme</key>
-	<array>
-		<string>x264_brdo</string>
-	</array>
 </dict>
 </plist>
diff --git a/gtk/src/widget_reverse_deps b/gtk/src/widget_reverse_deps
index 21304aae9..bae2d8e02 100644
--- a/gtk/src/widget_reverse_deps
+++ b/gtk/src/widget_reverse_deps
@@ -310,14 +310,6 @@
 			<false />
 		</array>
 	</array>
-	<key>x264_bime</key>
-	<array>
-		<array>
-			<string>x264_bframes</string>
-			<string>0</string>
-			<true />
-		</array>
-	</array>
 	<key>x264_bpyramid</key>
 	<array>
 		<array>
@@ -326,19 +318,6 @@
 			<true />
 		</array>
 	</array>
-	<key>x264_brdo</key>
-	<array>
-		<array>
-			<string>x264_bframes</string>
-			<string>0</string>
-			<true />
-		</array>
-		<array>
-			<string>x264_subme</string>
-			<string>&lt;6</string>
-			<true />
-		</array>
-	</array>
 	<key>x264_direct</key>
 	<array>
 		<array>
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 8f8576c94..1ff2c414c 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -111,8 +111,6 @@ static gchar *x264_bframes_syns[] = {"bframes", NULL};
 static gchar *x264_direct_syns[] = 
 	{"direct", "direct-pred", "direct_pred", NULL};
 static gchar *x264_weightb_syns[] = {"weightb", "weight-b", "weight_b", NULL};
-static gchar *x264_brdo_syns[] = {"brdo", "b-rdo", "b_rdo", NULL};
-static gchar *x264_bime_syns[] = {"bime", NULL};
 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};
@@ -145,8 +143,6 @@ struct x264_opt_map_s x264_opt_map[] =
 	{x264_bframes_syns, "x264_bframes", "0", X264_OPT_INT},
 	{x264_direct_syns, "x264_direct", "spatial", X264_OPT_COMBO},
 	{x264_weightb_syns, "x264_weighted_bframes", "0", X264_OPT_BOOL},
-	{x264_brdo_syns, "x264_brdo", "0", X264_OPT_BOOL},
-	{x264_bime_syns, "x264_bime", "0", X264_OPT_BOOL},
 	{x264_bpyramid_syns, "x264_bpyramid", "0", X264_OPT_BOOL},
 	{x264_me_syns, "x264_me", "hex", X264_OPT_COMBO},
 	{x264_merange_syns, "x264_merange", "16", X264_OPT_INT},
@@ -575,19 +571,10 @@ sanitize_x264opts(signal_user_data_t *ud, const gchar *options)
 	{
 		x264_remove_opt(split, x264_mixed_syns);
 	}
-	gint subme;
-
-	subme = ghb_settings_combo_int(ud->settings, "x264_subme");
-	if (subme < 6)
-	{
-		x264_remove_opt(split, x264_brdo_syns);
-	}
 	gint bframes = ghb_settings_get_int(ud->settings, "x264_bframes");
 	if (bframes == 0)
 	{
 		x264_remove_opt(split, x264_weightb_syns);
-		x264_remove_opt(split, x264_brdo_syns);
-		x264_remove_opt(split, x264_bime_syns);
 		x264_remove_opt(split, x264_direct_syns);
 	}
 	if (bframes <= 1)