OSDN Git Service

WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 9 Oct 2008 18:02:07 +0000 (18:02 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 9 Oct 2008 18:02:07 +0000 (18:02 +0000)
- Removes Brdo and Bime checkboxes from the advanced tab.
- Subme now goes up to 9

git-svn-id: svn://localhost/HandBrake/trunk@1822 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/C#/Functions/x264Panel.cs
win/C#/frmMain.Designer.cs
win/C#/frmMain.resx

index 6296258..2701757 100644 (file)
@@ -14,8 +14,6 @@ namespace Handbrake.Functions
         public void reset2Defaults(frmMain mainWindow)\r
         {\r
             mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_bFrameRateDistortion.CheckState = CheckState.Unchecked;\r
-            mainWindow.check_BidirectionalRefinement.CheckState = CheckState.Unchecked;\r
             mainWindow.check_Cabac.CheckState = CheckState.Checked;\r
             mainWindow.check_mixedReferences.CheckState = CheckState.Unchecked;\r
             mainWindow.check_noDCTDecimate.CheckState = CheckState.Unchecked;\r
@@ -125,18 +123,10 @@ namespace Handbrake.Functions
                         else if (optName.Equals("weightb"))\r
                             mainWindow.check_weightedBFrames.CheckState = CheckState.Checked;\r
 \r
-                        /*BRDO NSPopUpButton*/\r
-                        else if (optName.Equals("brdo"))\r
-                            mainWindow.check_bFrameRateDistortion.CheckState = CheckState.Checked;\r
-\r
                         /*B Pyramid NSPopUpButton*/\r
                         else if (optName.Equals("b-pyramid"))\r
                             mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Checked;\r
 \r
-                        /*Bidirectional Motion Estimation Refinement NSPopUpButton*/\r
-                        else if (optName.Equals("bime"))\r
-                            mainWindow.check_BidirectionalRefinement.CheckState = CheckState.Checked;\r
-\r
                         /*Direct B-frame Prediction NSPopUpButton*/\r
                         else if (optName.Equals("direct"))\r
                         {\r
@@ -305,10 +295,6 @@ namespace Handbrake.Functions
             if (input.Equals("weight-b") || input.Equals("weight_b"))\r
                 cleanOptNameString = "weightb";\r
 \r
-            /*BRDO*/\r
-            if (input.Equals("b-rdo") || input.Equals("b_rdo"))\r
-                cleanOptNameString = "brdo";\r
-\r
             /*B Pyramid*/\r
             if (input.Equals("b_pyramid"))\r
                 cleanOptNameString = "b-pyramid";\r
@@ -428,20 +414,6 @@ namespace Handbrake.Functions
                             else\r
                                 thisOpt = "";\r
                         }\r
-                        else if (optNameToChange.Equals("brdo"))\r
-                        {\r
-                            if (mainWindow.check_bFrameRateDistortion.CheckState == CheckState.Checked)\r
-                                thisOpt = "brdo=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
-                        else if (optNameToChange.Equals("bime"))\r
-                        {\r
-                            if (mainWindow.check_BidirectionalRefinement.CheckState == CheckState.Checked)\r
-                                thisOpt = "bime=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
                         else if (optNameToChange.Equals("b-pyramid"))\r
                         {\r
                             if (mainWindow.check_pyrmidalBFrames.CheckState == CheckState.Checked)\r
@@ -707,16 +679,6 @@ namespace Handbrake.Functions
                 if (mainWindow.check_weightedBFrames.CheckState == CheckState.Checked)\r
                     query = query + colon + "weightb=1";\r
             }\r
-            else if (optNameToChange.Equals("brdo"))\r
-            {\r
-                if (mainWindow.check_bFrameRateDistortion.CheckState == CheckState.Checked)\r
-                    query = query + colon + "brdo=1";\r
-            }\r
-            else if (optNameToChange.Equals("bime"))\r
-            {\r
-                if (mainWindow.check_BidirectionalRefinement.CheckState == CheckState.Checked)\r
-                    query = query + colon + "bime=1";\r
-            }\r
             else if (optNameToChange.Equals("b-pyramid"))\r
             {\r
                 if (mainWindow.check_pyrmidalBFrames.CheckState == CheckState.Checked)\r
@@ -772,7 +734,6 @@ namespace Handbrake.Functions
             /* Lots of situations to cover.\r
                - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)\r
                - CABAC (when 0 turn off trellis)\r
-               - subme  (if under 6 turn off brdo)\r
                - analysis (if none, turn off 8x8dct)\r
                - refs (under 2, disable mixed-refs)\r
             */\r
@@ -782,16 +743,12 @@ namespace Handbrake.Functions
                    not to use b-frames at all. So disable the options\r
                    that can only be used when b-frames are enabled.        */\r
                 mainWindow.check_weightedBFrames.Visible = false;\r
-                mainWindow.check_bFrameRateDistortion.Visible = false;\r
                 mainWindow.check_pyrmidalBFrames.Visible = false;\r
-                mainWindow.check_BidirectionalRefinement.Visible = false;\r
                 mainWindow.drop_directPrediction.Visible = false;\r
                 mainWindow.lbl_direct_prediction.Visible = false;\r
 \r
                 mainWindow.check_weightedBFrames.CheckState = CheckState.Unchecked;\r
-                mainWindow.check_bFrameRateDistortion.CheckState = CheckState.Unchecked;\r
                 mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
-                mainWindow.check_BidirectionalRefinement.CheckState = CheckState.Unchecked;\r
                 mainWindow.drop_directPrediction.SelectedIndex = 0;\r
             }\r
             else if (mainWindow.drop_bFrames.SelectedIndex == 2)\r
@@ -801,12 +758,6 @@ namespace Handbrake.Functions
                 mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;\r
 \r
                 mainWindow.check_weightedBFrames.Visible = true;\r
-                mainWindow.check_BidirectionalRefinement.Visible = true;\r
-\r
-                /* Only show B-RDO if both bframes and subme allow it. */\r
-                if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)\r
-                    mainWindow.check_bFrameRateDistortion.Visible = true;\r
-\r
                 mainWindow.drop_directPrediction.Visible = true;\r
                 mainWindow.lbl_direct_prediction.Visible = true;\r
                 \r
@@ -815,12 +766,6 @@ namespace Handbrake.Functions
             {\r
                 mainWindow.check_weightedBFrames.Visible = true;\r
                 mainWindow.check_pyrmidalBFrames.Visible = true;\r
-                mainWindow.check_BidirectionalRefinement.Visible = true;\r
-\r
-                /* Only show B-RDO if both bframes and subme allow it. */\r
-                if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)\r
-                    mainWindow.check_bFrameRateDistortion.Visible = true;\r
-\r
                 mainWindow.drop_directPrediction.Visible = true;\r
                 mainWindow.lbl_direct_prediction.Visible = true;\r
             }\r
@@ -838,20 +783,6 @@ namespace Handbrake.Functions
                 mainWindow.lbl_trellis.Visible = true;\r
             }\r
 \r
-            if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex < 7 && mainWindow.drop_subpixelMotionEstimation.SelectedIndex != 0)\r
-            {\r
-                /* When subme < 6, B-RDO doesn't work. */\r
-                mainWindow.check_bFrameRateDistortion.Visible = false;\r
-                if (sender == "subq" && sender != "brdo")\r
-                    mainWindow.check_bFrameRateDistortion.CheckState = CheckState.Unchecked;\r
-            }\r
-            else if (mainWindow.drop_bFrames.SelectedIndex >= 2)\r
-            {\r
-                /* Make sure to only display B-RDO if allowed by both\r
-                   the subme and bframe option settings.               */\r
-                mainWindow.check_bFrameRateDistortion.Visible = true;\r
-            }\r
-\r
             if (mainWindow.drop_analysis.SelectedIndex == 1)\r
             {\r
                 /* No analysis? Disable 8x8dct */\r
index 66c4458..09ecf5e 100644 (file)
@@ -83,6 +83,25 @@ namespace Handbrake
             this.drp_audenc_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audmix_4 = new System.Windows.Forms.ComboBox();\r
             this.drop_format = new System.Windows.Forms.ComboBox();\r
+            this.check_customCrop = new System.Windows.Forms.RadioButton();\r
+            this.check_autoCrop = new System.Windows.Forms.RadioButton();\r
+            this.check_Cabac = new System.Windows.Forms.CheckBox();\r
+            this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();\r
+            this.check_noFastPSkip = new System.Windows.Forms.CheckBox();\r
+            this.drop_trellis = new System.Windows.Forms.ComboBox();\r
+            this.drop_deblockBeta = new System.Windows.Forms.ComboBox();\r
+            this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();\r
+            this.check_8x8DCT = new System.Windows.Forms.CheckBox();\r
+            this.drop_analysis = new System.Windows.Forms.ComboBox();\r
+            this.drop_subpixelMotionEstimation = new System.Windows.Forms.ComboBox();\r
+            this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();\r
+            this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();\r
+            this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();\r
+            this.check_weightedBFrames = new System.Windows.Forms.CheckBox();\r
+            this.drop_directPrediction = new System.Windows.Forms.ComboBox();\r
+            this.drop_bFrames = new System.Windows.Forms.ComboBox();\r
+            this.drop_refFrames = new System.Windows.Forms.ComboBox();\r
+            this.check_mixedReferences = new System.Windows.Forms.CheckBox();\r
             this.lbl_src_res = new System.Windows.Forms.Label();\r
             this.lbl_duration = new System.Windows.Forms.Label();\r
             this.label_duration = new System.Windows.Forms.Label();\r
@@ -165,8 +184,6 @@ namespace Handbrake
             this.slider_deblock = new System.Windows.Forms.TrackBar();\r
             this.label8 = new System.Windows.Forms.Label();\r
             this.lbl_deblockVal = new System.Windows.Forms.Label();\r
-            this.check_customCrop = new System.Windows.Forms.RadioButton();\r
-            this.check_autoCrop = new System.Windows.Forms.RadioButton();\r
             this.check_decomb = new System.Windows.Forms.CheckBox();\r
             this.label6 = new System.Windows.Forms.Label();\r
             this.drp_anamorphic = new System.Windows.Forms.ComboBox();\r
@@ -198,37 +215,18 @@ namespace Handbrake
             this.label43 = new System.Windows.Forms.Label();\r
             this.btn_reset = new System.Windows.Forms.Button();\r
             this.rtf_x264Query = new System.Windows.Forms.RichTextBox();\r
-            this.check_Cabac = new System.Windows.Forms.CheckBox();\r
-            this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();\r
-            this.check_noFastPSkip = new System.Windows.Forms.CheckBox();\r
             this.lbl_trellis = new System.Windows.Forms.Label();\r
-            this.drop_trellis = new System.Windows.Forms.ComboBox();\r
-            this.drop_deblockBeta = new System.Windows.Forms.ComboBox();\r
             this.label41 = new System.Windows.Forms.Label();\r
-            this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();\r
             this.panel3 = new System.Windows.Forms.Panel();\r
             this.panel1 = new System.Windows.Forms.Panel();\r
             this.panel2 = new System.Windows.Forms.Panel();\r
-            this.check_8x8DCT = new System.Windows.Forms.CheckBox();\r
             this.label45 = new System.Windows.Forms.Label();\r
-            this.drop_analysis = new System.Windows.Forms.ComboBox();\r
             this.label48 = new System.Windows.Forms.Label();\r
-            this.drop_subpixelMotionEstimation = new System.Windows.Forms.ComboBox();\r
             this.label49 = new System.Windows.Forms.Label();\r
-            this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();\r
             this.label54 = new System.Windows.Forms.Label();\r
-            this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();\r
-            this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();\r
-            this.check_BidirectionalRefinement = new System.Windows.Forms.CheckBox();\r
-            this.check_bFrameRateDistortion = new System.Windows.Forms.CheckBox();\r
-            this.check_weightedBFrames = new System.Windows.Forms.CheckBox();\r
             this.lbl_direct_prediction = new System.Windows.Forms.Label();\r
-            this.drop_directPrediction = new System.Windows.Forms.ComboBox();\r
             this.label62 = new System.Windows.Forms.Label();\r
-            this.drop_bFrames = new System.Windows.Forms.ComboBox();\r
             this.label64 = new System.Windows.Forms.Label();\r
-            this.drop_refFrames = new System.Windows.Forms.ComboBox();\r
-            this.check_mixedReferences = new System.Windows.Forms.CheckBox();\r
             this.tabPage4 = new System.Windows.Forms.TabPage();\r
             this.btn_clear = new System.Windows.Forms.Button();\r
             this.label34 = new System.Windows.Forms.Label();\r
@@ -958,93 +956,525 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.drop_format, "Select the file container format.");\r
             this.drop_format.SelectedIndexChanged += new System.EventHandler(this.drop_format_SelectedIndexChanged);\r
             // \r
-            // lbl_src_res\r
-            // \r
-            this.lbl_src_res.AutoSize = true;\r
-            this.lbl_src_res.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_src_res.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_src_res.Location = new System.Drawing.Point(405, 34);\r
-            this.lbl_src_res.Name = "lbl_src_res";\r
-            this.lbl_src_res.Size = new System.Drawing.Size(72, 12);\r
-            this.lbl_src_res.TabIndex = 13;\r
-            this.lbl_src_res.Text = "Select a Title";\r
-            // \r
-            // lbl_duration\r
+            // check_customCrop\r
             // \r
-            this.lbl_duration.AutoSize = true;\r
-            this.lbl_duration.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_duration.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_duration.Location = new System.Drawing.Point(553, 56);\r
-            this.lbl_duration.Name = "lbl_duration";\r
-            this.lbl_duration.Size = new System.Drawing.Size(72, 12);\r
-            this.lbl_duration.TabIndex = 43;\r
-            this.lbl_duration.Text = "Select a Title";\r
+            this.check_customCrop.AutoSize = true;\r
+            this.check_customCrop.Location = new System.Drawing.Point(16, 58);\r
+            this.check_customCrop.Name = "check_customCrop";\r
+            this.check_customCrop.Size = new System.Drawing.Size(74, 17);\r
+            this.check_customCrop.TabIndex = 34;\r
+            this.check_customCrop.Text = "Custom:";\r
+            this.ToolTip.SetToolTip(this.check_customCrop, "Set some custom cropping values.");\r
+            this.check_customCrop.UseVisualStyleBackColor = true;\r
+            this.check_customCrop.CheckedChanged += new System.EventHandler(this.check_customCrop_CheckedChanged);\r
             // \r
-            // label_duration\r
+            // check_autoCrop\r
             // \r
-            this.label_duration.AutoSize = true;\r
-            this.label_duration.BackColor = System.Drawing.Color.Transparent;\r
-            this.label_duration.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label_duration.Location = new System.Drawing.Point(486, 55);\r
-            this.label_duration.Name = "label_duration";\r
-            this.label_duration.Size = new System.Drawing.Size(61, 13);\r
-            this.label_duration.TabIndex = 42;\r
-            this.label_duration.Text = "Duration:";\r
+            this.check_autoCrop.AutoSize = true;\r
+            this.check_autoCrop.Checked = true;\r
+            this.check_autoCrop.Location = new System.Drawing.Point(16, 34);\r
+            this.check_autoCrop.Name = "check_autoCrop";\r
+            this.check_autoCrop.Size = new System.Drawing.Size(82, 17);\r
+            this.check_autoCrop.TabIndex = 33;\r
+            this.check_autoCrop.TabStop = true;\r
+            this.check_autoCrop.Text = "Automatic";\r
+            this.ToolTip.SetToolTip(this.check_autoCrop, "Automatically set cropping values.");\r
+            this.check_autoCrop.UseVisualStyleBackColor = true;\r
+            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\r
             // \r
-            // label7\r
+            // check_Cabac\r
             // \r
-            this.label7.AutoSize = true;\r
-            this.label7.BackColor = System.Drawing.Color.Transparent;\r
-            this.label7.Location = new System.Drawing.Point(311, 34);\r
-            this.label7.Name = "label7";\r
-            this.label7.Size = new System.Drawing.Size(52, 13);\r
-            this.label7.TabIndex = 12;\r
-            this.label7.Text = "Source:";\r
+            this.check_Cabac.AutoSize = true;\r
+            this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_Cabac.Checked = true;\r
+            this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;\r
+            this.check_Cabac.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_Cabac.Location = new System.Drawing.Point(536, 214);\r
+            this.check_Cabac.Name = "check_Cabac";\r
+            this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_Cabac.Size = new System.Drawing.Size(144, 16);\r
+            this.check_Cabac.TabIndex = 40;\r
+            this.check_Cabac.Text = "CABAC Entropy Coding:";\r
+            this.check_Cabac.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.ToolTip.SetToolTip(this.check_Cabac, resources.GetString("check_Cabac.ToolTip"));\r
+            this.check_Cabac.UseVisualStyleBackColor = true;\r
+            this.check_Cabac.CheckStateChanged += new System.EventHandler(this.check_Cabac_CheckedChanged);\r
             // \r
-            // DVD_Open\r
+            // check_noDCTDecimate\r
             // \r
-            this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";\r
+            this.check_noDCTDecimate.AutoSize = true;\r
+            this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_noDCTDecimate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_noDCTDecimate.Location = new System.Drawing.Point(562, 192);\r
+            this.check_noDCTDecimate.Name = "check_noDCTDecimate";\r
+            this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_noDCTDecimate.Size = new System.Drawing.Size(118, 16);\r
+            this.check_noDCTDecimate.TabIndex = 39;\r
+            this.check_noDCTDecimate.Text = "No DCT-Decimate:";\r
+            this.check_noDCTDecimate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.ToolTip.SetToolTip(this.check_noDCTDecimate, "Only use this with constant quality encoding. \r\nIt increases quality but also bit" +\r
+                    "rate/file size.");\r
+            this.check_noDCTDecimate.UseVisualStyleBackColor = true;\r
+            this.check_noDCTDecimate.CheckStateChanged += new System.EventHandler(this.check_noDCTDecimate_CheckedChanged);\r
             // \r
-            // File_Open\r
+            // check_noFastPSkip\r
             // \r
-            this.File_Open.DefaultExt = "hb";\r
-            this.File_Open.Filter = "hb|*.hb";\r
+            this.check_noFastPSkip.AutoSize = true;\r
+            this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_noFastPSkip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_noFastPSkip.Location = new System.Drawing.Point(444, 192);\r
+            this.check_noFastPSkip.Name = "check_noFastPSkip";\r
+            this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_noFastPSkip.Size = new System.Drawing.Size(103, 16);\r
+            this.check_noFastPSkip.TabIndex = 38;\r
+            this.check_noFastPSkip.Text = "No Fast-P-Skip:";\r
+            this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.ToolTip.SetToolTip(this.check_noFastPSkip, "This can help with blocking on solid colors like blue skies, \r\nbut it also slows " +\r
+                    "down the encode.");\r
+            this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
+            this.check_noFastPSkip.CheckStateChanged += new System.EventHandler(this.check_noFastPSkip_CheckedChanged);\r
             // \r
-            // ISO_Open\r
+            // drop_trellis\r
             // \r
-            this.ISO_Open.DefaultExt = "ISO";\r
-            this.ISO_Open.Filter = "All Files|*.*";\r
-            this.ISO_Open.RestoreDirectory = true;\r
-            this.ISO_Open.SupportMultiDottedExtensions = true;\r
+            this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_trellis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_trellis.FormattingEnabled = true;\r
+            this.drop_trellis.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "0",\r
+            "1",\r
+            "2"});\r
+            this.drop_trellis.Location = new System.Drawing.Point(537, 166);\r
+            this.drop_trellis.Name = "drop_trellis";\r
+            this.drop_trellis.Size = new System.Drawing.Size(143, 20);\r
+            this.drop_trellis.TabIndex = 37;\r
+            this.ToolTip.SetToolTip(this.drop_trellis, "Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate o" +\r
+                    "r increase quality. \r\nA value of 2 forces it to be used more often than a value " +\r
+                    "of 1.");\r
+            this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.drop_trellis_SelectedIndexChanged);\r
             // \r
-            // FileToolStripMenuItem\r
+            // drop_deblockBeta\r
             // \r
-            this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_exit});\r
-            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";\r
-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20);\r
-            this.FileToolStripMenuItem.Text = "&File";\r
+            this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_deblockBeta.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_deblockBeta.FormattingEnabled = true;\r
+            this.drop_deblockBeta.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "-6",\r
+            "-5",\r
+            "-4",\r
+            "-3",\r
+            "-2",\r
+            "-1",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6"});\r
+            this.drop_deblockBeta.Location = new System.Drawing.Point(611, 139);\r
+            this.drop_deblockBeta.Name = "drop_deblockBeta";\r
+            this.drop_deblockBeta.Size = new System.Drawing.Size(69, 20);\r
+            this.drop_deblockBeta.TabIndex = 36;\r
+            this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));\r
+            this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.drop_deblockBeta_SelectedIndexChanged);\r
             // \r
-            // mnu_exit\r
+            // drop_deblockAlpha\r
             // \r
-            this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(106, 22);\r
-            this.mnu_exit.Text = "E&xit";\r
-            this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
+            this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_deblockAlpha.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_deblockAlpha.FormattingEnabled = true;\r
+            this.drop_deblockAlpha.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "-6",\r
+            "-5",\r
+            "-4",\r
+            "-3",\r
+            "-2",\r
+            "-1",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6"});\r
+            this.drop_deblockAlpha.Location = new System.Drawing.Point(537, 139);\r
+            this.drop_deblockAlpha.Name = "drop_deblockAlpha";\r
+            this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 20);\r
+            this.drop_deblockAlpha.TabIndex = 35;\r
+            this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));\r
+            this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.drop_deblockAlpha_SelectedIndexChanged);\r
             // \r
-            // mnu_open3\r
+            // check_8x8DCT\r
             // \r
-            this.mnu_open3.Name = "mnu_open3";\r
-            this.mnu_open3.Size = new System.Drawing.Size(32, 19);\r
+            this.check_8x8DCT.AutoSize = true;\r
+            this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_8x8DCT.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_8x8DCT.Location = new System.Drawing.Point(608, 106);\r
+            this.check_8x8DCT.Name = "check_8x8DCT";\r
+            this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_8x8DCT.Size = new System.Drawing.Size(71, 16);\r
+            this.check_8x8DCT.TabIndex = 34;\r
+            this.check_8x8DCT.Text = "8x8 DCT:";\r
+            this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));\r
+            this.check_8x8DCT.UseVisualStyleBackColor = true;\r
+            this.check_8x8DCT.CheckStateChanged += new System.EventHandler(this.check_8x8DCT_CheckedChanged);\r
             // \r
-            // ToolsToolStripMenuItem\r
+            // drop_analysis\r
             // \r
-            this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_encode,\r
-            this.mnu_encodeLog,\r
-            this.ToolStripSeparator5,\r
-            this.mnu_options});\r
-            this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";\r
+            this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_analysis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_analysis.FormattingEnabled = true;\r
+            this.drop_analysis.Items.AddRange(new object[] {\r
+            "Default (some)",\r
+            "None",\r
+            "All"});\r
+            this.drop_analysis.Location = new System.Drawing.Point(537, 105);\r
+            this.drop_analysis.Name = "drop_analysis";\r
+            this.drop_analysis.Size = new System.Drawing.Size(63, 20);\r
+            this.drop_analysis.TabIndex = 33;\r
+            this.ToolTip.SetToolTip(this.drop_analysis, resources.GetString("drop_analysis.ToolTip"));\r
+            this.drop_analysis.SelectedIndexChanged += new System.EventHandler(this.drop_analysis_SelectedIndexChanged);\r
+            // \r
+            // drop_subpixelMotionEstimation\r
+            // \r
+            this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
+            this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
+            "Default (6)",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9"});\r
+            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(537, 69);\r
+            this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";\r
+            this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 20);\r
+            this.drop_subpixelMotionEstimation.TabIndex = 32;\r
+            this.ToolTip.SetToolTip(this.drop_subpixelMotionEstimation, resources.GetString("drop_subpixelMotionEstimation.ToolTip"));\r
+            this.drop_subpixelMotionEstimation.SelectedIndexChanged += new System.EventHandler(this.drop_subpixelMotionEstimation_SelectedIndexChanged);\r
+            // \r
+            // drop_MotionEstimationRange\r
+            // \r
+            this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_MotionEstimationRange.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_MotionEstimationRange.FormattingEnabled = true;\r
+            this.drop_MotionEstimationRange.Items.AddRange(new object[] {\r
+            "Default (16)",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9",\r
+            "10",\r
+            "11",\r
+            "12",\r
+            "13",\r
+            "14",\r
+            "15",\r
+            "16",\r
+            "17",\r
+            "18",\r
+            "19",\r
+            "20",\r
+            "21",\r
+            "22",\r
+            "23",\r
+            "24",\r
+            "25",\r
+            "26",\r
+            "27",\r
+            "28",\r
+            "29",\r
+            "30",\r
+            "31",\r
+            "32",\r
+            "33",\r
+            "34",\r
+            "35",\r
+            "36",\r
+            "37",\r
+            "38",\r
+            "39",\r
+            "40",\r
+            "41",\r
+            "42",\r
+            "43",\r
+            "44",\r
+            "45",\r
+            "46",\r
+            "47",\r
+            "48",\r
+            "49",\r
+            "50",\r
+            "51",\r
+            "52",\r
+            "53",\r
+            "54",\r
+            "55",\r
+            "56",\r
+            "57",\r
+            "58",\r
+            "59",\r
+            "60",\r
+            "61",\r
+            "62",\r
+            "63",\r
+            "64"});\r
+            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(537, 40);\r
+            this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";\r
+            this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 20);\r
+            this.drop_MotionEstimationRange.TabIndex = 31;\r
+            this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, resources.GetString("drop_MotionEstimationRange.ToolTip"));\r
+            this.drop_MotionEstimationRange.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationRange_SelectedIndexChanged);\r
+            // \r
+            // drop_MotionEstimationMethod\r
+            // \r
+            this.drop_MotionEstimationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_MotionEstimationMethod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_MotionEstimationMethod.FormattingEnabled = true;\r
+            this.drop_MotionEstimationMethod.ItemHeight = 12;\r
+            this.drop_MotionEstimationMethod.Items.AddRange(new object[] {\r
+            "Default (Hexagon)",\r
+            "Diamond",\r
+            "Hexagon",\r
+            "Uneven Multi-Hexagon",\r
+            "Exhaustive"});\r
+            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(537, 11);\r
+            this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";\r
+            this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 20);\r
+            this.drop_MotionEstimationMethod.TabIndex = 30;\r
+            this.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));\r
+            this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationMethod_SelectedIndexChanged);\r
+            // \r
+            // check_pyrmidalBFrames\r
+            // \r
+            this.check_pyrmidalBFrames.AutoSize = true;\r
+            this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_pyrmidalBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(46, 165);\r
+            this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";\r
+            this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_pyrmidalBFrames.Size = new System.Drawing.Size(121, 16);\r
+            this.check_pyrmidalBFrames.TabIndex = 17;\r
+            this.check_pyrmidalBFrames.Text = "Pyrmidal B-Frames:";\r
+            this.check_pyrmidalBFrames.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));\r
+            this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
+            this.check_pyrmidalBFrames.CheckStateChanged += new System.EventHandler(this.check_pyrmidalBFrames_CheckedChanged);\r
+            // \r
+            // check_weightedBFrames\r
+            // \r
+            this.check_weightedBFrames.AutoSize = true;\r
+            this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_weightedBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_weightedBFrames.Location = new System.Drawing.Point(44, 144);\r
+            this.check_weightedBFrames.Name = "check_weightedBFrames";\r
+            this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_weightedBFrames.Size = new System.Drawing.Size(123, 16);\r
+            this.check_weightedBFrames.TabIndex = 14;\r
+            this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
+            this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip"));\r
+            this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
+            this.check_weightedBFrames.CheckStateChanged += new System.EventHandler(this.check_weightedBFrames_CheckedChanged);\r
+            // \r
+            // drop_directPrediction\r
+            // \r
+            this.drop_directPrediction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_directPrediction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_directPrediction.FormattingEnabled = true;\r
+            this.drop_directPrediction.Items.AddRange(new object[] {\r
+            "Default (Spatial)",\r
+            "None",\r
+            "Spatial",\r
+            "Temporal",\r
+            "Automatic"});\r
+            this.drop_directPrediction.Location = new System.Drawing.Point(157, 118);\r
+            this.drop_directPrediction.Name = "drop_directPrediction";\r
+            this.drop_directPrediction.Size = new System.Drawing.Size(121, 20);\r
+            this.drop_directPrediction.TabIndex = 13;\r
+            this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));\r
+            this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.drop_directPrediction_SelectedIndexChanged);\r
+            // \r
+            // drop_bFrames\r
+            // \r
+            this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_bFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_bFrames.FormattingEnabled = true;\r
+            this.drop_bFrames.Items.AddRange(new object[] {\r
+            "Default (0)",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9",\r
+            "10",\r
+            "11",\r
+            "12",\r
+            "13",\r
+            "14",\r
+            "15",\r
+            "16"});\r
+            this.drop_bFrames.Location = new System.Drawing.Point(157, 91);\r
+            this.drop_bFrames.Name = "drop_bFrames";\r
+            this.drop_bFrames.Size = new System.Drawing.Size(121, 20);\r
+            this.drop_bFrames.TabIndex = 12;\r
+            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +\r
+                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +\r
+                    "l: 9-16. ");\r
+            this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);\r
+            // \r
+            // drop_refFrames\r
+            // \r
+            this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+            this.drop_refFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.drop_refFrames.FormattingEnabled = true;\r
+            this.drop_refFrames.Items.AddRange(new object[] {\r
+            "Default (1)",\r
+            "0",\r
+            "1",\r
+            "2",\r
+            "3",\r
+            "4",\r
+            "5",\r
+            "6",\r
+            "7",\r
+            "8",\r
+            "9",\r
+            "10",\r
+            "11",\r
+            "12",\r
+            "13",\r
+            "14",\r
+            "15",\r
+            "16"});\r
+            this.drop_refFrames.Location = new System.Drawing.Point(157, 37);\r
+            this.drop_refFrames.Name = "drop_refFrames";\r
+            this.drop_refFrames.Size = new System.Drawing.Size(121, 20);\r
+            this.drop_refFrames.TabIndex = 10;\r
+            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. The more you add, the higher the quality \97 but the slower th" +\r
+                    "e encode. ");\r
+            this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.drop_refFrames_SelectedIndexChanged);\r
+            // \r
+            // check_mixedReferences\r
+            // \r
+            this.check_mixedReferences.AutoSize = true;\r
+            this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.check_mixedReferences.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.check_mixedReferences.Location = new System.Drawing.Point(54, 63);\r
+            this.check_mixedReferences.Name = "check_mixedReferences";\r
+            this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+            this.check_mixedReferences.Size = new System.Drawing.Size(114, 16);\r
+            this.check_mixedReferences.TabIndex = 11;\r
+            this.check_mixedReferences.Text = "Mixed References:";\r
+            this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+            this.ToolTip.SetToolTip(this.check_mixedReferences, "With this on, different parts of a frame will refer back to different prior frame" +\r
+                    "s, \r\ndepending on what\'s best for that part of the image. ");\r
+            this.check_mixedReferences.UseVisualStyleBackColor = true;\r
+            this.check_mixedReferences.CheckStateChanged += new System.EventHandler(this.check_mixedReferences_CheckedChanged);\r
+            // \r
+            // lbl_src_res\r
+            // \r
+            this.lbl_src_res.AutoSize = true;\r
+            this.lbl_src_res.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_src_res.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_src_res.Location = new System.Drawing.Point(405, 34);\r
+            this.lbl_src_res.Name = "lbl_src_res";\r
+            this.lbl_src_res.Size = new System.Drawing.Size(72, 12);\r
+            this.lbl_src_res.TabIndex = 13;\r
+            this.lbl_src_res.Text = "Select a Title";\r
+            // \r
+            // lbl_duration\r
+            // \r
+            this.lbl_duration.AutoSize = true;\r
+            this.lbl_duration.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_duration.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_duration.Location = new System.Drawing.Point(553, 56);\r
+            this.lbl_duration.Name = "lbl_duration";\r
+            this.lbl_duration.Size = new System.Drawing.Size(72, 12);\r
+            this.lbl_duration.TabIndex = 43;\r
+            this.lbl_duration.Text = "Select a Title";\r
+            // \r
+            // label_duration\r
+            // \r
+            this.label_duration.AutoSize = true;\r
+            this.label_duration.BackColor = System.Drawing.Color.Transparent;\r
+            this.label_duration.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label_duration.Location = new System.Drawing.Point(486, 55);\r
+            this.label_duration.Name = "label_duration";\r
+            this.label_duration.Size = new System.Drawing.Size(61, 13);\r
+            this.label_duration.TabIndex = 42;\r
+            this.label_duration.Text = "Duration:";\r
+            // \r
+            // label7\r
+            // \r
+            this.label7.AutoSize = true;\r
+            this.label7.BackColor = System.Drawing.Color.Transparent;\r
+            this.label7.Location = new System.Drawing.Point(311, 34);\r
+            this.label7.Name = "label7";\r
+            this.label7.Size = new System.Drawing.Size(52, 13);\r
+            this.label7.TabIndex = 12;\r
+            this.label7.Text = "Source:";\r
+            // \r
+            // DVD_Open\r
+            // \r
+            this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";\r
+            // \r
+            // File_Open\r
+            // \r
+            this.File_Open.DefaultExt = "hb";\r
+            this.File_Open.Filter = "hb|*.hb";\r
+            // \r
+            // ISO_Open\r
+            // \r
+            this.ISO_Open.DefaultExt = "ISO";\r
+            this.ISO_Open.Filter = "All Files|*.*";\r
+            this.ISO_Open.RestoreDirectory = true;\r
+            this.ISO_Open.SupportMultiDottedExtensions = true;\r
+            // \r
+            // FileToolStripMenuItem\r
+            // \r
+            this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_exit});\r
+            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";\r
+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(38, 20);\r
+            this.FileToolStripMenuItem.Text = "&File";\r
+            // \r
+            // mnu_exit\r
+            // \r
+            this.mnu_exit.Name = "mnu_exit";\r
+            this.mnu_exit.Size = new System.Drawing.Size(106, 22);\r
+            this.mnu_exit.Text = "E&xit";\r
+            this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
+            // \r
+            // mnu_open3\r
+            // \r
+            this.mnu_open3.Name = "mnu_open3";\r
+            this.mnu_open3.Size = new System.Drawing.Size(32, 19);\r
+            // \r
+            // ToolsToolStripMenuItem\r
+            // \r
+            this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.mnu_encode,\r
+            this.mnu_encodeLog,\r
+            this.ToolStripSeparator5,\r
+            this.mnu_options});\r
+            this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";\r
             this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(49, 20);\r
             this.ToolsToolStripMenuItem.Text = "&Tools";\r
             // \r
@@ -1886,32 +2316,6 @@ namespace Handbrake
             this.lbl_deblockVal.TabIndex = 36;\r
             this.lbl_deblockVal.Text = "Off";\r
             // \r
-            // check_customCrop\r
-            // \r
-            this.check_customCrop.AutoSize = true;\r
-            this.check_customCrop.Location = new System.Drawing.Point(16, 58);\r
-            this.check_customCrop.Name = "check_customCrop";\r
-            this.check_customCrop.Size = new System.Drawing.Size(74, 17);\r
-            this.check_customCrop.TabIndex = 34;\r
-            this.check_customCrop.Text = "Custom:";\r
-            this.ToolTip.SetToolTip(this.check_customCrop, "Set some custom cropping values.");\r
-            this.check_customCrop.UseVisualStyleBackColor = true;\r
-            this.check_customCrop.CheckedChanged += new System.EventHandler(this.check_customCrop_CheckedChanged);\r
-            // \r
-            // check_autoCrop\r
-            // \r
-            this.check_autoCrop.AutoSize = true;\r
-            this.check_autoCrop.Checked = true;\r
-            this.check_autoCrop.Location = new System.Drawing.Point(16, 34);\r
-            this.check_autoCrop.Name = "check_autoCrop";\r
-            this.check_autoCrop.Size = new System.Drawing.Size(82, 17);\r
-            this.check_autoCrop.TabIndex = 33;\r
-            this.check_autoCrop.TabStop = true;\r
-            this.check_autoCrop.Text = "Automatic";\r
-            this.ToolTip.SetToolTip(this.check_autoCrop, "Automatically set cropping values.");\r
-            this.check_autoCrop.UseVisualStyleBackColor = true;\r
-            this.check_autoCrop.CheckedChanged += new System.EventHandler(this.check_autoCrop_CheckedChanged);\r
-            // \r
             // check_decomb\r
             // \r
             this.check_decomb.AutoSize = true;\r
@@ -2268,8 +2672,6 @@ namespace Handbrake
             this.h264Tab.Controls.Add(this.label54);\r
             this.h264Tab.Controls.Add(this.drop_MotionEstimationMethod);\r
             this.h264Tab.Controls.Add(this.check_pyrmidalBFrames);\r
-            this.h264Tab.Controls.Add(this.check_BidirectionalRefinement);\r
-            this.h264Tab.Controls.Add(this.check_bFrameRateDistortion);\r
             this.h264Tab.Controls.Add(this.check_weightedBFrames);\r
             this.h264Tab.Controls.Add(this.lbl_direct_prediction);\r
             this.h264Tab.Controls.Add(this.drop_directPrediction);\r
@@ -2318,58 +2720,6 @@ namespace Handbrake
             this.rtf_x264Query.LostFocus += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
             this.rtf_x264Query.TextChanged += new System.EventHandler(this.rtf_x264Query_TextChanged);\r
             // \r
-            // check_Cabac\r
-            // \r
-            this.check_Cabac.AutoSize = true;\r
-            this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_Cabac.Checked = true;\r
-            this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;\r
-            this.check_Cabac.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_Cabac.Location = new System.Drawing.Point(536, 214);\r
-            this.check_Cabac.Name = "check_Cabac";\r
-            this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_Cabac.Size = new System.Drawing.Size(144, 16);\r
-            this.check_Cabac.TabIndex = 40;\r
-            this.check_Cabac.Text = "CABAC Entropy Coding:";\r
-            this.check_Cabac.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_Cabac, resources.GetString("check_Cabac.ToolTip"));\r
-            this.check_Cabac.UseVisualStyleBackColor = true;\r
-            this.check_Cabac.CheckStateChanged += new System.EventHandler(this.check_Cabac_CheckedChanged);\r
-            // \r
-            // check_noDCTDecimate\r
-            // \r
-            this.check_noDCTDecimate.AutoSize = true;\r
-            this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_noDCTDecimate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noDCTDecimate.Location = new System.Drawing.Point(562, 192);\r
-            this.check_noDCTDecimate.Name = "check_noDCTDecimate";\r
-            this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_noDCTDecimate.Size = new System.Drawing.Size(118, 16);\r
-            this.check_noDCTDecimate.TabIndex = 39;\r
-            this.check_noDCTDecimate.Text = "No DCT-Decimate:";\r
-            this.check_noDCTDecimate.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_noDCTDecimate, "Only use this with constant quality encoding. \r\nIt increases quality but also bit" +\r
-                    "rate/file size.");\r
-            this.check_noDCTDecimate.UseVisualStyleBackColor = true;\r
-            this.check_noDCTDecimate.CheckStateChanged += new System.EventHandler(this.check_noDCTDecimate_CheckedChanged);\r
-            // \r
-            // check_noFastPSkip\r
-            // \r
-            this.check_noFastPSkip.AutoSize = true;\r
-            this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_noFastPSkip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_noFastPSkip.Location = new System.Drawing.Point(444, 192);\r
-            this.check_noFastPSkip.Name = "check_noFastPSkip";\r
-            this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_noFastPSkip.Size = new System.Drawing.Size(103, 16);\r
-            this.check_noFastPSkip.TabIndex = 38;\r
-            this.check_noFastPSkip.Text = "No Fast-P-Skip:";\r
-            this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_noFastPSkip, "This can help with blocking on solid colors like blue skies, \r\nbut it also slows " +\r
-                    "down the encode.");\r
-            this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
-            this.check_noFastPSkip.CheckStateChanged += new System.EventHandler(this.check_noFastPSkip_CheckedChanged);\r
-            // \r
             // lbl_trellis\r
             // \r
             this.lbl_trellis.AutoSize = true;\r
@@ -2380,52 +2730,6 @@ namespace Handbrake
             this.lbl_trellis.TabIndex = 26;\r
             this.lbl_trellis.Text = "Trellis:";\r
             // \r
-            // drop_trellis\r
-            // \r
-            this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_trellis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_trellis.FormattingEnabled = true;\r
-            this.drop_trellis.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "0",\r
-            "1",\r
-            "2"});\r
-            this.drop_trellis.Location = new System.Drawing.Point(537, 166);\r
-            this.drop_trellis.Name = "drop_trellis";\r
-            this.drop_trellis.Size = new System.Drawing.Size(143, 20);\r
-            this.drop_trellis.TabIndex = 37;\r
-            this.ToolTip.SetToolTip(this.drop_trellis, "Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate o" +\r
-                    "r increase quality. \r\nA value of 2 forces it to be used more often than a value " +\r
-                    "of 1.");\r
-            this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.drop_trellis_SelectedIndexChanged);\r
-            // \r
-            // drop_deblockBeta\r
-            // \r
-            this.drop_deblockBeta.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deblockBeta.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_deblockBeta.FormattingEnabled = true;\r
-            this.drop_deblockBeta.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "-6",\r
-            "-5",\r
-            "-4",\r
-            "-3",\r
-            "-2",\r
-            "-1",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6"});\r
-            this.drop_deblockBeta.Location = new System.Drawing.Point(611, 139);\r
-            this.drop_deblockBeta.Name = "drop_deblockBeta";\r
-            this.drop_deblockBeta.Size = new System.Drawing.Size(69, 20);\r
-            this.drop_deblockBeta.TabIndex = 36;\r
-            this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));\r
-            this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.drop_deblockBeta_SelectedIndexChanged);\r
-            // \r
             // label41\r
             // \r
             this.label41.AutoSize = true;\r
@@ -2436,33 +2740,6 @@ namespace Handbrake
             this.label41.TabIndex = 25;\r
             this.label41.Text = "Deblocking:";\r
             // \r
-            // drop_deblockAlpha\r
-            // \r
-            this.drop_deblockAlpha.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_deblockAlpha.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_deblockAlpha.FormattingEnabled = true;\r
-            this.drop_deblockAlpha.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "-6",\r
-            "-5",\r
-            "-4",\r
-            "-3",\r
-            "-2",\r
-            "-1",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6"});\r
-            this.drop_deblockAlpha.Location = new System.Drawing.Point(537, 139);\r
-            this.drop_deblockAlpha.Name = "drop_deblockAlpha";\r
-            this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 20);\r
-            this.drop_deblockAlpha.TabIndex = 35;\r
-            this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));\r
-            this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.drop_deblockAlpha_SelectedIndexChanged);\r
-            // \r
             // panel3\r
             // \r
             this.panel3.BackColor = System.Drawing.Color.Black;\r
@@ -2490,48 +2767,16 @@ namespace Handbrake
             this.panel2.Size = new System.Drawing.Size(284, 1);\r
             this.panel2.TabIndex = 21;\r
             // \r
-            // check_8x8DCT\r
-            // \r
-            this.check_8x8DCT.AutoSize = true;\r
-            this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_8x8DCT.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_8x8DCT.Location = new System.Drawing.Point(608, 106);\r
-            this.check_8x8DCT.Name = "check_8x8DCT";\r
-            this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_8x8DCT.Size = new System.Drawing.Size(71, 16);\r
-            this.check_8x8DCT.TabIndex = 34;\r
-            this.check_8x8DCT.Text = "8x8 DCT:";\r
-            this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));\r
-            this.check_8x8DCT.UseVisualStyleBackColor = true;\r
-            this.check_8x8DCT.CheckStateChanged += new System.EventHandler(this.check_8x8DCT_CheckedChanged);\r
-            // \r
-            // label45\r
-            // \r
-            this.label45.AutoSize = true;\r
-            this.label45.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label45.Location = new System.Drawing.Point(478, 108);\r
-            this.label45.Name = "label45";\r
-            this.label45.Size = new System.Drawing.Size(53, 12);\r
-            this.label45.TabIndex = 22;\r
-            this.label45.Text = "Analysis:";\r
-            // \r
-            // drop_analysis\r
-            // \r
-            this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_analysis.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_analysis.FormattingEnabled = true;\r
-            this.drop_analysis.Items.AddRange(new object[] {\r
-            "Default (some)",\r
-            "None",\r
-            "All"});\r
-            this.drop_analysis.Location = new System.Drawing.Point(537, 105);\r
-            this.drop_analysis.Name = "drop_analysis";\r
-            this.drop_analysis.Size = new System.Drawing.Size(63, 20);\r
-            this.drop_analysis.TabIndex = 33;\r
-            this.ToolTip.SetToolTip(this.drop_analysis, resources.GetString("drop_analysis.ToolTip"));\r
-            this.drop_analysis.SelectedIndexChanged += new System.EventHandler(this.drop_analysis_SelectedIndexChanged);\r
-            // \r
+            // label45\r
+            // \r
+            this.label45.AutoSize = true;\r
+            this.label45.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label45.Location = new System.Drawing.Point(478, 108);\r
+            this.label45.Name = "label45";\r
+            this.label45.Size = new System.Drawing.Size(53, 12);\r
+            this.label45.TabIndex = 22;\r
+            this.label45.Text = "Analysis:";\r
+            // \r
             // label48\r
             // \r
             this.label48.AutoSize = true;\r
@@ -2542,28 +2787,6 @@ namespace Handbrake
             this.label48.TabIndex = 20;\r
             this.label48.Text = "Subpixel Motion Estimation:";\r
             // \r
-            // drop_subpixelMotionEstimation\r
-            // \r
-            this.drop_subpixelMotionEstimation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_subpixelMotionEstimation.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
-            this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
-            "Default (6)",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7"});\r
-            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(537, 69);\r
-            this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";\r
-            this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 20);\r
-            this.drop_subpixelMotionEstimation.TabIndex = 32;\r
-            this.ToolTip.SetToolTip(this.drop_subpixelMotionEstimation, resources.GetString("drop_subpixelMotionEstimation.ToolTip"));\r
-            this.drop_subpixelMotionEstimation.SelectedIndexChanged += new System.EventHandler(this.drop_subpixelMotionEstimation_SelectedIndexChanged);\r
-            // \r
             // label49\r
             // \r
             this.label49.AutoSize = true;\r
@@ -2574,81 +2797,6 @@ namespace Handbrake
             this.label49.TabIndex = 19;\r
             this.label49.Text = "Motion Estimation Range:";\r
             // \r
-            // drop_MotionEstimationRange\r
-            // \r
-            this.drop_MotionEstimationRange.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_MotionEstimationRange.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_MotionEstimationRange.FormattingEnabled = true;\r
-            this.drop_MotionEstimationRange.Items.AddRange(new object[] {\r
-            "Default (16)",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9",\r
-            "10",\r
-            "11",\r
-            "12",\r
-            "13",\r
-            "14",\r
-            "15",\r
-            "16",\r
-            "17",\r
-            "18",\r
-            "19",\r
-            "20",\r
-            "21",\r
-            "22",\r
-            "23",\r
-            "24",\r
-            "25",\r
-            "26",\r
-            "27",\r
-            "28",\r
-            "29",\r
-            "30",\r
-            "31",\r
-            "32",\r
-            "33",\r
-            "34",\r
-            "35",\r
-            "36",\r
-            "37",\r
-            "38",\r
-            "39",\r
-            "40",\r
-            "41",\r
-            "42",\r
-            "43",\r
-            "44",\r
-            "45",\r
-            "46",\r
-            "47",\r
-            "48",\r
-            "49",\r
-            "50",\r
-            "51",\r
-            "52",\r
-            "53",\r
-            "54",\r
-            "55",\r
-            "56",\r
-            "57",\r
-            "58",\r
-            "59",\r
-            "60",\r
-            "61",\r
-            "62",\r
-            "63",\r
-            "64"});\r
-            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(537, 40);\r
-            this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";\r
-            this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 20);\r
-            this.drop_MotionEstimationRange.TabIndex = 31;\r
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, resources.GetString("drop_MotionEstimationRange.ToolTip"));\r
-            this.drop_MotionEstimationRange.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationRange_SelectedIndexChanged);\r
-            // \r
             // label54\r
             // \r
             this.label54.AutoSize = true;\r
@@ -2659,88 +2807,6 @@ namespace Handbrake
             this.label54.TabIndex = 18;\r
             this.label54.Text = "Motion Estimation Method:";\r
             // \r
-            // drop_MotionEstimationMethod\r
-            // \r
-            this.drop_MotionEstimationMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_MotionEstimationMethod.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_MotionEstimationMethod.FormattingEnabled = true;\r
-            this.drop_MotionEstimationMethod.ItemHeight = 12;\r
-            this.drop_MotionEstimationMethod.Items.AddRange(new object[] {\r
-            "Default (Hexagon)",\r
-            "Diamond",\r
-            "Hexagon",\r
-            "Uneven Multi-Hexagon",\r
-            "Exhaustive"});\r
-            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(537, 11);\r
-            this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";\r
-            this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 20);\r
-            this.drop_MotionEstimationMethod.TabIndex = 30;\r
-            this.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));\r
-            this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.drop_MotionEstimationMethod_SelectedIndexChanged);\r
-            // \r
-            // check_pyrmidalBFrames\r
-            // \r
-            this.check_pyrmidalBFrames.AutoSize = true;\r
-            this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_pyrmidalBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(46, 198);\r
-            this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";\r
-            this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_pyrmidalBFrames.Size = new System.Drawing.Size(121, 16);\r
-            this.check_pyrmidalBFrames.TabIndex = 17;\r
-            this.check_pyrmidalBFrames.Text = "Pyrmidal B-Frames:";\r
-            this.check_pyrmidalBFrames.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));\r
-            this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
-            this.check_pyrmidalBFrames.CheckStateChanged += new System.EventHandler(this.check_pyrmidalBFrames_CheckedChanged);\r
-            // \r
-            // check_BidirectionalRefinement\r
-            // \r
-            this.check_BidirectionalRefinement.AutoSize = true;\r
-            this.check_BidirectionalRefinement.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_BidirectionalRefinement.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_BidirectionalRefinement.Location = new System.Drawing.Point(20, 180);\r
-            this.check_BidirectionalRefinement.Name = "check_BidirectionalRefinement";\r
-            this.check_BidirectionalRefinement.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_BidirectionalRefinement.Size = new System.Drawing.Size(147, 16);\r
-            this.check_BidirectionalRefinement.TabIndex = 16;\r
-            this.check_BidirectionalRefinement.Text = "Bidirectional Refinement:";\r
-            this.check_BidirectionalRefinement.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_BidirectionalRefinement, resources.GetString("check_BidirectionalRefinement.ToolTip"));\r
-            this.check_BidirectionalRefinement.UseVisualStyleBackColor = true;\r
-            this.check_BidirectionalRefinement.CheckStateChanged += new System.EventHandler(this.check_BidirectionalRefinement_CheckedChanged);\r
-            // \r
-            // check_bFrameRateDistortion\r
-            // \r
-            this.check_bFrameRateDistortion.AutoSize = true;\r
-            this.check_bFrameRateDistortion.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_bFrameRateDistortion.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_bFrameRateDistortion.Location = new System.Drawing.Point(20, 162);\r
-            this.check_bFrameRateDistortion.Name = "check_bFrameRateDistortion";\r
-            this.check_bFrameRateDistortion.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_bFrameRateDistortion.Size = new System.Drawing.Size(147, 16);\r
-            this.check_bFrameRateDistortion.TabIndex = 15;\r
-            this.check_bFrameRateDistortion.Text = "B-Frame Rate Distortion:";\r
-            this.check_bFrameRateDistortion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_bFrameRateDistortion, resources.GetString("check_bFrameRateDistortion.ToolTip"));\r
-            this.check_bFrameRateDistortion.UseVisualStyleBackColor = true;\r
-            this.check_bFrameRateDistortion.CheckStateChanged += new System.EventHandler(this.check_bFrameDistortion_CheckedChanged);\r
-            // \r
-            // check_weightedBFrames\r
-            // \r
-            this.check_weightedBFrames.AutoSize = true;\r
-            this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_weightedBFrames.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_weightedBFrames.Location = new System.Drawing.Point(44, 144);\r
-            this.check_weightedBFrames.Name = "check_weightedBFrames";\r
-            this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_weightedBFrames.Size = new System.Drawing.Size(123, 16);\r
-            this.check_weightedBFrames.TabIndex = 14;\r
-            this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
-            this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip"));\r
-            this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
-            this.check_weightedBFrames.CheckStateChanged += new System.EventHandler(this.check_weightedBFrames_CheckedChanged);\r
-            // \r
             // lbl_direct_prediction\r
             // \r
             this.lbl_direct_prediction.AutoSize = true;\r
@@ -2751,24 +2817,6 @@ namespace Handbrake
             this.lbl_direct_prediction.TabIndex = 5;\r
             this.lbl_direct_prediction.Text = "Direct Prediction:";\r
             // \r
-            // drop_directPrediction\r
-            // \r
-            this.drop_directPrediction.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_directPrediction.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_directPrediction.FormattingEnabled = true;\r
-            this.drop_directPrediction.Items.AddRange(new object[] {\r
-            "Default (Spatial)",\r
-            "None",\r
-            "Spatial",\r
-            "Temporal",\r
-            "Automatic"});\r
-            this.drop_directPrediction.Location = new System.Drawing.Point(157, 118);\r
-            this.drop_directPrediction.Name = "drop_directPrediction";\r
-            this.drop_directPrediction.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_directPrediction.TabIndex = 13;\r
-            this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));\r
-            this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.drop_directPrediction_SelectedIndexChanged);\r
-            // \r
             // label62\r
             // \r
             this.label62.AutoSize = true;\r
@@ -2779,39 +2827,6 @@ namespace Handbrake
             this.label62.TabIndex = 4;\r
             this.label62.Text = "B-Frames:";\r
             // \r
-            // drop_bFrames\r
-            // \r
-            this.drop_bFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_bFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_bFrames.FormattingEnabled = true;\r
-            this.drop_bFrames.Items.AddRange(new object[] {\r
-            "Default (0)",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9",\r
-            "10",\r
-            "11",\r
-            "12",\r
-            "13",\r
-            "14",\r
-            "15",\r
-            "16"});\r
-            this.drop_bFrames.Location = new System.Drawing.Point(157, 91);\r
-            this.drop_bFrames.Name = "drop_bFrames";\r
-            this.drop_bFrames.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_bFrames.TabIndex = 12;\r
-            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +\r
-                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +\r
-                    "l: 9-16. ");\r
-            this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.drop_bFrames_SelectedIndexChanged);\r
-            // \r
             // label64\r
             // \r
             this.label64.AutoSize = true;\r
@@ -2822,55 +2837,6 @@ namespace Handbrake
             this.label64.TabIndex = 1;\r
             this.label64.Text = "Reference Frames:";\r
             // \r
-            // drop_refFrames\r
-            // \r
-            this.drop_refFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-            this.drop_refFrames.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.drop_refFrames.FormattingEnabled = true;\r
-            this.drop_refFrames.Items.AddRange(new object[] {\r
-            "Default (1)",\r
-            "0",\r
-            "1",\r
-            "2",\r
-            "3",\r
-            "4",\r
-            "5",\r
-            "6",\r
-            "7",\r
-            "8",\r
-            "9",\r
-            "10",\r
-            "11",\r
-            "12",\r
-            "13",\r
-            "14",\r
-            "15",\r
-            "16"});\r
-            this.drop_refFrames.Location = new System.Drawing.Point(157, 37);\r
-            this.drop_refFrames.Name = "drop_refFrames";\r
-            this.drop_refFrames.Size = new System.Drawing.Size(121, 20);\r
-            this.drop_refFrames.TabIndex = 10;\r
-            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. The more you add, the higher the quality \97 but the slower th" +\r
-                    "e encode. ");\r
-            this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.drop_refFrames_SelectedIndexChanged);\r
-            // \r
-            // check_mixedReferences\r
-            // \r
-            this.check_mixedReferences.AutoSize = true;\r
-            this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.check_mixedReferences.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.check_mixedReferences.Location = new System.Drawing.Point(54, 63);\r
-            this.check_mixedReferences.Name = "check_mixedReferences";\r
-            this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
-            this.check_mixedReferences.Size = new System.Drawing.Size(114, 16);\r
-            this.check_mixedReferences.TabIndex = 11;\r
-            this.check_mixedReferences.Text = "Mixed References:";\r
-            this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
-            this.ToolTip.SetToolTip(this.check_mixedReferences, "With this on, different parts of a frame will refer back to different prior frame" +\r
-                    "s, \r\ndepending on what\'s best for that part of the image. ");\r
-            this.check_mixedReferences.UseVisualStyleBackColor = true;\r
-            this.check_mixedReferences.CheckStateChanged += new System.EventHandler(this.check_mixedReferences_CheckedChanged);\r
-            // \r
             // tabPage4\r
             // \r
             this.tabPage4.Controls.Add(this.btn_clear);\r
@@ -3359,8 +3325,6 @@ namespace Handbrake
         internal System.Windows.Forms.Label label54;\r
         internal System.Windows.Forms.ComboBox drop_MotionEstimationMethod;\r
         internal System.Windows.Forms.CheckBox check_pyrmidalBFrames;\r
-        internal System.Windows.Forms.CheckBox check_BidirectionalRefinement;\r
-        internal System.Windows.Forms.CheckBox check_bFrameRateDistortion;\r
         internal System.Windows.Forms.CheckBox check_weightedBFrames;\r
         internal System.Windows.Forms.Label lbl_direct_prediction;\r
         internal System.Windows.Forms.ComboBox drop_directPrediction;\r
index be7f794..ed1b7ad 100644 (file)
@@ -161,18 +161,6 @@ Note: Do not change any of the chapter numbers!</value>
   <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>True</value>\r
   </metadata>\r
-  <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>223, 15</value>\r
-  </metadata>\r
-  <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>430, 18</value>\r
-  </metadata>\r
-  <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>329, 15</value>\r
-  </metadata>\r
-  <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>106, 15</value>\r
-  </metadata>\r
   <data name="check_Cabac.ToolTip" xml:space="preserve">\r
     <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15%. \r
 This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod 5.5G, and makes the AppleTV struggle. \r
@@ -247,15 +235,6 @@ Pyramidal B-frames mean that B-frames don't just reference surrounding reference
  instead, it also treats a previous B-frame as a reference, improving quality/lowering bitrate at the expense of complexity. \r
 Logically, to reference an earlier B-frame, you must tell x264 to use at least 2 B-frames.</value>\r
   </data>\r
-  <data name="check_BidirectionalRefinement.ToolTip" xml:space="preserve">\r
-    <value>When bidrectional motion estimation refinement is activated, x264 will optimize motion vectors both forwards and backwards in time. \r
-This improves quality, and while it slows down encoding, it does not make playback any more difficult. </value>\r
-  </data>\r
-  <data name="check_bFrameRateDistortion.ToolTip" xml:space="preserve">\r
-    <value>When B-frame rate distortion optimization is enabled, x264 tries several different methods of compression for each part of a frame, \r
-and chooses the one that looks the best. \r
-You need to use a subpixel motion estimation refinement level of 6 or 7 for this to work. </value>\r
-  </data>\r
   <data name="check_weightedBFrames.ToolTip" xml:space="preserve">\r
     <value>With weighted B-frame prediction enabled, x264 will consider how far away the previous and next P-frames are, \r
 before deciding to make a frame a B-frame. \r
@@ -269,6 +248,18 @@ You're best off setting this to automatic, so x264 decides which method is best
 Don't select none assuming it will be faster; instead it will take longer and look worse. \r
 If you're going to choose between spatial and temporal, spatial is usually better. </value>\r
   </data>\r
+  <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>223, 15</value>\r
+  </metadata>\r
+  <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>430, 18</value>\r
+  </metadata>\r
+  <metadata name="ISO_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>329, 15</value>\r
+  </metadata>\r
+  <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>106, 15</value>\r
+  </metadata>\r
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r