WinGui:

- Updates to the x264 panel.
- Added a Peak Framerate checkbox (--pfr cli option)

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

9 files changed, 578 insertions, 484 deletions

diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
index a28cbeeff..37fa3725e 100644
--- a/win/C#/Controls/x264Panel.Designer.cs
+++ b/win/C#/Controls/x264Panel.Designer.cs
@@ -47,15 +47,11 @@ namespace Handbrake.Controls
             this.rtf_x264Query = new System.Windows.Forms.RichTextBox();

             this.check_Cabac = new System.Windows.Forms.CheckBox();

             this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();

-            this.check_noFastPSkip = new System.Windows.Forms.CheckBox();

             this.lbl_trellis = new System.Windows.Forms.Label();

             this.drop_trellis = new System.Windows.Forms.ComboBox();

             this.drop_deblockBeta = new System.Windows.Forms.ComboBox();

             this.label41 = new System.Windows.Forms.Label();

             this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();

-            this.panel3 = new System.Windows.Forms.Panel();

-            this.panel1 = new System.Windows.Forms.Panel();

-            this.panel2 = new System.Windows.Forms.Panel();

             this.check_8x8DCT = new System.Windows.Forms.CheckBox();

             this.label45 = new System.Windows.Forms.Label();

             this.drop_analysis = new System.Windows.Forms.ComboBox();

@@ -65,24 +61,30 @@ namespace Handbrake.Controls
             this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();

             this.label54 = new System.Windows.Forms.Label();

             this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();

-            this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();

-            this.check_weightedBFrames = new System.Windows.Forms.CheckBox();

             this.lbl_direct_prediction = new System.Windows.Forms.Label();

             this.drop_directPrediction = new System.Windows.Forms.ComboBox();

             this.label62 = new System.Windows.Forms.Label();

             this.drop_bFrames = new System.Windows.Forms.ComboBox();

             this.label64 = new System.Windows.Forms.Label();

             this.drop_refFrames = new System.Windows.Forms.ComboBox();

-            this.check_mixedReferences = new System.Windows.Forms.CheckBox();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

+            this.check_weightp = new System.Windows.Forms.CheckBox();

+            this.slider_adaptiveQuantStrength = new System.Windows.Forms.TrackBar();

+            this.combo_pyrmidalBFrames = new System.Windows.Forms.ComboBox();

+            this.lbl_adaptiveQuantStrength = new System.Windows.Forms.Label();

+            this.label1 = new System.Windows.Forms.Label();

+            this.label2 = new System.Windows.Forms.Label();

+            this.label3 = new System.Windows.Forms.Label();

             ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).BeginInit();

+            ((System.ComponentModel.ISupportInitialize)(this.slider_adaptiveQuantStrength)).BeginInit();

             this.SuspendLayout();

             // 

             // slider_psytrellis

             // 

             this.slider_psytrellis.BackColor = System.Drawing.SystemColors.Window;

-            this.slider_psytrellis.Location = new System.Drawing.Point(436, 194);

+            this.slider_psytrellis.Location = new System.Drawing.Point(427, 231);

+            this.slider_psytrellis.Maximum = 20;

             this.slider_psytrellis.Name = "slider_psytrellis";

             this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);

             this.slider_psytrellis.TabIndex = 86;

@@ -94,7 +96,7 @@ namespace Handbrake.Controls
             // lbl_psytrellis

             // 

             this.lbl_psytrellis.AutoSize = true;

-            this.lbl_psytrellis.Location = new System.Drawing.Point(328, 198);

+            this.lbl_psytrellis.Location = new System.Drawing.Point(309, 231);

             this.lbl_psytrellis.Name = "lbl_psytrellis";

             this.lbl_psytrellis.Size = new System.Drawing.Size(102, 13);

             this.lbl_psytrellis.TabIndex = 85;

@@ -103,7 +105,7 @@ namespace Handbrake.Controls
             // lbl_psyrd

             // 

             this.lbl_psyrd.AutoSize = true;

-            this.lbl_psyrd.Location = new System.Drawing.Point(283, 164);

+            this.lbl_psyrd.Location = new System.Drawing.Point(264, 199);

             this.lbl_psyrd.Name = "lbl_psyrd";

             this.lbl_psyrd.Size = new System.Drawing.Size(147, 13);

             this.lbl_psyrd.TabIndex = 84;

@@ -112,17 +114,19 @@ namespace Handbrake.Controls
             // slider_psyrd

             // 

             this.slider_psyrd.BackColor = System.Drawing.SystemColors.Window;

-            this.slider_psyrd.Location = new System.Drawing.Point(436, 153);

+            this.slider_psyrd.Location = new System.Drawing.Point(425, 199);

+            this.slider_psyrd.Maximum = 20;

             this.slider_psyrd.Name = "slider_psyrd";

             this.slider_psyrd.Size = new System.Drawing.Size(131, 45);

             this.slider_psyrd.TabIndex = 83;

             this.ToolTip.SetToolTip(this.slider_psyrd, resources.GetString("slider_psyrd.ToolTip"));

+            this.slider_psyrd.Value = 10;

             this.slider_psyrd.Scroll += new System.EventHandler(this.widgetControlChanged);

             // 

             // lbl_adaptBFrames

             // 

             this.lbl_adaptBFrames.AutoSize = true;

-            this.lbl_adaptBFrames.Location = new System.Drawing.Point(21, 124);

+            this.lbl_adaptBFrames.Location = new System.Drawing.Point(309, 28);

             this.lbl_adaptBFrames.Name = "lbl_adaptBFrames";

             this.lbl_adaptBFrames.Size = new System.Drawing.Size(102, 13);

             this.lbl_adaptBFrames.TabIndex = 81;

@@ -137,9 +141,9 @@ namespace Handbrake.Controls
             "Off",

             "Fast",

             "Optimal"});

-            this.drop_adaptBFrames.Location = new System.Drawing.Point(129, 121);

+            this.drop_adaptBFrames.Location = new System.Drawing.Point(417, 24);

             this.drop_adaptBFrames.Name = "drop_adaptBFrames";

-            this.drop_adaptBFrames.Size = new System.Drawing.Size(121, 21);

+            this.drop_adaptBFrames.Size = new System.Drawing.Size(106, 21);

             this.drop_adaptBFrames.TabIndex = 82;

             this.ToolTip.SetToolTip(this.drop_adaptBFrames, resources.GetString("drop_adaptBFrames.ToolTip"));

             this.drop_adaptBFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

@@ -151,15 +155,15 @@ namespace Handbrake.Controls
             this.label43.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.label43.Location = new System.Drawing.Point(13, 13);

             this.label43.Name = "label43";

-            this.label43.Size = new System.Drawing.Size(144, 13);

+            this.label43.Size = new System.Drawing.Size(60, 13);

             this.label43.TabIndex = 49;

-            this.label43.Text = "Advanced H.264 Options";

+            this.label43.Text = "Encoding:";

             // 

             // btn_reset

             // 

             this.btn_reset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_reset.ForeColor = System.Drawing.Color.DarkOrange;

-            this.btn_reset.Location = new System.Drawing.Point(13, 229);

+            this.btn_reset.Location = new System.Drawing.Point(634, 230);

             this.btn_reset.Name = "btn_reset";

             this.btn_reset.Size = new System.Drawing.Size(75, 23);

             this.btn_reset.TabIndex = 79;

@@ -170,7 +174,7 @@ namespace Handbrake.Controls
             // rtf_x264Query

             // 

             this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

-            this.rtf_x264Query.Location = new System.Drawing.Point(13, 258);

+            this.rtf_x264Query.Location = new System.Drawing.Point(16, 259);

             this.rtf_x264Query.Name = "rtf_x264Query";

             this.rtf_x264Query.Size = new System.Drawing.Size(698, 43);

             this.rtf_x264Query.TabIndex = 80;

@@ -183,7 +187,7 @@ namespace Handbrake.Controls
             this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

             this.check_Cabac.Checked = true;

             this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;

-            this.check_Cabac.Location = new System.Drawing.Point(277, 129);

+            this.check_Cabac.Location = new System.Drawing.Point(3, 89);

             this.check_Cabac.Name = "check_Cabac";

             this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;

             this.check_Cabac.Size = new System.Drawing.Size(141, 17);

@@ -198,7 +202,7 @@ namespace Handbrake.Controls
             // 

             this.check_noDCTDecimate.AutoSize = true;

             this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.check_noDCTDecimate.Location = new System.Drawing.Point(597, 41);

+            this.check_noDCTDecimate.Location = new System.Drawing.Point(30, 212);

             this.check_noDCTDecimate.Name = "check_noDCTDecimate";

             this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;

             this.check_noDCTDecimate.Size = new System.Drawing.Size(114, 17);

@@ -209,26 +213,10 @@ namespace Handbrake.Controls
             this.check_noDCTDecimate.UseVisualStyleBackColor = true;

             this.check_noDCTDecimate.CheckedChanged += new System.EventHandler(this.widgetControlChanged);

             // 

-            // check_noFastPSkip

-            // 

-            this.check_noFastPSkip.AutoSize = true;

-            this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.check_noFastPSkip.Location = new System.Drawing.Point(611, 18);

-            this.check_noFastPSkip.Name = "check_noFastPSkip";

-            this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;

-            this.check_noFastPSkip.Size = new System.Drawing.Size(100, 17);

-            this.check_noFastPSkip.TabIndex = 76;

-            this.check_noFastPSkip.Text = "No Fast-P-Skip:";

-            this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.ToolTip.SetToolTip(this.check_noFastPSkip, "This can help with blocking on solid colors like blue skies, but it also slows do" +

-                    "wn the encode.");

-            this.check_noFastPSkip.UseVisualStyleBackColor = true;

-            this.check_noFastPSkip.CheckedChanged += new System.EventHandler(this.widgetControlChanged);

-            // 

             // lbl_trellis

             // 

             this.lbl_trellis.AutoSize = true;

-            this.lbl_trellis.Location = new System.Drawing.Point(421, 130);

+            this.lbl_trellis.Location = new System.Drawing.Point(563, 43);

             this.lbl_trellis.Name = "lbl_trellis";

             this.lbl_trellis.Size = new System.Drawing.Size(38, 13);

             this.lbl_trellis.TabIndex = 67;

@@ -239,11 +227,11 @@ namespace Handbrake.Controls
             this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_trellis.FormattingEnabled = true;

             this.drop_trellis.Items.AddRange(new object[] {

-            "Default (1)",

-            "0",

-            "1",

-            "2"});

-            this.drop_trellis.Location = new System.Drawing.Point(468, 127);

+            "Default (Encode Only)",

+            "Off",

+            "Encode Only",

+            "Always"});

+            this.drop_trellis.Location = new System.Drawing.Point(615, 40);

             this.drop_trellis.Name = "drop_trellis";

             this.drop_trellis.Size = new System.Drawing.Size(94, 21);

             this.drop_trellis.TabIndex = 75;

@@ -269,9 +257,9 @@ namespace Handbrake.Controls
             "4",

             "5",

             "6"});

-            this.drop_deblockBeta.Location = new System.Drawing.Point(643, 95);

+            this.drop_deblockBeta.Location = new System.Drawing.Point(631, 175);

             this.drop_deblockBeta.Name = "drop_deblockBeta";

-            this.drop_deblockBeta.Size = new System.Drawing.Size(68, 21);

+            this.drop_deblockBeta.Size = new System.Drawing.Size(78, 21);

             this.drop_deblockBeta.TabIndex = 74;

             this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));

             this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

@@ -279,7 +267,7 @@ namespace Handbrake.Controls
             // label41

             // 

             this.label41.AutoSize = true;

-            this.label41.Location = new System.Drawing.Point(575, 72);

+            this.label41.Location = new System.Drawing.Point(563, 152);

             this.label41.Name = "label41";

             this.label41.Size = new System.Drawing.Size(62, 13);

             this.label41.TabIndex = 66;

@@ -304,50 +292,23 @@ namespace Handbrake.Controls
             "4",

             "5",

             "6"});

-            this.drop_deblockAlpha.Location = new System.Drawing.Point(643, 69);

+            this.drop_deblockAlpha.Location = new System.Drawing.Point(631, 149);

             this.drop_deblockAlpha.Name = "drop_deblockAlpha";

-            this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 21);

+            this.drop_deblockAlpha.Size = new System.Drawing.Size(78, 21);

             this.drop_deblockAlpha.TabIndex = 73;

             this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));

             this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

             // 

-            // panel3

-            // 

-            this.panel3.BackColor = System.Drawing.Color.Black;

-            this.panel3.Location = new System.Drawing.Point(277, 123);

-            this.panel3.Margin = new System.Windows.Forms.Padding(0);

-            this.panel3.Name = "panel3";

-            this.panel3.Size = new System.Drawing.Size(290, 1);

-            this.panel3.TabIndex = 65;

-            // 

-            // panel1

-            // 

-            this.panel1.BackColor = System.Drawing.Color.Black;

-            this.panel1.Location = new System.Drawing.Point(13, 89);

-            this.panel1.Margin = new System.Windows.Forms.Padding(0);

-            this.panel1.Name = "panel1";

-            this.panel1.Size = new System.Drawing.Size(247, 1);

-            this.panel1.TabIndex = 51;

-            // 

-            // panel2

-            // 

-            this.panel2.BackColor = System.Drawing.Color.Black;

-            this.panel2.Location = new System.Drawing.Point(277, 95);

-            this.panel2.Margin = new System.Windows.Forms.Padding(0);

-            this.panel2.Name = "panel2";

-            this.panel2.Size = new System.Drawing.Size(290, 1);

-            this.panel2.TabIndex = 63;

-            // 

             // check_8x8DCT

             // 

             this.check_8x8DCT.AutoSize = true;

             this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.check_8x8DCT.Location = new System.Drawing.Point(492, 101);

+            this.check_8x8DCT.Location = new System.Drawing.Point(44, 111);

             this.check_8x8DCT.Name = "check_8x8DCT";

             this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;

-            this.check_8x8DCT.Size = new System.Drawing.Size(71, 17);

+            this.check_8x8DCT.Size = new System.Drawing.Size(100, 17);

             this.check_8x8DCT.TabIndex = 72;

-            this.check_8x8DCT.Text = "8x8 DCT:";

+            this.check_8x8DCT.Text = "8x8 Transform:";

             this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;

             this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));

             this.check_8x8DCT.UseVisualStyleBackColor = true;

@@ -356,21 +317,22 @@ namespace Handbrake.Controls
             // label45

             // 

             this.label45.AutoSize = true;

-            this.label45.Location = new System.Drawing.Point(367, 102);

+            this.label45.Location = new System.Drawing.Point(563, 16);

             this.label45.Name = "label45";

-            this.label45.Size = new System.Drawing.Size(50, 13);

+            this.label45.Size = new System.Drawing.Size(78, 13);

             this.label45.TabIndex = 64;

-            this.label45.Text = "Analysis:";

+            this.label45.Text = "Partition Type:";

             // 

             // drop_analysis

             // 

             this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

             this.drop_analysis.FormattingEnabled = true;

             this.drop_analysis.Items.AddRange(new object[] {

-            "Default (some)",

+            "Default (most)",

             "None",

+            "Some",

             "All"});

-            this.drop_analysis.Location = new System.Drawing.Point(423, 99);

+            this.drop_analysis.Location = new System.Drawing.Point(646, 13);

             this.drop_analysis.Name = "drop_analysis";

             this.drop_analysis.Size = new System.Drawing.Size(63, 21);

             this.drop_analysis.TabIndex = 71;

@@ -380,11 +342,11 @@ namespace Handbrake.Controls
             // label48

             // 

             this.label48.AutoSize = true;

-            this.label48.Location = new System.Drawing.Point(279, 45);

+            this.label48.Location = new System.Drawing.Point(262, 110);

             this.label48.Name = "label48";

-            this.label48.Size = new System.Drawing.Size(138, 13);

+            this.label48.Size = new System.Drawing.Size(149, 13);

             this.label48.TabIndex = 62;

-            this.label48.Text = "Subpixel Motion Estimation:";

+            this.label48.Text = "Subpixel ME && Mode Decision:";

             // 

             // drop_subpixelMotionEstimation

             // 

@@ -392,18 +354,18 @@ namespace Handbrake.Controls
             this.drop_subpixelMotionEstimation.FormattingEnabled = true;

             this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {

             "Default (7)",

-            "0",

-            "1",

-            "2",

-            "3",

-            "4",

-            "5",

-            "6",

-            "7",

-            "8",

-            "9",

-            "10"});

-            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(423, 42);

+            "0: SAD, no subpel (super fast!)",

+            "1: SAD, qpel",

+            "2: SATD, qpel",

+            "3: SATD, multi-qpel",

+            "4: SATD, qpel on all",

+            "5: SATD, multi-qpel on all",

+            "6: RD in I/P-frames",

+            "7: RD in all frames",

+            "8: RD refine in I/P-frames",

+            "9: RD refine in all frames",

+            "10: QPRD in all frames"});

+            this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(417, 105);

             this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";

             this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 21);

             this.drop_subpixelMotionEstimation.TabIndex = 70;

@@ -413,7 +375,7 @@ namespace Handbrake.Controls
             // lbl_merange

             // 

             this.lbl_merange.AutoSize = true;

-            this.lbl_merange.Location = new System.Drawing.Point(288, 71);

+            this.lbl_merange.Location = new System.Drawing.Point(282, 135);

             this.lbl_merange.Name = "lbl_merange";

             this.lbl_merange.Size = new System.Drawing.Size(129, 13);

             this.lbl_merange.TabIndex = 61;

@@ -486,7 +448,7 @@ namespace Handbrake.Controls
             "62",

             "63",

             "64"});

-            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(423, 68);

+            this.drop_MotionEstimationRange.Location = new System.Drawing.Point(417, 132);

             this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";

             this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 21);

             this.drop_MotionEstimationRange.TabIndex = 69;

@@ -496,7 +458,7 @@ namespace Handbrake.Controls
             // label54

             // 

             this.label54.AutoSize = true;

-            this.label54.Location = new System.Drawing.Point(283, 19);

+            this.label54.Location = new System.Drawing.Point(277, 81);

             this.label54.Name = "label54";

             this.label54.Size = new System.Drawing.Size(134, 13);

             this.label54.TabIndex = 60;

@@ -514,49 +476,21 @@ namespace Handbrake.Controls
             "Uneven Multi-Hexagon",

             "Exhaustive",

             "Transformed Exhaustive"});

-            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(423, 16);

+            this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(417, 78);

             this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";

             this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 21);

             this.drop_MotionEstimationMethod.TabIndex = 68;

             this.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));

             this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

             // 

-            // check_pyrmidalBFrames

-            // 

-            this.check_pyrmidalBFrames.AutoSize = true;

-            this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.check_pyrmidalBFrames.Location = new System.Drawing.Point(17, 194);

-            this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";

-            this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;

-            this.check_pyrmidalBFrames.Size = new System.Drawing.Size(124, 17);

-            this.check_pyrmidalBFrames.TabIndex = 59;

-            this.check_pyrmidalBFrames.Text = "Pyramidal B-Frames:";

-            this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, resources.GetString("check_pyrmidalBFrames.ToolTip"));

-            this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;

-            this.check_pyrmidalBFrames.CheckedChanged += new System.EventHandler(this.widgetControlChanged);

-            // 

-            // check_weightedBFrames

-            // 

-            this.check_weightedBFrames.AutoSize = true;

-            this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.check_weightedBFrames.Location = new System.Drawing.Point(17, 173);

-            this.check_weightedBFrames.Name = "check_weightedBFrames";

-            this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;

-            this.check_weightedBFrames.Size = new System.Drawing.Size(124, 17);

-            this.check_weightedBFrames.TabIndex = 58;

-            this.check_weightedBFrames.Text = "Weighted B-Frames:";

-            this.ToolTip.SetToolTip(this.check_weightedBFrames, resources.GetString("check_weightedBFrames.ToolTip"));

-            this.check_weightedBFrames.UseVisualStyleBackColor = true;

-            this.check_weightedBFrames.CheckedChanged += new System.EventHandler(this.widgetControlChanged);

-            // 

             // lbl_direct_prediction

             // 

             this.lbl_direct_prediction.AutoSize = true;

-            this.lbl_direct_prediction.Location = new System.Drawing.Point(34, 150);

+            this.lbl_direct_prediction.Location = new System.Drawing.Point(297, 54);

             this.lbl_direct_prediction.Name = "lbl_direct_prediction";

-            this.lbl_direct_prediction.Size = new System.Drawing.Size(89, 13);

+            this.lbl_direct_prediction.Size = new System.Drawing.Size(114, 13);

             this.lbl_direct_prediction.TabIndex = 53;

-            this.lbl_direct_prediction.Text = "Direct Prediction:";

+            this.lbl_direct_prediction.Text = "Adaptive Direct Mode:";

             // 

             // drop_directPrediction

             // 

@@ -568,9 +502,9 @@ namespace Handbrake.Controls
             "Spatial",

             "Temporal",

             "Automatic"});

-            this.drop_directPrediction.Location = new System.Drawing.Point(129, 147);

+            this.drop_directPrediction.Location = new System.Drawing.Point(417, 51);

             this.drop_directPrediction.Name = "drop_directPrediction";

-            this.drop_directPrediction.Size = new System.Drawing.Size(121, 21);

+            this.drop_directPrediction.Size = new System.Drawing.Size(106, 21);

             this.drop_directPrediction.TabIndex = 57;

             this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));

             this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

@@ -578,11 +512,11 @@ namespace Handbrake.Controls
             // label62

             // 

             this.label62.AutoSize = true;

-            this.label62.Location = new System.Drawing.Point(67, 98);

+            this.label62.Location = new System.Drawing.Point(21, 64);

             this.label62.Name = "label62";

-            this.label62.Size = new System.Drawing.Size(56, 13);

+            this.label62.Size = new System.Drawing.Size(103, 13);

             this.label62.TabIndex = 52;

-            this.label62.Text = "B-Frames:";

+            this.label62.Text = "Maximum B-Frames:";

             // 

             // drop_bFrames

             // 

@@ -607,19 +541,17 @@ namespace Handbrake.Controls
             "14",

             "15",

             "16"});

-            this.drop_bFrames.Location = new System.Drawing.Point(129, 95);

+            this.drop_bFrames.Location = new System.Drawing.Point(129, 61);

             this.drop_bFrames.Name = "drop_bFrames";

-            this.drop_bFrames.Size = new System.Drawing.Size(121, 21);

+            this.drop_bFrames.Size = new System.Drawing.Size(106, 21);

             this.drop_bFrames.TabIndex = 56;

-            this.ToolTip.SetToolTip(this.drop_bFrames, "Sane values are 1-6. \r\nB-Frames are smaller than other frames, so they let you pa" +

-                    "ck in more quality at the same bitrate. \r\nUse more of them with animated materia" +

-                    "l.");

+            this.ToolTip.SetToolTip(this.drop_bFrames, resources.GetString("drop_bFrames.ToolTip"));

             this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

             // 

             // label64

             // 

             this.label64.AutoSize = true;

-            this.label64.Location = new System.Drawing.Point(24, 45);

+            this.label64.Location = new System.Drawing.Point(25, 38);

             this.label64.Name = "label64";

             this.label64.Size = new System.Drawing.Size(99, 13);

             this.label64.TabIndex = 50;

@@ -631,7 +563,6 @@ namespace Handbrake.Controls
             this.drop_refFrames.FormattingEnabled = true;

             this.drop_refFrames.Items.AddRange(new object[] {

             "Default (3)",

-            "0",

             "1",

             "2",

             "3",

@@ -648,61 +579,128 @@ namespace Handbrake.Controls
             "14",

             "15",

             "16"});

-            this.drop_refFrames.Location = new System.Drawing.Point(129, 42);

+            this.drop_refFrames.Location = new System.Drawing.Point(129, 35);

             this.drop_refFrames.Name = "drop_refFrames";

-            this.drop_refFrames.Size = new System.Drawing.Size(121, 21);

+            this.drop_refFrames.Size = new System.Drawing.Size(106, 21);

             this.drop_refFrames.TabIndex = 54;

-            this.ToolTip.SetToolTip(this.drop_refFrames, "Sane values are 1-6. \r\nThe more you add, the higher the quality, but the slower t" +

-                    "he encode. Be careful... too many and QuickTime struggles to play the video back" +

-                    ".");

+            this.ToolTip.SetToolTip(this.drop_refFrames, resources.GetString("drop_refFrames.ToolTip"));

             this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

             // 

-            // check_mixedReferences

-            // 

-            this.check_mixedReferences.AutoSize = true;

-            this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.check_mixedReferences.Location = new System.Drawing.Point(25, 68);

-            this.check_mixedReferences.Name = "check_mixedReferences";

-            this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No;

-            this.check_mixedReferences.Size = new System.Drawing.Size(116, 17);

-            this.check_mixedReferences.TabIndex = 55;

-            this.check_mixedReferences.Text = "Mixed References:";

-            this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;

-            this.ToolTip.SetToolTip(this.check_mixedReferences, "With this on, different references can be used for different parts of each 16x16 " +

-                    "pixel macroblock, increasing quality.");

-            this.check_mixedReferences.UseVisualStyleBackColor = true;

-            this.check_mixedReferences.CheckedChanged += new System.EventHandler(this.widgetControlChanged);

-            // 

             // ToolTip

             // 

             this.ToolTip.Active = false;

             this.ToolTip.AutomaticDelay = 1000;

             this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;

             // 

+            // check_weightp

+            // 

+            this.check_weightp.AutoSize = true;

+            this.check_weightp.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;

+            this.check_weightp.ForeColor = System.Drawing.SystemColors.ControlText;

+            this.check_weightp.Location = new System.Drawing.Point(20, 134);

+            this.check_weightp.Name = "check_weightp";

+            this.check_weightp.RightToLeft = System.Windows.Forms.RightToLeft.No;

+            this.check_weightp.Size = new System.Drawing.Size(124, 17);

+            this.check_weightp.TabIndex = 87;

+            this.check_weightp.Text = "Weighted P-Frames:";

+            this.ToolTip.SetToolTip(this.check_weightp, resources.GetString("check_weightp.ToolTip"));

+            this.check_weightp.UseVisualStyleBackColor = true;

+            this.check_weightp.CheckedChanged += new System.EventHandler(this.widgetControlChanged);

+            // 

+            // slider_adaptiveQuantStrength

+            // 

+            this.slider_adaptiveQuantStrength.BackColor = System.Drawing.SystemColors.Window;

+            this.slider_adaptiveQuantStrength.Location = new System.Drawing.Point(425, 167);

+            this.slider_adaptiveQuantStrength.Maximum = 20;

+            this.slider_adaptiveQuantStrength.Name = "slider_adaptiveQuantStrength";

+            this.slider_adaptiveQuantStrength.Size = new System.Drawing.Size(131, 45);

+            this.slider_adaptiveQuantStrength.TabIndex = 88;

+            this.ToolTip.SetToolTip(this.slider_adaptiveQuantStrength, resources.GetString("slider_adaptiveQuantStrength.ToolTip"));

+            this.slider_adaptiveQuantStrength.Value = 10;

+            this.slider_adaptiveQuantStrength.Scroll += new System.EventHandler(this.widgetControlChanged);

+            // 

+            // combo_pyrmidalBFrames

+            // 

+            this.combo_pyrmidalBFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

+            this.combo_pyrmidalBFrames.FormattingEnabled = true;

+            this.combo_pyrmidalBFrames.Items.AddRange(new object[] {

+            "Default (Normal)",

+            "Off",

+            "Strict"});

+            this.combo_pyrmidalBFrames.Location = new System.Drawing.Point(129, 157);

+            this.combo_pyrmidalBFrames.Name = "combo_pyrmidalBFrames";

+            this.combo_pyrmidalBFrames.Size = new System.Drawing.Size(106, 21);

+            this.combo_pyrmidalBFrames.TabIndex = 92;

+            this.ToolTip.SetToolTip(this.combo_pyrmidalBFrames, resources.GetString("combo_pyrmidalBFrames.ToolTip"));

+            this.combo_pyrmidalBFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);

+            // 

+            // lbl_adaptiveQuantStrength

+            // 

+            this.lbl_adaptiveQuantStrength.AutoSize = true;

+            this.lbl_adaptiveQuantStrength.Location = new System.Drawing.Point(248, 171);

+            this.lbl_adaptiveQuantStrength.Name = "lbl_adaptiveQuantStrength";

+            this.lbl_adaptiveQuantStrength.Size = new System.Drawing.Size(163, 13);

+            this.lbl_adaptiveQuantStrength.TabIndex = 89;

+            this.lbl_adaptiveQuantStrength.Text = "Adaptive Quantization Strength:";

+            // 

+            // label1

+            // 

+            this.label1.AutoSize = true;

+            this.label1.BackColor = System.Drawing.Color.Transparent;

+            this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label1.Location = new System.Drawing.Point(13, 193);

+            this.label1.Name = "label1";

+            this.label1.Size = new System.Drawing.Size(83, 13);

+            this.label1.TabIndex = 90;

+            this.label1.Text = "Psychovisual:";

+            // 

+            // label2

+            // 

+            this.label2.AutoSize = true;

+            this.label2.Location = new System.Drawing.Point(20, 160);

+            this.label2.Name = "label2";

+            this.label2.Size = new System.Drawing.Size(105, 13);

+            this.label2.TabIndex = 91;

+            this.label2.Text = "Pyramidal B-Frames:";

+            // 

+            // label3

+            // 

+            this.label3.AutoSize = true;

+            this.label3.BackColor = System.Drawing.Color.Transparent;

+            this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label3.Location = new System.Drawing.Point(248, 13);

+            this.label3.Name = "label3";

+            this.label3.Size = new System.Drawing.Size(57, 13);

+            this.label3.TabIndex = 93;

+            this.label3.Text = "Analysis:";

+            // 

             // x264Panel

             // 

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;

             this.BackColor = System.Drawing.Color.Transparent;

+            this.Controls.Add(this.label3);

+            this.Controls.Add(this.rtf_x264Query);

+            this.Controls.Add(this.label2);

+            this.Controls.Add(this.combo_pyrmidalBFrames);

+            this.Controls.Add(this.label1);

             this.Controls.Add(this.slider_psytrellis);

+            this.Controls.Add(this.slider_psyrd);

+            this.Controls.Add(this.lbl_adaptiveQuantStrength);

+            this.Controls.Add(this.slider_adaptiveQuantStrength);

+            this.Controls.Add(this.check_weightp);

             this.Controls.Add(this.lbl_psytrellis);

             this.Controls.Add(this.lbl_psyrd);

-            this.Controls.Add(this.slider_psyrd);

             this.Controls.Add(this.lbl_adaptBFrames);

             this.Controls.Add(this.drop_adaptBFrames);

             this.Controls.Add(this.label43);

             this.Controls.Add(this.btn_reset);

-            this.Controls.Add(this.rtf_x264Query);

             this.Controls.Add(this.check_Cabac);

             this.Controls.Add(this.check_noDCTDecimate);

-            this.Controls.Add(this.check_noFastPSkip);

             this.Controls.Add(this.lbl_trellis);

             this.Controls.Add(this.drop_trellis);

             this.Controls.Add(this.drop_deblockBeta);

             this.Controls.Add(this.label41);

             this.Controls.Add(this.drop_deblockAlpha);

-            this.Controls.Add(this.panel3);

-            this.Controls.Add(this.panel1);

-            this.Controls.Add(this.panel2);

             this.Controls.Add(this.check_8x8DCT);

             this.Controls.Add(this.label45);

             this.Controls.Add(this.drop_analysis);

@@ -712,20 +710,18 @@ namespace Handbrake.Controls
             this.Controls.Add(this.drop_MotionEstimationRange);

             this.Controls.Add(this.label54);

             this.Controls.Add(this.drop_MotionEstimationMethod);

-            this.Controls.Add(this.check_pyrmidalBFrames);

-            this.Controls.Add(this.check_weightedBFrames);

             this.Controls.Add(this.lbl_direct_prediction);

             this.Controls.Add(this.drop_directPrediction);

             this.Controls.Add(this.label62);

             this.Controls.Add(this.drop_bFrames);

             this.Controls.Add(this.label64);

             this.Controls.Add(this.drop_refFrames);

-            this.Controls.Add(this.check_mixedReferences);

             this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.Name = "x264Panel";

-            this.Size = new System.Drawing.Size(720, 306);

+            this.Size = new System.Drawing.Size(720, 305);

             ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).EndInit();

             ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).EndInit();

+            ((System.ComponentModel.ISupportInitialize)(this.slider_adaptiveQuantStrength)).EndInit();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -744,15 +740,11 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.RichTextBox rtf_x264Query;

         internal System.Windows.Forms.CheckBox check_Cabac;

         internal System.Windows.Forms.CheckBox check_noDCTDecimate;

-        internal System.Windows.Forms.CheckBox check_noFastPSkip;

         internal System.Windows.Forms.Label lbl_trellis;

         internal System.Windows.Forms.ComboBox drop_trellis;

         internal System.Windows.Forms.ComboBox drop_deblockBeta;

         internal System.Windows.Forms.Label label41;

         internal System.Windows.Forms.ComboBox drop_deblockAlpha;

-        internal System.Windows.Forms.Panel panel3;

-        internal System.Windows.Forms.Panel panel1;

-        internal System.Windows.Forms.Panel panel2;

         internal System.Windows.Forms.CheckBox check_8x8DCT;

         internal System.Windows.Forms.Label label45;

         internal System.Windows.Forms.ComboBox drop_analysis;

@@ -762,15 +754,19 @@ namespace Handbrake.Controls
         internal System.Windows.Forms.ComboBox drop_MotionEstimationRange;

         internal System.Windows.Forms.Label label54;

         internal System.Windows.Forms.ComboBox drop_MotionEstimationMethod;

-        internal System.Windows.Forms.CheckBox check_pyrmidalBFrames;

-        internal System.Windows.Forms.CheckBox check_weightedBFrames;

         internal System.Windows.Forms.Label lbl_direct_prediction;

         internal System.Windows.Forms.ComboBox drop_directPrediction;

         internal System.Windows.Forms.Label label62;

         internal System.Windows.Forms.ComboBox drop_bFrames;

         internal System.Windows.Forms.Label label64;

         internal System.Windows.Forms.ComboBox drop_refFrames;

-        internal System.Windows.Forms.CheckBox check_mixedReferences;

         private System.Windows.Forms.ToolTip ToolTip;

+        internal System.Windows.Forms.CheckBox check_weightp;

+        internal System.Windows.Forms.Label lbl_adaptiveQuantStrength;

+        internal System.Windows.Forms.TrackBar slider_adaptiveQuantStrength;

+        internal System.Windows.Forms.Label label1;

+        internal System.Windows.Forms.Label label2;

+        internal System.Windows.Forms.ComboBox combo_pyrmidalBFrames;

+        internal System.Windows.Forms.Label label3;

     }

 }

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index a3bfd7a56..bc4926aa0 100644
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -48,11 +48,9 @@ namespace Handbrake.Controls
         {

             check_8x8DCT.CheckState = CheckState.Checked;

             check_Cabac.CheckState = CheckState.Checked;

-            check_mixedReferences.CheckState = CheckState.Checked;

+            check_weightp.CheckState = CheckState.Checked;

             check_noDCTDecimate.CheckState = CheckState.Unchecked;

-            check_noFastPSkip.CheckState = CheckState.Unchecked;

-            check_pyrmidalBFrames.CheckState = CheckState.Unchecked;

-            check_weightedBFrames.CheckState = CheckState.Checked;

+            combo_pyrmidalBFrames.SelectedIndex = 0;

             drop_analysis.SelectedIndex = 0;

             drop_bFrames.SelectedIndex = 0;

             drop_deblockAlpha.SelectedIndex = 0;

@@ -70,10 +68,11 @@ namespace Handbrake.Controls
             rtf_x264Query.Text = string.Empty;

         }

 

+        #region Standardize Option String

         /// <summary>

         /// Iterate over every x264 option, standardize it, write the full string to the x264 rtf box

         /// </summary>

-        public void X264_StandardizeOptString()

+        public void StandardizeOptString()

         {

             /* Set widgets depending on the opt string in field */

             string thisOpt; // The separated option such as "bframes=3"

@@ -109,14 +108,14 @@ namespace Handbrake.Controls
                             optValue = splitOptRange[1];

 

                             /* Standardize the names here depending on whats in the string */

-                            optName = X264_StandardizeOptNames(optName);

+                            optName = StandardizeOptName(optName);

                             thisOpt = optName + "=" + optValue;

                         }

                         else // No value given so we use a default of "1"

                         {

                             optName = thisOpt;

                             /* Standardize the names here depending on whats in the string */

-                            optName = X264_StandardizeOptNames(optName);

+                            optName = StandardizeOptName(optName);

                             thisOpt = optName + "=1";

                         }

                     }

@@ -146,17 +145,14 @@ namespace Handbrake.Controls
         /// </summary>

         /// <param name="cleanOptNameString">a string of x264 options to clean</param>

         /// <returns>A string containing standardized x264 option names</returns>

-        private static string X264_StandardizeOptNames(string cleanOptNameString)

+        private static string StandardizeOptName(string cleanOptNameString)

         {

             string input = cleanOptNameString;

 

+            /* Reference Frames */

             if (input.Equals("ref") || input.Equals("frameref"))

                 cleanOptNameString = "ref";

 

-            /*No Fast PSkip nofast_pskip*/

-            if (input.Equals("no-fast-pskip") || input.Equals("no_fast_pskip") || input.Equals("nofast_pskip"))

-                cleanOptNameString = "no-fast-pskip";

-

             /*No Dict Decimate*/

             if (input.Equals("no-dct-decimate") || input.Equals("no_dct_decimate") || input.Equals("nodct_decimate"))

                 cleanOptNameString = "no-dct-decimate";

@@ -169,10 +165,6 @@ namespace Handbrake.Controls
             if (input.Equals("me-range") || input.Equals("me_range"))

                 cleanOptNameString = "merange";

 

-            /*WeightB*/

-            if (input.Equals("weight-b") || input.Equals("weight_b"))

-                cleanOptNameString = "weightb";

-

             /*B Pyramid*/

             if (input.Equals("b_pyramid"))

                 cleanOptNameString = "b-pyramid";

@@ -191,11 +183,12 @@ namespace Handbrake.Controls
 

             return cleanOptNameString;

         }

+        #endregion

 

         /// <summary>

         /// Resets the GUI widgets to the contents of the option string.

         /// </summary>

-        public void X264_SetCurrentSettingsInPanel()

+        public void SetCurrentSettingsInPanel()

         {

             /* Set widgets depending on the opt string in field */

             string thisOpt; // The separated option such as "bframes=3"

@@ -237,8 +230,8 @@ namespace Handbrake.Controls
                             case "ref":

                                 drop_refFrames.SelectedItem = optValue;

                                 continue;

-                            case "no-fast-pskip":

-                                check_noFastPSkip.CheckState = CheckState.Checked;

+                            case "weightp":

+                                this.check_weightp.CheckState = optValue == "0" ? CheckState.Unchecked : CheckState.Checked;

                                 continue;

                             case "no-dct-decimate":

                                 check_noDCTDecimate.CheckState = CheckState.Checked;

@@ -247,10 +240,18 @@ namespace Handbrake.Controls
                                 drop_subpixelMotionEstimation.SelectedItem = optValue;

                                 continue;

                             case "trellis":

-                                drop_trellis.SelectedItem = optValue;

-                                continue;

-                            case "mixed-refs":

-                                check_mixedReferences.CheckState = CheckState.Checked;

+                                switch (optValue)

+                                {

+                                    case "0":

+                                        drop_trellis.SelectedIndex = 1;

+                                        break;

+                                    case "1":

+                                         drop_trellis.SelectedIndex = 2;

+                                        break;

+                                    case "2":

+                                        drop_trellis.SelectedIndex = 3;

+                                        break;

+                                }

                                 continue;

                             case "me":

                                 if (optValue.Equals("dia"))

@@ -272,14 +273,19 @@ namespace Handbrake.Controls
                                 int.TryParse(optValue, out badapt);

                                 drop_adaptBFrames.SelectedIndex = (badapt + 1);

                                 continue;

-                            case "weightb":

-                                if (optValue != "0")

-                                    check_weightedBFrames.CheckState = CheckState.Checked;

-                                else

-                                    check_weightedBFrames.CheckState = CheckState.Unchecked;

-                                continue;

                             case "b-pyramid":

-                                check_pyrmidalBFrames.CheckState = CheckState.Checked;

+                                switch (optValue)

+                                {

+                                    case "normal":

+                                        combo_pyrmidalBFrames.SelectedIndex = 0;

+                                        break;

+                                    case "strict":

+                                        combo_pyrmidalBFrames.SelectedIndex = 2;

+                                        break;

+                                    case "none":

+                                        combo_pyrmidalBFrames.SelectedIndex = 1;

+                                        break;

+                                }

                                 continue;

                             case "direct":

                                 if (optValue == "auto")

@@ -315,15 +321,24 @@ namespace Handbrake.Controls
                                 continue;

                             case "analyse":

                                 if (optValue.Equals("p8x8,b8x8,i8x8,i4x4"))

-                                    drop_analysis.SelectedItem = "Default (some)";

+                                    drop_analysis.SelectedItem = "Default (most)";

                                 if (optValue.Equals("none"))

                                     drop_analysis.SelectedItem = "None";

+                                if (optValue.Equals("i4x4,i8x8"))

+                                    drop_analysis.SelectedItem = "Some";

                                 if (optValue.Equals("all"))

                                     drop_analysis.SelectedItem = "All";

                                 continue;

                             case "8x8dct":

                                 check_8x8DCT.CheckState = optValue == "1" ? CheckState.Checked : CheckState.Unchecked;

                                 continue;

+                            case "aq-strength":

+                                float value;

+                                float.TryParse(optValue, out value);

+                                int sliderValue;

+                                int.TryParse((value * 10).ToString(), out sliderValue);

+                                slider_adaptiveQuantStrength.Value = sliderValue;

+                                continue;

                             case "cabac":

                                 check_Cabac.CheckState = CheckState.Unchecked;

                                 continue;

@@ -336,7 +351,7 @@ namespace Handbrake.Controls
                                 // default psy-rd = 1 (10 for the slider)

                                 psyrd = double.TryParse(x[0], out psyrd) ? psyrd * 10 : 10.0;

                                 // default psy-trellis = 0

-                                psytrellis = double.TryParse(x[1], out psytrellis) ? psytrellis * 10 : 0.0;

+                                psytrellis = double.TryParse(x[1], out psytrellis) ? psytrellis * 20 : 0.0;

 

                                 int.TryParse(psyrd.ToString(), out val);

                                 int.TryParse(psytrellis.ToString(), out val2);

@@ -368,8 +383,7 @@ namespace Handbrake.Controls
             string checkOptNameToChangeBegin = optNameToChange + "=";

 

             // IF the current H264 Option String Contains Multiple Items or Just 1 Item

-            if ((currentOptString.Contains(checkOptNameToChange)) ||

-                (currentOptString.StartsWith(checkOptNameToChangeBegin)))

+            if ((currentOptString.Contains(checkOptNameToChange)) || (currentOptString.StartsWith(checkOptNameToChangeBegin)))

                 HasOptions(currentOptString, optNameToChange);

             else // IF there is no options in the rich text box!

                 HasNoOptions(optNameToChange);

@@ -437,6 +451,17 @@ namespace Handbrake.Controls
                             else if ((!da.Contains("Default")) && (!db.Contains("Default")))

                                 thisOpt = "deblock=" + da + "," + db;

                         }

+                        else if (optNameToChange.Equals("aq-strength"))

+                        {

+                            if (slider_adaptiveQuantStrength.Value == 10)

+                                thisOpt = string.Empty;

+                            else

+                            {

+                                double value = slider_adaptiveQuantStrength.Value * 0.1;

+                                string aqs = value.ToString("f1");

+                                thisOpt = "aq-strength=" + aqs;

+                            }

+                        }

                         else if (optNameToChange.Equals("psy-rd"))

                         {

                             if (slider_psyrd.Value == 10 && slider_psytrellis.Value == 0)

@@ -444,30 +469,37 @@ namespace Handbrake.Controls
                             else

                             {

                                 double psyrd = slider_psyrd.Value * 0.1;

-                                double psytre = slider_psytrellis.Value * 0.1;

+                                double psytre = slider_psytrellis.Value * 0.05;

 

-                                string rd = psyrd.ToString("f1");

-                                string rt = psytre.ToString("f1");

+                                string rd = psyrd.ToString("f2");

+                                string rt = psytre.ToString("f2");

 

                                 thisOpt = "psy-rd=" + rd + "," + rt;

                             }

                         }

-                        else if (optNameToChange.Equals("mixed-refs"))

-                            thisOpt = check_mixedReferences.CheckState == CheckState.Checked

-                                          ? "mixed-refs=1"

-                                          : "mixed-refs=0";

-                        else if (optNameToChange.Equals("weightb"))

-                            thisOpt = check_weightedBFrames.CheckState == CheckState.Checked ? string.Empty : "weightb=0";

                         else if (optNameToChange.Equals("b-pyramid"))

-                            thisOpt = check_pyrmidalBFrames.CheckState == CheckState.Checked ? "b-pyramid=1" : string.Empty;

-                        else if (optNameToChange.Equals("no-fast-pskip"))

-                            thisOpt = check_noFastPSkip.CheckState == CheckState.Checked ? "no-fast-pskip=1" : string.Empty;

+                        {

+                            switch (combo_pyrmidalBFrames.SelectedIndex)

+                            {

+                                case 0: // Default

+                                    thisOpt = string.Empty;

+                                    break;

+                                case 1: // Off

+                                    thisOpt = "b-pyramid=none";

+                                    break;

+                                case 2: // Strict

+                                    thisOpt = "b-pyramid=strict";

+                                    break;

+                            }

+                        }

                         else if (optNameToChange.Equals("no-dct-decimate"))

                             thisOpt = check_noDCTDecimate.CheckState == CheckState.Checked ? "no-dct-decimate=1" : string.Empty;

                         else if (optNameToChange.Equals("8x8dct"))

-                            thisOpt = check_8x8DCT.CheckState == CheckState.Checked ? "8x8dct=1" : "8x8dct=0";

+                            thisOpt = check_8x8DCT.CheckState == CheckState.Unchecked ? "8x8dct=0" : string.Empty;

                         else if (optNameToChange.Equals("cabac"))

                             thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "cabac=0";

+                        else if (optNameToChange.Equals("weightp"))

+                            thisOpt = check_Cabac.CheckState == CheckState.Checked ? string.Empty : "weightp=0";

                         else if (optNameToChange.Equals("me"))

                         {

                             switch (drop_MotionEstimationMethod.SelectedIndex)

@@ -531,6 +563,10 @@ namespace Handbrake.Controls
                                     break;

 

                                 case 2:

+                                    thisOpt = "analyse=some";

+                                    break;

+

+                                case 3:

                                     thisOpt = "analyse=all";

                                     break;

 

@@ -567,16 +603,28 @@ namespace Handbrake.Controls
                         else if (optNameToChange.Equals("subq"))

                         {

                             string value = drop_subpixelMotionEstimation.SelectedItem.ToString();

+                            string[] val = value.Split(':');

                             thisOpt = !drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default")

-                                          ? "subq=" + value

+                                          ? "subq=" + val[0]

                                           : string.Empty;

                         }

                         else if (optNameToChange.Equals("trellis"))

                         {

-                            string value = drop_trellis.SelectedItem.ToString();

-                            thisOpt = !drop_trellis.SelectedItem.ToString().Contains("Default")

-                                          ? "trellis=" + value

-                                          : string.Empty;

+                            switch (drop_trellis.SelectedIndex)

+                            {

+                                case 1: // Off

+                                    thisOpt = "trellis=0";

+                                    break;

+                                case 2: // Encode Only

+                                    thisOpt = "trellis=1";

+                                    break;

+                                case 3: // Always

+                                    thisOpt = "trellis=2";

+                                    break;

+                                default:

+                                    thisOpt = string.Empty;

+                                    break;

+                            }

                         }

                     }

                 }

@@ -664,6 +712,10 @@ namespace Handbrake.Controls
                         break;

 

                     case 2:

+                        query = query + colon + "analyse=some";

+                        break;

+

+                    case 3:

                         query = query + colon + "analyse=all";

                         break;

 

@@ -702,6 +754,17 @@ namespace Handbrake.Controls
                     query = query + colon + "deblock=" + da + "," + db;

                 }

             }

+            else if (optNameToChange.Equals("aq-strength"))

+            {

+                if (slider_adaptiveQuantStrength.Value == 10)

+                    query = string.Empty;

+                else

+                {

+                    double value = slider_adaptiveQuantStrength.Value * 0.1;

+                    string aqs = value.ToString("f1");

+                    query += colon + "aq-strength=" + aqs;

+                }

+            }

             else if (optNameToChange.Equals("psy-rd"))

             {

                 if (slider_psyrd.Value == 10 && slider_psytrellis.Value == 0)

@@ -709,35 +772,27 @@ namespace Handbrake.Controls
                 else

                 {

                     double psyrd = slider_psyrd.Value * 0.1;

-                    double psytre = slider_psytrellis.Value * 0.1;

+                    double psytre = slider_psytrellis.Value * 0.05;

 

                     string rd = psyrd.ToString("f1");

-                    string rt = psytre.ToString("f1");

+                    string rt = psytre.ToString("f2");

 

                     query += colon + "psy-rd=" + rd + "," + rt;

                 }

             }

-            else if (optNameToChange.Equals("mixed-refs"))

-            {

-                if (check_mixedReferences.CheckState == CheckState.Checked)

-                    query = query + colon + "mixed-refs=1";

-                else

-                    query = query + colon + "mixed-refs=0";

-            }

-            else if (optNameToChange.Equals("weightb"))

-            {

-                if (check_weightedBFrames.CheckState != CheckState.Checked)

-                    query = query + colon + "weightb=0";

-            }

             else if (optNameToChange.Equals("b-pyramid"))

             {

-                if (check_pyrmidalBFrames.CheckState == CheckState.Checked)

-                    query = query + colon + "b-pyramid=1";

-            }

-            else if (optNameToChange.Equals("no-fast-pskip"))

-            {

-                if (check_noFastPSkip.CheckState == CheckState.Checked)

-                    query = query + colon + "no-fast-pskip=1";

+                switch (combo_pyrmidalBFrames.SelectedIndex)

+                {

+                    case 0:

+                        break;

+                    case 1:

+                        query = query + colon + "b-pyramid=none";

+                        break;

+                    case 2:

+                        query = query + colon + "b-pyramid=strict";

+                        break;

+                }

             }

             else if (optNameToChange.Equals("no-dct-decimate"))

             {

@@ -746,14 +801,19 @@ namespace Handbrake.Controls
             }

             else if (optNameToChange.Equals("8x8dct"))

             {

-                if (check_8x8DCT.CheckState == CheckState.Checked)

-                    query = query + colon + "8x8dct=1";

+                if (check_8x8DCT.CheckState == CheckState.Unchecked)

+                    query = query + colon + "8x8dct=0";

             }

             else if (optNameToChange.Equals("cabac"))

             {

                 if (check_Cabac.CheckState != CheckState.Checked)

                     query = query + colon + "cabac=0";

             }

+            else if (optNameToChange.Equals("weightp"))

+            {

+                if (check_weightp.CheckState != CheckState.Unchecked)

+                    query = query + colon + "weightp=0";

+            }

             else if (optNameToChange.Equals("ref"))

             {

                 if (!drop_refFrames.SelectedItem.ToString().Contains("Default"))

@@ -769,12 +829,27 @@ namespace Handbrake.Controls
             {

                 string value = drop_subpixelMotionEstimation.SelectedItem.ToString();

                 if (!drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default"))

-                    query = query + colon + "subq=" + value;

+                {

+                    string[] val = value.Split(':');

+                    query = query + colon + "subq=" + val[0];

+                }

             }

             else if (optNameToChange.Equals("trellis"))

             {

-                if (!drop_trellis.SelectedItem.ToString().Contains("Default"))

-                    query = query + colon + "trellis=" + drop_trellis.SelectedItem;

+                switch (drop_trellis.SelectedIndex)

+                {

+                    case 1: // Off

+                        query = query + colon + "trellis=0";

+                        break;

+                    case 2: // Encode Only

+                        query = query + colon + "trellis=1";

+                        break;

+                    case 3: // Always

+                        query = query + colon + "trellis=2";

+                        break;

+                    default:

+                        break;

+                }

             }

 

             rtf_x264Query.Text = query;

@@ -788,9 +863,7 @@ namespace Handbrake.Controls
         {

             /* Lots of situations to cover.

                - B-frames (when 0 turn of b-frame specific stuff, when < 2 disable b-pyramid)

-               - CABAC (when 0 turn off trellis)

-               - analysis (if none, turn off 8x8dct)

-               - refs (under 2, disable mixed-refs)

+               - CABAC (when 0 turn off trellis and psy-trel

                - subme (if under 6, turn off psy-rd and psy-trel)

                - trellis (if 0, turn off psy-trel)

              */

@@ -798,18 +871,16 @@ namespace Handbrake.Controls
             switch (sender)

             {

                 case "bframes":

-                    if (drop_bFrames.SelectedIndex > 0 && drop_bFrames.SelectedIndex < 2)

+                    if (drop_bFrames.SelectedIndex == 1)

                     {

-                        /* If the b-frame widget is at 0 or 1, the user has chosen

+                        /* If the b-frame widget is at 1, the user has chosen

                            not to use b-frames at all. So disable the options

                            that can only be used when b-frames are enabled.        */

-                        check_weightedBFrames.Visible = false;

-                        check_pyrmidalBFrames.Visible = false;

+                        combo_pyrmidalBFrames.Visible = false;

                         drop_directPrediction.Visible = false;

                         lbl_direct_prediction.Visible = false;

 

-                        check_weightedBFrames.CheckState = CheckState.Unchecked;

-                        check_pyrmidalBFrames.CheckState = CheckState.Unchecked;

+                        combo_pyrmidalBFrames.SelectedIndex = 0;

                         drop_directPrediction.SelectedIndex = 0;

 

                         drop_adaptBFrames.Visible = false;

@@ -819,10 +890,9 @@ namespace Handbrake.Controls
                     else if (drop_bFrames.SelectedIndex == 2)

                     {

                         /* Only 1 b-frame? Disable b-pyramid. */

-                        check_pyrmidalBFrames.Visible = false;

-                        check_pyrmidalBFrames.CheckState = CheckState.Unchecked;

+                        combo_pyrmidalBFrames.Visible = false;

+                        combo_pyrmidalBFrames.SelectedIndex = 0;

 

-                        check_weightedBFrames.Visible = true;

                         drop_directPrediction.Visible = true;

                         lbl_direct_prediction.Visible = true;

 

@@ -831,8 +901,7 @@ namespace Handbrake.Controls
                     }

                     else

                     {

-                        check_weightedBFrames.Visible = true;

-                        check_pyrmidalBFrames.Visible = true;

+                        combo_pyrmidalBFrames.Visible = true;

                         drop_directPrediction.Visible = true;

                         lbl_direct_prediction.Visible = true;

 

@@ -847,34 +916,20 @@ namespace Handbrake.Controls
                         drop_trellis.Visible = false;

                         drop_trellis.SelectedIndex = 0;

                         lbl_trellis.Visible = false;

+

+                        slider_psytrellis.Visible = false;

+                        lbl_psytrellis.Visible = false;

+                        slider_psytrellis.Value = 0;

                     }

                     else

                     {

                         drop_trellis.Visible = true;

                         lbl_trellis.Visible = true;

+

+                        slider_psytrellis.Visible = true;

+                        lbl_psytrellis.Visible = true;

                     }

                     break;

-                case "analyse":

-                    if (drop_analysis.SelectedIndex == 1)

-                    {

-                        /* No analysis? Disable 8x8dct */

-                        check_8x8DCT.Visible = false;

-                        if (sender != "8x8dct")

-                            check_8x8DCT.CheckState = CheckState.Unchecked;

-                    }

-                    else

-                        check_8x8DCT.Visible = true;

-                    break;

-                case "ref":

-                    if (drop_refFrames.SelectedIndex > 0 && drop_refFrames.SelectedIndex < 3)

-                    {

-                        check_mixedReferences.Visible = false;

-                        if (sender != "mixed-refs")

-                            check_mixedReferences.CheckState = CheckState.Unchecked;

-                    }

-                    else

-                        check_mixedReferences.Visible = true;

-                    break;

                 case "me": // Motion Estimation

                     if (drop_MotionEstimationMethod.SelectedIndex < 3)

                     {

@@ -933,6 +988,8 @@ namespace Handbrake.Controls
             }

         }

 

+        /* UI Events */

+

         private void widgetControlChanged(object sender, EventArgs e)

         {

             Control changedControlName = (Control) sender;

@@ -943,19 +1000,16 @@ namespace Handbrake.Controls
                 case "drop_refFrames":

                     controlName = "ref";

                     break;

-                case "check_mixedReferences":

-                    controlName = "mixed-refs";

-                    break;

                 case "drop_bFrames":

                     controlName = "bframes";

                     break;

                 case "drop_directPrediction":

                     controlName = "direct";

                     break;

-                case "check_weightedBFrames":

-                    controlName = "weightb";

+                case "check_weightp":

+                    controlName = "weightp";

                     break;

-                case "check_pyrmidalBFrames":

+                case "combo_pyrmidalBFrames":

                     controlName = "b-pyramid";

                     break;

                 case "drop_MotionEstimationMethod":

@@ -982,9 +1036,6 @@ namespace Handbrake.Controls
                 case "drop_trellis":

                     controlName = "trellis";

                     break;

-                case "check_noFastPSkip":

-                    controlName = "no-fast-pskip";

-                    break;

                 case "check_noDCTDecimate":

                     controlName = "no-dct-decimate";

                     break;

@@ -997,6 +1048,9 @@ namespace Handbrake.Controls
                 case "slider_psytrellis":

                     controlName = "psy-rd";

                     break;

+                case "slider_adaptiveQuantStrength":

+                    controlName = "aq-strength";

+                    break;

                 case "drop_adaptBFrames":

                     controlName = "b-adapt";

                     break;

@@ -1011,8 +1065,8 @@ namespace Handbrake.Controls
                 string query = rtf_x264Query.Text.Replace("\n", string.Empty);

                 Reset2Defaults();

                 rtf_x264Query.Text = query;

-                X264_StandardizeOptString();

-                X264_SetCurrentSettingsInPanel();

+                this.StandardizeOptString();

+                this.SetCurrentSettingsInPanel();

 

                 if (rtf_x264Query.Text == string.Empty)

                     Reset2Defaults();

diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx
index 97759c0c6..26a9e886c 100644
--- a/win/C#/Controls/x264Panel.resx
+++ b/win/C#/Controls/x264Panel.resx
@@ -125,122 +125,121 @@
 as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.</value>

   </data>

   <data name="drop_adaptBFrames.ToolTip" xml:space="preserve">

-    <value>When adaptive B-Frames are disabled, the number of B-Frames you specify is the constant length of every B-Frame sequence. 

-When one of the adaptive modes is enabled, the number of B-Frames is treated as a maximum, with the length of each sequence varying, but never exceeding the max.

+    <value>x264 has a variety of algorithms to decide when to use B-frames and how many to use.

 

-Fast mode takes the same amount of time no matter how many B-frames you specify. However, it doesn't always make the best decisions on how many B-Frames to use in a sequence.

+Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.

 

-Optimal mode gets slower as the maximum number of B-Frames increases, but does a much better job at deciding sequence length, which can mean smaller file sizes and better quality.</value>

+Optimal mode gets slower as the maximum number of B-Frames increases, but makes much more accurate decisions, especially when used with B-pyramid.</value>

   </data>

   <data name="check_Cabac.ToolTip" xml:space="preserve">

-    <value>CABAC, or context adaptive binary arithmetic coding, is used by x264 to reduce the bitrate needed for a given quality by 15\%. 

-This makes it very cool and very useful, and it should be left on whenever possible. However, it is incompatible with the iPod, and makes the AppleTV struggle. So turn it off for those.

-

-CABAC is a kind of entropy coding, which means that it compresses data by making shorthand symbols to represent long streams of data. The \"entropy\" part means that the symbols it uses the most often are the smallest. 

-When you disable CABAC, another entropy coding scheme gets enabled, called CAVLC (context adaptive variable-length coding). 

-CAVLC is a lot less efficient, which is why it needs 15\% more bitrate to achieve the same quality as CABAC.</value>

+    <value>After the encoder has done its work, it has a bunch of data that needs to be compressed losslessly, similar to ZIP or RAR.  

+H.264 provides two options for this: CAVLC and CABAC.  CABAC decodes a lot slower but compresses significantly better (10-30%), especially at lower bitrates.  

+If you're looking to minimize CPU requirements for video playback, disable this option.

+Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled.</value>

   </data>

   <data name="check_noDCTDecimate.ToolTip" xml:space="preserve">

-    <value>To save space, x264 will \"zero out\" blocks when it thinks they won't be perceptible by the viewer. 

-This negligibly reduces quality, but in rare cases it can mess up and produce visible artifacts. 

-This situation can be alleviated by telling x264 not to decimate DCT blocks.

-

-It increases quality but also bitrate/file size, so if you use it when you've specified a target bitrate you will end up with a worse picture than without it. 

-However, when used with constant quality encoding, or if you boost the average bitrate to compensate, you might get a better result.</value>

+    <value>x264 normally zeroes out nearly-empty data blocks to save bits to be better used for some other purpose in the video.  

+However, this can sometimes have slight negative effects on retention of subtle grain and dither.  

+Don't touch this unless you're having banding issues or other such cases where you are having trouble keeping fine noise.</value>

   </data>

   <data name="drop_trellis.ToolTip" xml:space="preserve">

-    <value>Trellis fine-tunes how bitrate is doled out, so it can reduce file size/bitrate or increase quality. 

-A value of 1 means it only fine-tunes the final encode of a block of pixels, while 2 means it is considered during earlier phases of the decision-making process as well.</value>

+    <value>Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. 

+\"Always\" uses trellis not only during the main encoding process, but also during analysis, 

+which improves compression even more, albeit at great speed cost.  

+

+Trellis costs more speed at higher bitrates and requires CABAC.</value>

   </data>

   <data name="drop_deblockBeta.ToolTip" xml:space="preserve">

-    <value>x264 includes an in-loop deblocking filter. What this means is that blocky compression artifacts are smoothed away when you play back the video. 

-It has two settings: strength and threshold, just like a simple filter in Photoshop.

-

-Strength controls the amount of deblocking applied to the whole frame. If you drop down below 0, you reduce the amount of blurring. 

-Go too negative, and you'll get an effect somewhat like oversharpening an image. Go into positive values, and the image may become too soft.

-

-Threshold controls how sensitive the filter is to whether something in a block is detail that needs to be preserved: lower numbers blur details less.

+    <value>H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. 

+The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.

 

-The default deblocking values are 0 and 0. 

-This does not mean zero deblocking. 

-It means x264 will apply the regular deblocking strength and thresholds the codec authors have selected as working the best in most cases.

-

-While many, many people stick with the default deblocking values of 0,0, and you should never change the deblocking without disabling adaptive quantization, 

-other people disagree. 

-Some prefer a slightly less blurred image for live action material, and use values like -2,-1 or -2,-2. Others will raise it to 1,1 or even 3,3 for animation. 

-While the values for each setting extend from -6 to 6, the consensus is that going below -3 or above 3 is worthless.</value>

+The deblocking filter has two adjustable parameters, \"strength\" and \"threshold\". 

+The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few)  edges it applies to. 

+Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</value>

   </data>

   <data name="drop_deblockAlpha.ToolTip" xml:space="preserve">

-    <value>x264 includes an in-loop deblocking filter. What this means is that blocky compression artifacts are smoothed away when you play back the video. 

-It has two settings: strength and threshold, just like a simple filter in Photoshop.

-

-Strength controls the amount of deblocking applied to the whole frame. If you drop down below 0, you reduce the amount of blurring. 

-Go too negative, and you'll get an effect somewhat like oversharpening an image. Go into positive values, and the image may become too soft.

-

-Threshold controls how sensitive the filter is to whether something in a block is detail that needs to be preserved: lower numbers blur details less.

+    <value>H.264 has a built-in deblocking filter that smooths out blocking artifacts after decoding each frame.  This not only improves visual quality, but also helps compression significantly. 

+The deblocking filter takes a lot of CPU power, so if you're looking to minimize CPU requirements for video playback, disable it.

 

-The default deblocking values are 0 and 0. 

-This does not mean zero deblocking. 

-It means x264 will apply the regular deblocking strength and thresholds the codec authors have selected as working the best in most cases.

-

-While many, many people stick with the default deblocking values of 0,0, and you should never change the deblocking without disabling adaptive quantization, 

-other people disagree. 

-Some prefer a slightly less blurred image for live action material, and use values like -2,-1 or -2,-2. Others will raise it to 1,1 or even 3,3 for animation. 

-While the values for each setting extend from -6 to 6, the consensus is that going below -3 or above 3 is worthless.</value>

+The deblocking filter has two adjustable parameters, \"strength\" and \"threshold\". 

+The former controls how strong (or weak) the deblocker is, while the latter controls how many (or few)  edges it applies to. 

+Lower values mean less deblocking, higher values mean more deblocking. The default is 0 (normal strength) for both parameters.</value>

   </data>

   <data name="check_8x8DCT.ToolTip" xml:space="preserve">

-    <value>Checking this box lets x264 break key frames down into 8x8 blocks of pixels for analysis. 

-This is a high profile feature of H.264, which makes it less compatible. It should slightly decrease bitrate or improve quality. 

-Turn it on whenever possible.</value>

+    <value>The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.  

+It improves compression by at least 5% at a very small speed cost and may provide an unusually high visual quality benefit compared to its compression gain.  

+However, it requires High Profile, which many devices may not support.</value>

   </data>

   <data name="drop_analysis.ToolTip" xml:space="preserve">

-    <value>Analysis controls how finely x264 divides up a frame to capture detail. Full macroblocks are 16x16 pixels, but x264 can go down all the way to 4x4 blocks if it judges it necessary. 

-By default it only breaks up key frames that much. To give x264 the freedom to make the best decisions for all frames, use \"all\" analysis. 

-If you want to create a high profile H.264 video (which is less compatible with the world at large than main profile), also check the \"8x8 DCT blocks\" box to add yet another block size for analysis.</value>

+    <value>Mode decision picks from a variety of options to make its decision: this option chooses what options those are.  

+Fewer partitions to check means faster encoding, at the cost of worse decisions, since the best option might have been one that was turned off.</value>

   </data>

   <data name="drop_subpixelMotionEstimation.ToolTip" xml:space="preserve">

-    <value>This setting is finer-grained than the motion estimation settings above. Instead of dealing with whole pixels, it deals with 4 fractional pixels, or quarter pixels (qpel). 

-Higher levels increase quality by further refining the motion prediction for these quarter pixels, but take longer to encode.

+    <value>This setting controls both subpixel-precision motion estimation and mode decision methods.

+

+Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.

 

-Level 6, turns on a feature called rate distortion optimization, including psychovisual enhancements. 

-7, the default, enables that rate distortion for B-frames.

-8 refines those decisions for I and P frames, and 9 adds on refinement for B-frames as well.</value>

+Mode decision is the method used to choose how to encode each block of the frame: a very important decision.

+

+SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.

+6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.

+10, the most powerful and slowest option, requires trellis=2.</value>

   </data>

   <data name="drop_MotionEstimationRange.ToolTip" xml:space="preserve">

-    <value>This range is the radius, in pixels, x264 should use for motion estimation searches. 

-It only has an effect when you use Uneven Multi-Hexagonal, Exhaustive, or Transformed Exhaustive searching. 

-24, 32, and 64 are good values, with each being progressively smaller for progressively less improvement to picture quality.</value>

+    <value>This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  

+Doesn't apply to Diamond or Hexagon search options.  

+The default is fine for most content, but extremely high motion video, especially at HD resolutions, may benefit from higher ranges, albeit at a high speed cost.</value>

   </data>

   <data name="drop_MotionEstimationMethod.ToolTip" xml:space="preserve">

-    <value>Controls the motion estimation method. 

-Motion estimation is how the encoder decides how each block of pixels in a frame has moved, compared to most similar blocks in the other frames it references. 

-There are many ways of finding the most similar blocks, with varying speeds and accuracy.

+    <value>Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  

+A better motion search method improves compression at the cost of speed.

 

-At the most basic setting, dia, x264 will only consider a diamond-shaped region around each pixel.

+Diamond: performs an extremely fast and simple search using a diamond pattern.

 

-The default setting, hex, is similar to dia but uses a hexagon shape.

+Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.

 

-Uneven multi-hexagon, umh, searches a number of different patterns across a wider area and thus is slower than hex and dia but further increases compression efficiency and quality.

+Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.

 

-esa, an exhaustive search of a square around each pixel (whose size is controlled by the me-range parameter), is much slower and offers only minimal quality gains.

+Exhaustive: performs a \"dumb\" search of every pixel in a wide area.  Significantly slower for only a small compression gain.

 

-tesa, transformed exhaustive search, which performs just as thorough a search, is slower still but offers further slight improvements to quality.</value>

+Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement.</value>

   </data>

-  <data name="check_pyrmidalBFrames.ToolTip" xml:space="preserve">

-    <value>B-frame pyramids are a High Profile feature. Pyramidal B-frames mean that B-frames don't just reference surrounding reference frames - 

-instead, it also treats a previous B-frame as a reference, improving quality/lowering bitrate at the expense of complexity. 

-Logically, to reference an earlier B-frame, you must tell x264 to use at least 2 B-frames.</value>

+  <data name="drop_directPrediction.ToolTip" xml:space="preserve">

+    <value>H.264 allows for two different prediction modes, spatial and temporal, in B-frames.

+

+Spatial, the default, is almost always better, but temporal is sometimes useful too.

+

+x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain), adaptively select which is better for each particular frame.</value>

   </data>

-  <data name="check_weightedBFrames.ToolTip" xml:space="preserve">

-    <value>Sometimes x264 will base a B-frame's motion compensation on frames both before and after. 

-With weighted B-frames, the amount of influence each frame has is related to its distance from the frame being encoded, 

-instead of both having equal influence. 

-The AppleTV can have issues with this.</value>

+  <data name="drop_bFrames.ToolTip" xml:space="preserve">

+    <value>Sane values are ~2-5.  

+This specifies the maximum number of sequential B-frames that the encoder can use. 

+ Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.  

+Cel-animated source material and B-pyramid also significantly increase the usefulness of larger values. 

+Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off).</value>

   </data>

-  <data name="drop_directPrediction.ToolTip" xml:space="preserve">

-    <value>Direct prediction tells x264 what method to use when guessing motion for certain parts of a B-frame. 

-It can either look at other parts of the current frame (spatial) or compare against the following P-frameframe (temporal). 

-You're best off setting this to automatic, so x264 decides which method is best on its own. 

-Don't select none assuming it will be faster; instead it will take longer and look worse. If you're going to choose between spatial and temporal, spatial is usually better.</value>

+  <data name="drop_refFrames.ToolTip" xml:space="preserve">

+    <value>Sane values are ~1-6.  

+The more you add, the better the compression, but the slower the encode.  

+Cel animation tends to benefit from more reference frames a lot more than film content. 

+Note that many hardware devices have limitations on the number of supported reference frames, so if you're encoding for a handheld or standalone player, 

+don't touch this unless you're absolutely sure you know what you're doing!</value>

+  </data>

+  <data name="check_weightp.ToolTip" xml:space="preserve">

+    <value>Performs extra analysis to decide upon weighting parameters for each frame.  

+This improves overall compression slightly and improves the quality of fades greatly. 

+Baseline profile, as required for iPods and similar devices, requires weighted P-frame prediction to be disabled.  

+Note that some devices and players, even those that support Main Profile, 

+may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</value>

+  </data>

+  <data name="slider_adaptiveQuantStrength.ToolTip" xml:space="preserve">

+    <value>Psychovisual Rate Distortion Optimization sure is a mouthful, isn't it? Basically, it means x264 tries to retain detail, for better quality to the human eye, 

+as opposed to trying to maximize quality the way a computer understands it, through signal-to-noise ratios that have trouble telling apart fine detail and noise.</value>

+  </data>

+  <data name="combo_pyrmidalBFrames.ToolTip" xml:space="preserve">

+    <value>This is the distance x264 searches from its best guess at the motion of a block in order to try to find its actual motion.  

+Doesn't apply to Diamond or Hexagon search options.  

+The default is fine for most content, but extremely high motion video, especially at HD resolutions, 

+may benefit from higher ranges, albeit at a high speed cost.</value>

   </data>

 </root>
\ No newline at end of file
diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index f10bd0073..9b6d154ad 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -183,6 +183,7 @@ namespace Handbrake.Functions
             mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;

 

             mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;

+            mainWindow.checkMaximumFramerate.Checked = presetQuery.Pfr;

 

             mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;

 

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index e4557df6f..203e4e659 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -248,6 +248,9 @@ namespace Handbrake.Functions
             if (mainWindow.drp_videoFramerate.Text != "Same as source")

                 query += " -r " + mainWindow.drp_videoFramerate.Text;

 

+            if (mainWindow.checkMaximumFramerate.Checked)

+                query += " --pfr ";

+

             #endregion

 

             #region Audio Settings Tab

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 8523fc178..f0c7fdb61 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -197,6 +197,11 @@ namespace Handbrake.Functions
         public string VideoFramerate { get; set; }

 

         /// <summary>

+        /// Gets or sets a value indicating whether Pfr.

+        /// </summary>

+        public bool Pfr { get; set; }

+

+        /// <summary>

         /// Gets or sets AverageVideoBitrate.

         /// </summary>

         public string AverageVideoBitrate { get; set; }

@@ -343,6 +348,7 @@ namespace Handbrake.Functions
             Match twoPass = Regex.Match(input, @" -2");

             Match turboFirstPass = Regex.Match(input, @" -T");

             Match optimizeMP4 = Regex.Match(input, @" -O");

+            Match pfr = Regex.Match(input, @" --pfr");

 

             // Audio Settings Tab

             Match noAudio = Regex.Match(input, @"-a none");

@@ -522,6 +528,8 @@ namespace Handbrake.Functions
                 thisQuery.VideoFramerate = videoFramerate.Success

                                                ? videoFramerate.ToString().Replace("-r ", string.Empty)

                                                : "Same as source";

+

+                thisQuery.Pfr = pfr.Success;

                 thisQuery.Grayscale = grayscale.Success;

                 thisQuery.TwoPass = twoPass.Success;

                 thisQuery.TurboFirstPass = turboFirstPass.Success;

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index f6535cbd3..3f148f459 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -100,7 +100,6 @@ namespace Handbrake
             this.Label47 = new System.Windows.Forms.Label();

             this.Label3 = new System.Windows.Forms.Label();

             this.tab_audio = new System.Windows.Forms.TabPage();

-            this.AudioSettings = new Handbrake.Controls.AudioPanel();

             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);

             this.tab_video = new System.Windows.Forms.TabPage();

             this.radio_cq = new System.Windows.Forms.RadioButton();

@@ -110,19 +109,15 @@ namespace Handbrake
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();

             this.Label2 = new System.Windows.Forms.Label();

             this.lbl_SliderValue = new System.Windows.Forms.Label();

-            this.Label46 = new System.Windows.Forms.Label();

+            this.lbl_framerate = new System.Windows.Forms.Label();

             this.tab_picture = new System.Windows.Forms.TabPage();

-            this.PictureSettings = new Handbrake.Controls.PictureSettings();

             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();

             this.tabs_panel = new System.Windows.Forms.TabControl();

             this.tab_filters = new System.Windows.Forms.TabPage();

-            this.Filters = new Handbrake.Controls.Filters();

             this.tab_subtitles = new System.Windows.Forms.TabPage();

-            this.Subtitles = new Handbrake.Controls.Subtitles();

             this.tab_chapters = new System.Windows.Forms.TabPage();

             this.label31 = new System.Windows.Forms.Label();

             this.tab_advanced = new System.Windows.Forms.TabPage();

-            this.x264Panel = new Handbrake.Controls.x264Panel();

             this.tab_query = new System.Windows.Forms.TabPage();

             this.btn_clear = new System.Windows.Forms.Button();

             this.label34 = new System.Windows.Forms.Label();

@@ -175,6 +170,12 @@ namespace Handbrake
             this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();

             this.openPreset = new System.Windows.Forms.OpenFileDialog();

             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();

+            this.checkMaximumFramerate = new System.Windows.Forms.CheckBox();

+            this.PictureSettings = new Handbrake.Controls.PictureSettings();

+            this.Filters = new Handbrake.Controls.Filters();

+            this.AudioSettings = new Handbrake.Controls.AudioPanel();

+            this.Subtitles = new Handbrake.Controls.Subtitles();

+            this.x264Panel = new Handbrake.Controls.x264Panel();

             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);

             notifyIconMenu.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();

@@ -276,9 +277,9 @@ namespace Handbrake
             this.check_turbo.AutoSize = true;

             this.check_turbo.BackColor = System.Drawing.Color.Transparent;

             this.check_turbo.Enabled = false;

-            this.check_turbo.Location = new System.Drawing.Point(146, 123);

+            this.check_turbo.Location = new System.Drawing.Point(146, 143);

             this.check_turbo.Name = "check_turbo";

-            this.check_turbo.Size = new System.Drawing.Size(99, 17);

+            this.check_turbo.Size = new System.Drawing.Size(101, 17);

             this.check_turbo.TabIndex = 7;

             this.check_turbo.Text = "Turbo first Pass";

             this.ToolTip.SetToolTip(this.check_turbo, "Makes the first pass of a 2 pass encode faster.");

@@ -298,17 +299,18 @@ namespace Handbrake
             "24",

             "25",

             "29.97"});

-            this.drp_videoFramerate.Location = new System.Drawing.Point(125, 68);

+            this.drp_videoFramerate.Location = new System.Drawing.Point(125, 62);

             this.drp_videoFramerate.Name = "drp_videoFramerate";

-            this.drp_videoFramerate.Size = new System.Drawing.Size(126, 21);

+            this.drp_videoFramerate.Size = new System.Drawing.Size(125, 21);

             this.drp_videoFramerate.TabIndex = 2;

             this.ToolTip.SetToolTip(this.drp_videoFramerate, "Can be left to \"Same as source\" in most cases.");

+            this.drp_videoFramerate.SelectedIndexChanged += new System.EventHandler(this.drp_videoFramerate_SelectedIndexChanged);

             // 

             // slider_videoQuality

             // 

             this.slider_videoQuality.BackColor = System.Drawing.SystemColors.Window;

             this.slider_videoQuality.Enabled = false;

-            this.slider_videoQuality.Location = new System.Drawing.Point(347, 120);

+            this.slider_videoQuality.Location = new System.Drawing.Point(376, 120);

             this.slider_videoQuality.Margin = new System.Windows.Forms.Padding(0);

             this.slider_videoQuality.Maximum = 100;

             this.slider_videoQuality.Name = "slider_videoQuality";

@@ -321,7 +323,7 @@ namespace Handbrake
             // text_filesize

             // 

             this.text_filesize.Enabled = false;

-            this.text_filesize.Location = new System.Drawing.Point(482, 36);

+            this.text_filesize.Location = new System.Drawing.Point(511, 36);

             this.text_filesize.Name = "text_filesize";

             this.text_filesize.Size = new System.Drawing.Size(81, 21);

             this.text_filesize.TabIndex = 12;

@@ -329,7 +331,7 @@ namespace Handbrake
             // 

             // text_bitrate

             // 

-            this.text_bitrate.Location = new System.Drawing.Point(482, 63);

+            this.text_bitrate.Location = new System.Drawing.Point(511, 63);

             this.text_bitrate.Name = "text_bitrate";

             this.text_bitrate.Size = new System.Drawing.Size(81, 21);

             this.text_bitrate.TabIndex = 10;

@@ -823,15 +825,6 @@ namespace Handbrake
             this.tab_audio.Text = "Audio";

             this.tab_audio.UseVisualStyleBackColor = true;

             // 

-            // AudioSettings

-            // 

-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

-            this.AudioSettings.Name = "AudioSettings";

-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

-            this.AudioSettings.TabIndex = 0;

-            // 

             // AudioMenuRowHeightHack

             // 

             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;

@@ -841,6 +834,8 @@ namespace Handbrake
             // tab_video

             // 

             this.tab_video.BackColor = System.Drawing.Color.Transparent;

+            this.tab_video.Controls.Add(this.checkMaximumFramerate);

+            this.tab_video.Controls.Add(this.drp_videoFramerate);

             this.tab_video.Controls.Add(this.radio_cq);

             this.tab_video.Controls.Add(this.radio_avgBitrate);

             this.tab_video.Controls.Add(this.radio_targetFilesize);

@@ -854,8 +849,7 @@ namespace Handbrake
             this.tab_video.Controls.Add(this.slider_videoQuality);

             this.tab_video.Controls.Add(this.text_bitrate);

             this.tab_video.Controls.Add(this.lbl_SliderValue);

-            this.tab_video.Controls.Add(this.Label46);

-            this.tab_video.Controls.Add(this.drp_videoFramerate);

+            this.tab_video.Controls.Add(this.lbl_framerate);

             this.tab_video.Location = new System.Drawing.Point(4, 22);

             this.tab_video.Name = "tab_video";

             this.tab_video.Padding = new System.Windows.Forms.Padding(3);

@@ -868,9 +862,9 @@ namespace Handbrake
             // 

             this.radio_cq.AutoSize = true;

             this.radio_cq.BackColor = System.Drawing.Color.Transparent;

-            this.radio_cq.Location = new System.Drawing.Point(336, 97);

+            this.radio_cq.Location = new System.Drawing.Point(365, 97);

             this.radio_cq.Name = "radio_cq";

-            this.radio_cq.Size = new System.Drawing.Size(105, 17);

+            this.radio_cq.Size = new System.Drawing.Size(110, 17);

             this.radio_cq.TabIndex = 18;

             this.radio_cq.Text = "Constant Quality:";

             this.radio_cq.UseVisualStyleBackColor = false;

@@ -881,9 +875,9 @@ namespace Handbrake
             this.radio_avgBitrate.AutoSize = true;

             this.radio_avgBitrate.BackColor = System.Drawing.Color.Transparent;

             this.radio_avgBitrate.Checked = true;

-            this.radio_avgBitrate.Location = new System.Drawing.Point(336, 64);

+            this.radio_avgBitrate.Location = new System.Drawing.Point(365, 64);

             this.radio_avgBitrate.Name = "radio_avgBitrate";

-            this.radio_avgBitrate.Size = new System.Drawing.Size(112, 17);

+            this.radio_avgBitrate.Size = new System.Drawing.Size(116, 17);

             this.radio_avgBitrate.TabIndex = 17;

             this.radio_avgBitrate.TabStop = true;

             this.radio_avgBitrate.Text = "Avg Bitrate (kbps):";

@@ -894,9 +888,9 @@ namespace Handbrake
             // 

             this.radio_targetFilesize.AutoSize = true;

             this.radio_targetFilesize.BackColor = System.Drawing.Color.Transparent;

-            this.radio_targetFilesize.Location = new System.Drawing.Point(336, 37);

+            this.radio_targetFilesize.Location = new System.Drawing.Point(365, 37);

             this.radio_targetFilesize.Name = "radio_targetFilesize";

-            this.radio_targetFilesize.Size = new System.Drawing.Size(107, 17);

+            this.radio_targetFilesize.Size = new System.Drawing.Size(108, 17);

             this.radio_targetFilesize.TabIndex = 16;

             this.radio_targetFilesize.Text = "Target Size (MB):";

             this.radio_targetFilesize.UseVisualStyleBackColor = false;

@@ -917,9 +911,9 @@ namespace Handbrake
             // 

             this.check_2PassEncode.AutoSize = true;

             this.check_2PassEncode.BackColor = System.Drawing.Color.Transparent;

-            this.check_2PassEncode.Location = new System.Drawing.Point(125, 100);

+            this.check_2PassEncode.Location = new System.Drawing.Point(125, 120);

             this.check_2PassEncode.Name = "check_2PassEncode";

-            this.check_2PassEncode.Size = new System.Drawing.Size(106, 17);

+            this.check_2PassEncode.Size = new System.Drawing.Size(104, 17);

             this.check_2PassEncode.TabIndex = 6;

             this.check_2PassEncode.Text = "2-Pass Encoding";

             this.check_2PassEncode.UseVisualStyleBackColor = false;

@@ -930,7 +924,7 @@ namespace Handbrake
             this.Label2.AutoSize = true;

             this.Label2.BackColor = System.Drawing.Color.Transparent;

             this.Label2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Label2.Location = new System.Drawing.Point(334, 13);

+            this.Label2.Location = new System.Drawing.Point(363, 13);

             this.Label2.Name = "Label2";

             this.Label2.Size = new System.Drawing.Size(47, 13);

             this.Label2.TabIndex = 8;

@@ -941,21 +935,21 @@ namespace Handbrake
             this.lbl_SliderValue.AutoSize = true;

             this.lbl_SliderValue.BackColor = System.Drawing.Color.Transparent;

             this.lbl_SliderValue.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_SliderValue.Location = new System.Drawing.Point(480, 100);

+            this.lbl_SliderValue.Location = new System.Drawing.Point(509, 100);

             this.lbl_SliderValue.Name = "lbl_SliderValue";

             this.lbl_SliderValue.Size = new System.Drawing.Size(21, 13);

             this.lbl_SliderValue.TabIndex = 15;

             this.lbl_SliderValue.Text = "RF";

             // 

-            // Label46

+            // lbl_framerate

             // 

-            this.Label46.AutoSize = true;

-            this.Label46.BackColor = System.Drawing.Color.Transparent;

-            this.Label46.Location = new System.Drawing.Point(13, 71);

-            this.Label46.Name = "Label46";

-            this.Label46.Size = new System.Drawing.Size(90, 13);

-            this.Label46.TabIndex = 1;

-            this.Label46.Text = "Framerate (FPS):";

+            this.lbl_framerate.AutoSize = true;

+            this.lbl_framerate.BackColor = System.Drawing.Color.Transparent;

+            this.lbl_framerate.Location = new System.Drawing.Point(13, 65);

+            this.lbl_framerate.Name = "lbl_framerate";

+            this.lbl_framerate.Size = new System.Drawing.Size(90, 13);

+            this.lbl_framerate.TabIndex = 1;

+            this.lbl_framerate.Text = "Framerate (FPS):";

             // 

             // tab_picture

             // 

@@ -969,25 +963,13 @@ namespace Handbrake
             this.tab_picture.Text = "Picture";

             this.tab_picture.UseVisualStyleBackColor = true;

             // 

-            // PictureSettings

-            // 

-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;

-            this.PictureSettings.CurrentlySelectedPreset = null;

-            this.PictureSettings.Enabled = false;

-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);

-            this.PictureSettings.Name = "PictureSettings";

-            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);

-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);

-            this.PictureSettings.TabIndex = 0;

-            // 

             // Check_ChapterMarkers

             // 

             this.Check_ChapterMarkers.AutoSize = true;

             this.Check_ChapterMarkers.BackColor = System.Drawing.Color.Transparent;

             this.Check_ChapterMarkers.Location = new System.Drawing.Point(16, 32);

             this.Check_ChapterMarkers.Name = "Check_ChapterMarkers";

-            this.Check_ChapterMarkers.Size = new System.Drawing.Size(136, 17);

+            this.Check_ChapterMarkers.Size = new System.Drawing.Size(140, 17);

             this.Check_ChapterMarkers.TabIndex = 1;

             this.Check_ChapterMarkers.Text = "Create chapter markers";

             this.Check_ChapterMarkers.UseVisualStyleBackColor = false;

@@ -1020,15 +1002,6 @@ namespace Handbrake
             this.tab_filters.Text = "Video Filters";

             this.tab_filters.UseVisualStyleBackColor = true;

             // 

-            // Filters

-            // 

-            this.Filters.BackColor = System.Drawing.Color.Transparent;

-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Filters.Location = new System.Drawing.Point(0, 0);

-            this.Filters.Name = "Filters";

-            this.Filters.Size = new System.Drawing.Size(713, 310);

-            this.Filters.TabIndex = 0;

-            // 

             // tab_subtitles

             // 

             this.tab_subtitles.Controls.Add(this.Subtitles);

@@ -1040,15 +1013,6 @@ namespace Handbrake
             this.tab_subtitles.Text = "Subtitles";

             this.tab_subtitles.UseVisualStyleBackColor = true;

             // 

-            // Subtitles

-            // 

-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;

-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Subtitles.Location = new System.Drawing.Point(0, 0);

-            this.Subtitles.Name = "Subtitles";

-            this.Subtitles.Size = new System.Drawing.Size(722, 310);

-            this.Subtitles.TabIndex = 0;

-            // 

             // tab_chapters

             // 

             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;

@@ -1087,16 +1051,6 @@ namespace Handbrake
             this.tab_advanced.Text = "Advanced";

             this.tab_advanced.UseVisualStyleBackColor = true;

             // 

-            // x264Panel

-            // 

-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;

-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.x264Panel.Location = new System.Drawing.Point(0, 0);

-            this.x264Panel.Name = "x264Panel";

-            this.x264Panel.Size = new System.Drawing.Size(720, 306);

-            this.x264Panel.TabIndex = 0;

-            this.x264Panel.X264Query = "";

-            // 

             // tab_query

             // 

             this.tab_query.Controls.Add(this.btn_clear);

@@ -1212,9 +1166,9 @@ namespace Handbrake
             this.treeView_presets.ShowLines = false;

             this.treeView_presets.Size = new System.Drawing.Size(240, 424);

             this.treeView_presets.TabIndex = 0;

+            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);

             this.treeView_presets.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_presets_AfterSelect);

             this.treeView_presets.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_presets_deleteKey);

-            this.treeView_presets.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeview_presets_mouseUp);

             // 

             // presets_menu

             // 

@@ -1663,6 +1617,66 @@ namespace Handbrake
             // 

             this.File_ChapterImport.Filter = "CSV Files|*.csv";

             // 

+            // checkMaximumFramerate

+            // 

+            this.checkMaximumFramerate.AutoSize = true;

+            this.checkMaximumFramerate.BackColor = System.Drawing.Color.Transparent;

+            this.checkMaximumFramerate.Location = new System.Drawing.Point(125, 89);

+            this.checkMaximumFramerate.Name = "checkMaximumFramerate";

+            this.checkMaximumFramerate.Size = new System.Drawing.Size(132, 17);

+            this.checkMaximumFramerate.TabIndex = 19;

+            this.checkMaximumFramerate.Text = "Peak Framerate (VFR)";

+            this.checkMaximumFramerate.UseVisualStyleBackColor = false;

+            // 

+            // PictureSettings

+            // 

+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;

+            this.PictureSettings.CurrentlySelectedPreset = null;

+            this.PictureSettings.Enabled = false;

+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);

+            this.PictureSettings.Name = "PictureSettings";

+            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);

+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);

+            this.PictureSettings.TabIndex = 0;

+            // 

+            // Filters

+            // 

+            this.Filters.BackColor = System.Drawing.Color.Transparent;

+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Filters.Location = new System.Drawing.Point(0, 0);

+            this.Filters.Name = "Filters";

+            this.Filters.Size = new System.Drawing.Size(713, 310);

+            this.Filters.TabIndex = 0;

+            // 

+            // AudioSettings

+            // 

+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;

+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);

+            this.AudioSettings.Name = "AudioSettings";

+            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

+            this.AudioSettings.TabIndex = 0;

+            // 

+            // Subtitles

+            // 

+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;

+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.Subtitles.Location = new System.Drawing.Point(0, 0);

+            this.Subtitles.Name = "Subtitles";

+            this.Subtitles.Size = new System.Drawing.Size(722, 310);

+            this.Subtitles.TabIndex = 0;

+            // 

+            // x264Panel

+            // 

+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;

+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.x264Panel.Location = new System.Drawing.Point(0, 0);

+            this.x264Panel.Name = "x264Panel";

+            this.x264Panel.Size = new System.Drawing.Size(720, 306);

+            this.x264Panel.TabIndex = 0;

+            this.x264Panel.X264Query = "";

+            // 

             // frmMain

             // 

             this.AllowDrop = true;

@@ -1763,7 +1777,7 @@ namespace Handbrake
         internal System.Windows.Forms.TabPage tab_picture;

         internal System.Windows.Forms.CheckBox Check_ChapterMarkers;

         internal System.Windows.Forms.TabControl tabs_panel;

-        internal System.Windows.Forms.Label Label46;

+        internal System.Windows.Forms.Label lbl_framerate;

         private System.Windows.Forms.GroupBox groupBox2;

         internal System.Windows.Forms.Button btn_setDefault;

         private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault;

@@ -1866,5 +1880,6 @@ namespace Handbrake
         private DataGridViewTextBoxColumn name;

         private ToolStripMenuItem mnu_exportMacPreset;

         private ToolStripProgressBar ProgressBarStatus;

+        internal CheckBox checkMaximumFramerate;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 520bbf4fa..ee7df2159 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -149,8 +149,8 @@ namespace Handbrake
                     PresetLoader.LoadPreset(this, presetQuery, Properties.Settings.Default.defaultPreset,

                                             presetHandler.GetPreset(Properties.Settings.Default.defaultPreset).PictureSettings);

 

-                    x264Panel.X264_StandardizeOptString();

-                    x264Panel.X264_SetCurrentSettingsInPanel();

+                    x264Panel.StandardizeOptString();

+                    x264Panel.SetCurrentSettingsInPanel();

                 }

             }

             else

@@ -866,8 +866,8 @@ namespace Handbrake
                         PresetLoader.LoadPreset(this, presetQuery, presetName, loadPictureSettings);

 

                         // The x264 widgets will need updated, so do this now:

-                        x264Panel.X264_StandardizeOptString();

-                        x264Panel.X264_SetCurrentSettingsInPanel();

+                        x264Panel.StandardizeOptString();

+                        x264Panel.SetCurrentSettingsInPanel();

 

                         // Finally, let this window have a copy of the preset settings.

                         CurrentlySelectedPreset = preset;

@@ -1739,6 +1739,24 @@ namespace Handbrake
         }

 

         /// <summary>

+        /// When the FrameRate is not Same As Source, show the Max/Constant Mode dropdown

+        /// </summary>

+        /// <param name="sender">

+        /// The sender.

+        /// </param>

+        /// <param name="e">

+        /// The e.

+        /// </param>

+        private void drp_videoFramerate_SelectedIndexChanged(object sender, EventArgs e)

+        {

+            if (this.drp_videoFramerate.SelectedIndex == 0)

+            {

+                this.checkMaximumFramerate.Visible = false;

+                this.checkMaximumFramerate.CheckState = CheckState.Unchecked;

+            }

+        }

+

+        /// <summary>

         /// Set the container format options

         /// </summary>

         public void setContainerOpts()

@@ -2167,8 +2185,8 @@ namespace Handbrake
                 PresetLoader.LoadPreset(this, presetQuery, "Load Back From Queue", true);

 

                 // The x264 widgets will need updated, so do this now:

-                x264Panel.X264_StandardizeOptString();

-                x264Panel.X264_SetCurrentSettingsInPanel();

+                x264Panel.StandardizeOptString();

+                x264Panel.SetCurrentSettingsInPanel();

 

                 // Finally, let this window have a copy of the preset settings.

                 CurrentlySelectedPreset = null;

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 49b97ddb8..7f7acfbab 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -117,12 +117,12 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>False</value>

-  </metadata>

   <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 54</value>

   </metadata>

+  <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+    <value>False</value>

+  </metadata>

   <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>556, 15</value>

   </metadata>