--- /dev/null
+diff --git a/win/C#/Controls/x264Panel.Designer.cs b/win/C#/Controls/x264Panel.Designer.cs
+index 0177177..e445c17 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();\r
+ this.check_Cabac = new System.Windows.Forms.CheckBox();\r
+ this.check_noDCTDecimate = new System.Windows.Forms.CheckBox();\r
+- this.check_noFastPSkip = new System.Windows.Forms.CheckBox();\r
+ this.lbl_trellis = new System.Windows.Forms.Label();\r
+ this.drop_trellis = new System.Windows.Forms.ComboBox();\r
+ this.drop_deblockBeta = new System.Windows.Forms.ComboBox();\r
+ this.label41 = new System.Windows.Forms.Label();\r
+ this.drop_deblockAlpha = new System.Windows.Forms.ComboBox();\r
+- this.panel3 = new System.Windows.Forms.Panel();\r
+- this.panel1 = new System.Windows.Forms.Panel();\r
+- this.panel2 = new System.Windows.Forms.Panel();\r
+ this.check_8x8DCT = new System.Windows.Forms.CheckBox();\r
+ this.label45 = new System.Windows.Forms.Label();\r
+ this.drop_analysis = new System.Windows.Forms.ComboBox();\r
+@@ -65,34 +61,42 @@ namespace Handbrake.Controls
+ this.drop_MotionEstimationRange = new System.Windows.Forms.ComboBox();\r
+ this.label54 = new System.Windows.Forms.Label();\r
+ this.drop_MotionEstimationMethod = new System.Windows.Forms.ComboBox();\r
+- this.check_pyrmidalBFrames = new System.Windows.Forms.CheckBox();\r
+- this.check_weightedBFrames = new System.Windows.Forms.CheckBox();\r
+ this.lbl_direct_prediction = new System.Windows.Forms.Label();\r
+ this.drop_directPrediction = new System.Windows.Forms.ComboBox();\r
+ this.label62 = new System.Windows.Forms.Label();\r
+ this.drop_bFrames = new System.Windows.Forms.ComboBox();\r
+ this.label64 = new System.Windows.Forms.Label();\r
+ this.drop_refFrames = new System.Windows.Forms.ComboBox();\r
+- this.check_mixedReferences = new System.Windows.Forms.CheckBox();\r
+ this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
++ this.check_weightp = new System.Windows.Forms.CheckBox();\r
++ this.slider_adaptiveQuantStrength = new System.Windows.Forms.TrackBar();\r
++ this.combo_pyrmidalBFrames = new System.Windows.Forms.ComboBox();\r
++ this.lbl_adaptiveQuantStrength = new System.Windows.Forms.Label();\r
++ this.label1 = new System.Windows.Forms.Label();\r
++ this.lbl_prymidalBframes = new System.Windows.Forms.Label();\r
++ this.label3 = new System.Windows.Forms.Label();\r
+ ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).BeginInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).BeginInit();\r
++ ((System.ComponentModel.ISupportInitialize)(this.slider_adaptiveQuantStrength)).BeginInit();\r
+ this.SuspendLayout();\r
+ // \r
+ // slider_psytrellis\r
+ // \r
+- this.slider_psytrellis.Location = new System.Drawing.Point(436, 194);\r
++ this.slider_psytrellis.BackColor = System.Drawing.SystemColors.Window;\r
++ this.slider_psytrellis.Location = new System.Drawing.Point(427, 231);\r
++ this.slider_psytrellis.Maximum = 20;\r
+ this.slider_psytrellis.Name = "slider_psytrellis";\r
+ this.slider_psytrellis.Size = new System.Drawing.Size(131, 45);\r
+ this.slider_psytrellis.TabIndex = 86;\r
+- this.ToolTip.SetToolTip(this.slider_psytrellis, "この値を大きくすると、映像のシャープさやディテールをより維持するようになりますが、\r\nその一方で映像がより人工的にもなります。\r\nこの機能は実験的機能であり、その" +\r
+- "ためデフォルトではOffに設定されています。\r\n適切な値は0.1から0.2の間です。");\r
++ this.ToolTip.SetToolTip(this.slider_psytrellis, "Psychovisual Trellis tries to retain more sharpness and detail, but can cause art" +\r
++ "ifacting. \r\nIt is considered experimental, which is why it\'s off by default. Goo" +\r
++ "d values are 0.1 to 0.2.");\r
+ this.slider_psytrellis.Scroll += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+ // lbl_psytrellis\r
+ // \r
+ this.lbl_psytrellis.AutoSize = true;\r
+- this.lbl_psytrellis.Location = new System.Drawing.Point(328, 198);\r
++ this.lbl_psytrellis.Location = new System.Drawing.Point(309, 231);\r
+ this.lbl_psytrellis.Name = "lbl_psytrellis";\r
+ this.lbl_psytrellis.Size = new System.Drawing.Size(102, 13);\r
+ this.lbl_psytrellis.TabIndex = 85;\r
+@@ -101,7 +105,7 @@ namespace Handbrake.Controls
+ // lbl_psyrd\r
+ // \r
+ this.lbl_psyrd.AutoSize = true;\r
+- this.lbl_psyrd.Location = new System.Drawing.Point(283, 164);\r
++ this.lbl_psyrd.Location = new System.Drawing.Point(264, 199);\r
+ this.lbl_psyrd.Name = "lbl_psyrd";\r
+ this.lbl_psyrd.Size = new System.Drawing.Size(147, 13);\r
+ this.lbl_psyrd.TabIndex = 84;\r
+@@ -109,17 +113,20 @@ namespace Handbrake.Controls
+ // \r
+ // slider_psyrd\r
+ // \r
+- this.slider_psyrd.Location = new System.Drawing.Point(436, 153);\r
++ this.slider_psyrd.BackColor = System.Drawing.SystemColors.Window;\r
++ this.slider_psyrd.Location = new System.Drawing.Point(425, 199);\r
++ this.slider_psyrd.Maximum = 20;\r
+ this.slider_psyrd.Name = "slider_psyrd";\r
+ this.slider_psyrd.Size = new System.Drawing.Size(131, 45);\r
+ this.slider_psyrd.TabIndex = 83;\r
+- this.ToolTip.SetToolTip(this.slider_psyrd, "視覚心理を考慮した歪み最適化（Psy RDO）レベルを調整します。\r\nこの値を調整することで、映像品質が向上する可能性があります。");\r
++ this.ToolTip.SetToolTip(this.slider_psyrd, resources.GetString("slider_psyrd.ToolTip"));\r
++ this.slider_psyrd.Value = 10;\r
+ this.slider_psyrd.Scroll += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+ // lbl_adaptBFrames\r
+ // \r
+ this.lbl_adaptBFrames.AutoSize = true;\r
+- this.lbl_adaptBFrames.Location = new System.Drawing.Point(21, 124);\r
++ this.lbl_adaptBFrames.Location = new System.Drawing.Point(309, 28);\r
+ this.lbl_adaptBFrames.Name = "lbl_adaptBFrames";\r
+ this.lbl_adaptBFrames.Size = new System.Drawing.Size(102, 13);\r
+ this.lbl_adaptBFrames.TabIndex = 81;\r
+@@ -134,9 +141,9 @@ namespace Handbrake.Controls
+ "Off",\r
+ "Fast",\r
+ "Optimal"});\r
+- this.drop_adaptBFrames.Location = new System.Drawing.Point(129, 121);\r
++ this.drop_adaptBFrames.Location = new System.Drawing.Point(417, 24);\r
+ this.drop_adaptBFrames.Name = "drop_adaptBFrames";\r
+- this.drop_adaptBFrames.Size = new System.Drawing.Size(121, 21);\r
++ this.drop_adaptBFrames.Size = new System.Drawing.Size(106, 21);\r
+ this.drop_adaptBFrames.TabIndex = 82;\r
+ this.ToolTip.SetToolTip(this.drop_adaptBFrames, resources.GetString("drop_adaptBFrames.ToolTip"));\r
+ this.drop_adaptBFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+@@ -148,26 +155,26 @@ namespace Handbrake.Controls
+ this.label43.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.label43.Location = new System.Drawing.Point(13, 13);\r
+ this.label43.Name = "label43";\r
+- this.label43.Size = new System.Drawing.Size(194, 13);\r
++ this.label43.Size = new System.Drawing.Size(60, 13);\r
+ this.label43.TabIndex = 49;\r
+- this.label43.Text = "x264（H.264エンコーダ）の詳細設定";\r
++ this.label43.Text = "Encoding:";\r
+ // \r
+ // btn_reset\r
+ // \r
+ this.btn_reset.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.btn_reset.ForeColor = System.Drawing.Color.DarkOrange;\r
+- this.btn_reset.Location = new System.Drawing.Point(13, 229);\r
++ this.btn_reset.Location = new System.Drawing.Point(634, 230);\r
+ this.btn_reset.Name = "btn_reset";\r
+ this.btn_reset.Size = new System.Drawing.Size(75, 23);\r
+ this.btn_reset.TabIndex = 79;\r
+- this.btn_reset.Text = "リセット";\r
++ this.btn_reset.Text = "Reset All";\r
+ this.btn_reset.UseVisualStyleBackColor = true;\r
+ this.btn_reset.Click += new System.EventHandler(this.btn_reset_Click);\r
+ // \r
+ // rtf_x264Query\r
+ // \r
+ this.rtf_x264Query.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+- this.rtf_x264Query.Location = new System.Drawing.Point(13, 258);\r
++ this.rtf_x264Query.Location = new System.Drawing.Point(16, 259);\r
+ this.rtf_x264Query.Name = "rtf_x264Query";\r
+ this.rtf_x264Query.Size = new System.Drawing.Size(698, 43);\r
+ this.rtf_x264Query.TabIndex = 80;\r
+@@ -180,7 +187,7 @@ namespace Handbrake.Controls
+ this.check_Cabac.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+ this.check_Cabac.Checked = true;\r
+ this.check_Cabac.CheckState = System.Windows.Forms.CheckState.Checked;\r
+- this.check_Cabac.Location = new System.Drawing.Point(277, 129);\r
++ this.check_Cabac.Location = new System.Drawing.Point(3, 89);\r
+ this.check_Cabac.Name = "check_Cabac";\r
+ this.check_Cabac.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+ this.check_Cabac.Size = new System.Drawing.Size(141, 17);\r
+@@ -195,7 +202,7 @@ namespace Handbrake.Controls
+ // \r
+ this.check_noDCTDecimate.AutoSize = true;\r
+ this.check_noDCTDecimate.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.check_noDCTDecimate.Location = new System.Drawing.Point(597, 41);\r
++ this.check_noDCTDecimate.Location = new System.Drawing.Point(30, 212);\r
+ this.check_noDCTDecimate.Name = "check_noDCTDecimate";\r
+ this.check_noDCTDecimate.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+ this.check_noDCTDecimate.Size = new System.Drawing.Size(114, 17);\r
+@@ -206,25 +213,10 @@ namespace Handbrake.Controls
+ this.check_noDCTDecimate.UseVisualStyleBackColor = true;\r
+ this.check_noDCTDecimate.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+- // check_noFastPSkip\r
+- // \r
+- this.check_noFastPSkip.AutoSize = true;\r
+- this.check_noFastPSkip.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.check_noFastPSkip.Location = new System.Drawing.Point(611, 18);\r
+- this.check_noFastPSkip.Name = "check_noFastPSkip";\r
+- this.check_noFastPSkip.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+- this.check_noFastPSkip.Size = new System.Drawing.Size(100, 17);\r
+- this.check_noFastPSkip.TabIndex = 76;\r
+- this.check_noFastPSkip.Text = "No Fast-P-Skip:";\r
+- this.check_noFastPSkip.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.ToolTip.SetToolTip(this.check_noFastPSkip, "これをOnにすると青空のような単色部分のブロックノイズを軽減できますが、\r\nエンコードは遅くなります。");\r
+- this.check_noFastPSkip.UseVisualStyleBackColor = true;\r
+- this.check_noFastPSkip.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
+- // \r
+ // lbl_trellis\r
+ // \r
+ this.lbl_trellis.AutoSize = true;\r
+- this.lbl_trellis.Location = new System.Drawing.Point(421, 130);\r
++ this.lbl_trellis.Location = new System.Drawing.Point(563, 43);\r
+ this.lbl_trellis.Name = "lbl_trellis";\r
+ this.lbl_trellis.Size = new System.Drawing.Size(38, 13);\r
+ this.lbl_trellis.TabIndex = 67;\r
+@@ -235,16 +227,15 @@ namespace Handbrake.Controls
+ this.drop_trellis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+ this.drop_trellis.FormattingEnabled = true;\r
+ this.drop_trellis.Items.AddRange(new object[] {\r
+- "Default (1)",\r
+- "0",\r
+- "1",\r
+- "2"});\r
+- this.drop_trellis.Location = new System.Drawing.Point(468, 127);\r
++ "Default (Encode Only)",\r
++ "Off",\r
++ "Encode Only",\r
++ "Always"});\r
++ this.drop_trellis.Location = new System.Drawing.Point(615, 40);\r
+ this.drop_trellis.Name = "drop_trellis";\r
+ this.drop_trellis.Size = new System.Drawing.Size(94, 21);\r
+ this.drop_trellis.TabIndex = 75;\r
+- this.ToolTip.SetToolTip(this.drop_trellis, "どのようにビットレートを分配するかを調整するパラメータです。\r\nこれにより、ファイルサイズ/ビットレートを減らしたり、映像品質を向上させることが可能です。\r\n「1" +\r
+- "」を指定すると、ピクセルブロックの最終エンコード時にのみチューニングを行います。\r\n「2」を指定すると、それ以外の処理時でもチューニングを行います。");\r
++ this.ToolTip.SetToolTip(this.drop_trellis, resources.GetString("drop_trellis.ToolTip"));\r
+ this.drop_trellis.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+ // drop_deblockBeta\r
+@@ -266,9 +257,9 @@ namespace Handbrake.Controls
+ "4",\r
+ "5",\r
+ "6"});\r
+- this.drop_deblockBeta.Location = new System.Drawing.Point(643, 95);\r
++ this.drop_deblockBeta.Location = new System.Drawing.Point(631, 175);\r
+ this.drop_deblockBeta.Name = "drop_deblockBeta";\r
+- this.drop_deblockBeta.Size = new System.Drawing.Size(68, 21);\r
++ this.drop_deblockBeta.Size = new System.Drawing.Size(78, 21);\r
+ this.drop_deblockBeta.TabIndex = 74;\r
+ this.ToolTip.SetToolTip(this.drop_deblockBeta, resources.GetString("drop_deblockBeta.ToolTip"));\r
+ this.drop_deblockBeta.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+@@ -276,7 +267,7 @@ namespace Handbrake.Controls
+ // label41\r
+ // \r
+ this.label41.AutoSize = true;\r
+- this.label41.Location = new System.Drawing.Point(575, 72);\r
++ this.label41.Location = new System.Drawing.Point(563, 152);\r
+ this.label41.Name = "label41";\r
+ this.label41.Size = new System.Drawing.Size(62, 13);\r
+ this.label41.TabIndex = 66;\r
+@@ -301,74 +292,47 @@ namespace Handbrake.Controls
+ "4",\r
+ "5",\r
+ "6"});\r
+- this.drop_deblockAlpha.Location = new System.Drawing.Point(643, 69);\r
++ this.drop_deblockAlpha.Location = new System.Drawing.Point(631, 149);\r
+ this.drop_deblockAlpha.Name = "drop_deblockAlpha";\r
+- this.drop_deblockAlpha.Size = new System.Drawing.Size(68, 21);\r
++ this.drop_deblockAlpha.Size = new System.Drawing.Size(78, 21);\r
+ this.drop_deblockAlpha.TabIndex = 73;\r
+ this.ToolTip.SetToolTip(this.drop_deblockAlpha, resources.GetString("drop_deblockAlpha.ToolTip"));\r
+ this.drop_deblockAlpha.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+- // panel3\r
+- // \r
+- this.panel3.BackColor = System.Drawing.Color.Black;\r
+- this.panel3.Location = new System.Drawing.Point(277, 123);\r
+- this.panel3.Margin = new System.Windows.Forms.Padding(0);\r
+- this.panel3.Name = "panel3";\r
+- this.panel3.Size = new System.Drawing.Size(290, 1);\r
+- this.panel3.TabIndex = 65;\r
+- // \r
+- // panel1\r
+- // \r
+- this.panel1.BackColor = System.Drawing.Color.Black;\r
+- this.panel1.Location = new System.Drawing.Point(13, 89);\r
+- this.panel1.Margin = new System.Windows.Forms.Padding(0);\r
+- this.panel1.Name = "panel1";\r
+- this.panel1.Size = new System.Drawing.Size(247, 1);\r
+- this.panel1.TabIndex = 51;\r
+- // \r
+- // panel2\r
+- // \r
+- this.panel2.BackColor = System.Drawing.Color.Black;\r
+- this.panel2.Location = new System.Drawing.Point(277, 95);\r
+- this.panel2.Margin = new System.Windows.Forms.Padding(0);\r
+- this.panel2.Name = "panel2";\r
+- this.panel2.Size = new System.Drawing.Size(290, 1);\r
+- this.panel2.TabIndex = 63;\r
+- // \r
+ // check_8x8DCT\r
+ // \r
+ this.check_8x8DCT.AutoSize = true;\r
+ this.check_8x8DCT.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.check_8x8DCT.Location = new System.Drawing.Point(492, 101);\r
++ this.check_8x8DCT.Location = new System.Drawing.Point(44, 111);\r
+ this.check_8x8DCT.Name = "check_8x8DCT";\r
+ this.check_8x8DCT.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+- this.check_8x8DCT.Size = new System.Drawing.Size(71, 17);\r
++ this.check_8x8DCT.Size = new System.Drawing.Size(100, 17);\r
+ this.check_8x8DCT.TabIndex = 72;\r
+- this.check_8x8DCT.Text = "8x8 DCT:";\r
++ this.check_8x8DCT.Text = "8x8 Transform:";\r
+ this.check_8x8DCT.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.ToolTip.SetToolTip(this.check_8x8DCT, "このオプションをOnにすると、8×8のブロックサイズも利用できるようになります。\r\n多少の動画サイズの削減や映像品質の向上が期待できるので、できればOnにしておく" +\r
+- "と良いでしょう。\r\nこのオプションはHigh Profileの機能です。");\r
++ this.ToolTip.SetToolTip(this.check_8x8DCT, resources.GetString("check_8x8DCT.ToolTip"));\r
+ this.check_8x8DCT.UseVisualStyleBackColor = true;\r
+ this.check_8x8DCT.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+ // label45\r
+ // \r
+ this.label45.AutoSize = true;\r
+- this.label45.Location = new System.Drawing.Point(367, 102);\r
++ this.label45.Location = new System.Drawing.Point(563, 16);\r
+ this.label45.Name = "label45";\r
+- this.label45.Size = new System.Drawing.Size(50, 13);\r
++ this.label45.Size = new System.Drawing.Size(78, 13);\r
+ this.label45.TabIndex = 64;\r
+- this.label45.Text = "Analysis:";\r
++ this.label45.Text = "Partition Type:";\r
+ // \r
+ // drop_analysis\r
+ // \r
+ this.drop_analysis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
+ this.drop_analysis.FormattingEnabled = true;\r
+ this.drop_analysis.Items.AddRange(new object[] {\r
+- "Default (some)",\r
++ "Default (most)",\r
+ "None",\r
++ "Some",\r
+ "All"});\r
+- this.drop_analysis.Location = new System.Drawing.Point(423, 99);\r
++ this.drop_analysis.Location = new System.Drawing.Point(646, 13);\r
+ this.drop_analysis.Name = "drop_analysis";\r
+ this.drop_analysis.Size = new System.Drawing.Size(63, 21);\r
+ this.drop_analysis.TabIndex = 71;\r
+@@ -378,11 +342,11 @@ namespace Handbrake.Controls
+ // label48\r
+ // \r
+ this.label48.AutoSize = true;\r
+- this.label48.Location = new System.Drawing.Point(279, 45);\r
++ this.label48.Location = new System.Drawing.Point(262, 110);\r
+ this.label48.Name = "label48";\r
+- this.label48.Size = new System.Drawing.Size(138, 13);\r
++ this.label48.Size = new System.Drawing.Size(149, 13);\r
+ this.label48.TabIndex = 62;\r
+- this.label48.Text = "Subpixel Motion Estimation:";\r
++ this.label48.Text = "Subpixel ME && Mode Decision:";\r
+ // \r
+ // drop_subpixelMotionEstimation\r
+ // \r
+@@ -390,17 +354,18 @@ namespace Handbrake.Controls
+ this.drop_subpixelMotionEstimation.FormattingEnabled = true;\r
+ this.drop_subpixelMotionEstimation.Items.AddRange(new object[] {\r
+ "Default (7)",\r
+- "0",\r
+- "1",\r
+- "2",\r
+- "3",\r
+- "4",\r
+- "5",\r
+- "6",\r
+- "7",\r
+- "8",\r
+- "9"});\r
+- this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(423, 42);\r
++ "0: SAD, no subpel (super fast!)",\r
++ "1: SAD, qpel",\r
++ "2: SATD, qpel",\r
++ "3: SATD, multi-qpel",\r
++ "4: SATD, qpel on all",\r
++ "5: SATD, multi-qpel on all",\r
++ "6: RD in I/P-frames",\r
++ "7: RD in all frames",\r
++ "8: RD refine in I/P-frames",\r
++ "9: RD refine in all frames",\r
++ "10: QPRD in all frames"});\r
++ this.drop_subpixelMotionEstimation.Location = new System.Drawing.Point(417, 105);\r
+ this.drop_subpixelMotionEstimation.Name = "drop_subpixelMotionEstimation";\r
+ this.drop_subpixelMotionEstimation.Size = new System.Drawing.Size(139, 21);\r
+ this.drop_subpixelMotionEstimation.TabIndex = 70;\r
+@@ -410,7 +375,7 @@ namespace Handbrake.Controls
+ // lbl_merange\r
+ // \r
+ this.lbl_merange.AutoSize = true;\r
+- this.lbl_merange.Location = new System.Drawing.Point(288, 71);\r
++ this.lbl_merange.Location = new System.Drawing.Point(282, 135);\r
+ this.lbl_merange.Name = "lbl_merange";\r
+ this.lbl_merange.Size = new System.Drawing.Size(129, 13);\r
+ this.lbl_merange.TabIndex = 61;\r
+@@ -483,18 +448,17 @@ namespace Handbrake.Controls
+ "62",\r
+ "63",\r
+ "64"});\r
+- this.drop_MotionEstimationRange.Location = new System.Drawing.Point(423, 68);\r
++ this.drop_MotionEstimationRange.Location = new System.Drawing.Point(417, 132);\r
+ this.drop_MotionEstimationRange.Name = "drop_MotionEstimationRange";\r
+ this.drop_MotionEstimationRange.Size = new System.Drawing.Size(139, 21);\r
+ this.drop_MotionEstimationRange.TabIndex = 69;\r
+- this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, "動き推定の対象範囲をピクセル単位で指定します。\r\n動き推定方式として「Uneven Multi-Hexagon」および「Exhaustive」、「Transfor" +\r
+- "med Exhaustive」を指定している場合のみ有効です。\r\n24、32、64が適切な値です。値を小さくするほど、画質の向上は小さくなります。");\r
++ this.ToolTip.SetToolTip(this.drop_MotionEstimationRange, resources.GetString("drop_MotionEstimationRange.ToolTip"));\r
+ this.drop_MotionEstimationRange.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+ // label54\r
+ // \r
+ this.label54.AutoSize = true;\r
+- this.label54.Location = new System.Drawing.Point(283, 19);\r
++ this.label54.Location = new System.Drawing.Point(277, 81);\r
+ this.label54.Name = "label54";\r
+ this.label54.Size = new System.Drawing.Size(134, 13);\r
+ this.label54.TabIndex = 60;\r
+@@ -512,53 +476,21 @@ namespace Handbrake.Controls
+ "Uneven Multi-Hexagon",\r
+ "Exhaustive",\r
+ "Transformed Exhaustive"});\r
+- this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(423, 16);\r
++ this.drop_MotionEstimationMethod.Location = new System.Drawing.Point(417, 78);\r
+ this.drop_MotionEstimationMethod.Name = "drop_MotionEstimationMethod";\r
+ this.drop_MotionEstimationMethod.Size = new System.Drawing.Size(139, 21);\r
+ this.drop_MotionEstimationMethod.TabIndex = 68;\r
+ this.ToolTip.SetToolTip(this.drop_MotionEstimationMethod, resources.GetString("drop_MotionEstimationMethod.ToolTip"));\r
+ this.drop_MotionEstimationMethod.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+- // check_pyrmidalBFrames\r
+- // \r
+- this.check_pyrmidalBFrames.AutoSize = true;\r
+- this.check_pyrmidalBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.check_pyrmidalBFrames.Location = new System.Drawing.Point(17, 194);\r
+- this.check_pyrmidalBFrames.Name = "check_pyrmidalBFrames";\r
+- this.check_pyrmidalBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+- this.check_pyrmidalBFrames.Size = new System.Drawing.Size(124, 17);\r
+- this.check_pyrmidalBFrames.TabIndex = 59;\r
+- this.check_pyrmidalBFrames.Text = "Pyramidal B-Frames:";\r
+- this.ToolTip.SetToolTip(this.check_pyrmidalBFrames, "このオプションをOnにすると、Bフレームは参照フレームだけでなく、\r\n直前のBフレームも参照フレームとして利用するようになります。\r\n映像品質の向上や動画サイズの" +\r
+- "削減が期待できます。\r\nこの機能を利用するには、少なくとも2つ以上のBフレームを使用するように設定する必要があります。\r\nこのオプションはHigh Profil" +\r
+- "eでのみ利用できます。");\r
+- this.check_pyrmidalBFrames.UseVisualStyleBackColor = true;\r
+- this.check_pyrmidalBFrames.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
+- // \r
+- // check_weightedBFrames\r
+- // \r
+- this.check_weightedBFrames.AutoSize = true;\r
+- this.check_weightedBFrames.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.check_weightedBFrames.Location = new System.Drawing.Point(17, 173);\r
+- this.check_weightedBFrames.Name = "check_weightedBFrames";\r
+- this.check_weightedBFrames.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+- this.check_weightedBFrames.Size = new System.Drawing.Size(124, 17);\r
+- this.check_weightedBFrames.TabIndex = 58;\r
+- this.check_weightedBFrames.Text = "Weighted B-Frames:";\r
+- this.ToolTip.SetToolTip(this.check_weightedBFrames, "Bフレームの重み付き予測を行うかを指定します。\r\nx264では、処理対象フレームの前/後フレームを元にしてBフレームを生成します。\r\n重み付き予測を使用する（この" +\r
+- "オプションをOnにする）と、前後のフレームとの距離を考慮してBフレームを生成します。\r\nこのオプションをOnにすると、Apple TVでの再生に問題が発生する可" +\r
+- "能性があります。");\r
+- this.check_weightedBFrames.UseVisualStyleBackColor = true;\r
+- this.check_weightedBFrames.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
+- // \r
+ // lbl_direct_prediction\r
+ // \r
+ this.lbl_direct_prediction.AutoSize = true;\r
+- this.lbl_direct_prediction.Location = new System.Drawing.Point(34, 150);\r
++ this.lbl_direct_prediction.Location = new System.Drawing.Point(297, 54);\r
+ this.lbl_direct_prediction.Name = "lbl_direct_prediction";\r
+- this.lbl_direct_prediction.Size = new System.Drawing.Size(89, 13);\r
++ this.lbl_direct_prediction.Size = new System.Drawing.Size(114, 13);\r
+ this.lbl_direct_prediction.TabIndex = 53;\r
+- this.lbl_direct_prediction.Text = "Direct Prediction:";\r
++ this.lbl_direct_prediction.Text = "Adaptive Direct Mode:";\r
+ // \r
+ // drop_directPrediction\r
+ // \r
+@@ -570,9 +502,9 @@ namespace Handbrake.Controls
+ "Spatial",\r
+ "Temporal",\r
+ "Automatic"});\r
+- this.drop_directPrediction.Location = new System.Drawing.Point(129, 147);\r
++ this.drop_directPrediction.Location = new System.Drawing.Point(417, 51);\r
+ this.drop_directPrediction.Name = "drop_directPrediction";\r
+- this.drop_directPrediction.Size = new System.Drawing.Size(121, 21);\r
++ this.drop_directPrediction.Size = new System.Drawing.Size(106, 21);\r
+ this.drop_directPrediction.TabIndex = 57;\r
+ this.ToolTip.SetToolTip(this.drop_directPrediction, resources.GetString("drop_directPrediction.ToolTip"));\r
+ this.drop_directPrediction.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+@@ -580,11 +512,11 @@ namespace Handbrake.Controls
+ // label62\r
+ // \r
+ this.label62.AutoSize = true;\r
+- this.label62.Location = new System.Drawing.Point(67, 98);\r
++ this.label62.Location = new System.Drawing.Point(21, 64);\r
+ this.label62.Name = "label62";\r
+- this.label62.Size = new System.Drawing.Size(56, 13);\r
++ this.label62.Size = new System.Drawing.Size(103, 13);\r
+ this.label62.TabIndex = 52;\r
+- this.label62.Text = "B-Frames:";\r
++ this.label62.Text = "Maximum B-Frames:";\r
+ // \r
+ // drop_bFrames\r
+ // \r
+@@ -609,18 +541,17 @@ namespace Handbrake.Controls
+ "14",\r
+ "15",\r
+ "16"});\r
+- this.drop_bFrames.Location = new System.Drawing.Point(129, 95);\r
++ this.drop_bFrames.Location = new System.Drawing.Point(129, 61);\r
+ this.drop_bFrames.Name = "drop_bFrames";\r
+- this.drop_bFrames.Size = new System.Drawing.Size(121, 21);\r
++ this.drop_bFrames.Size = new System.Drawing.Size(106, 21);\r
+ this.drop_bFrames.TabIndex = 56;\r
+- this.ToolTip.SetToolTip(this.drop_bFrames, "Bフレームの最大連続数を指定します。1～6程度が適切です。\r\nBフレームはほかのフレームよりも高圧縮で、同じビットレートでもより高品質な映像が期待できます。\r\nア" +\r
+- "ニメなどの場合は大きめに設定してください。");\r
++ this.ToolTip.SetToolTip(this.drop_bFrames, resources.GetString("drop_bFrames.ToolTip"));\r
+ this.drop_bFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+ // label64\r
+ // \r
+ this.label64.AutoSize = true;\r
+- this.label64.Location = new System.Drawing.Point(24, 45);\r
++ this.label64.Location = new System.Drawing.Point(25, 38);\r
+ this.label64.Name = "label64";\r
+ this.label64.Size = new System.Drawing.Size(99, 13);\r
+ this.label64.TabIndex = 50;\r
+@@ -632,7 +563,6 @@ namespace Handbrake.Controls
+ this.drop_refFrames.FormattingEnabled = true;\r
+ this.drop_refFrames.Items.AddRange(new object[] {\r
+ "Default (3)",\r
+- "0",\r
+ "1",\r
+ "2",\r
+ "3",\r
+@@ -649,60 +579,130 @@ namespace Handbrake.Controls
+ "14",\r
+ "15",\r
+ "16"});\r
+- this.drop_refFrames.Location = new System.Drawing.Point(129, 42);\r
++ this.drop_refFrames.Location = new System.Drawing.Point(129, 35);\r
+ this.drop_refFrames.Name = "drop_refFrames";\r
+- this.drop_refFrames.Size = new System.Drawing.Size(121, 21);\r
++ this.drop_refFrames.Size = new System.Drawing.Size(106, 21);\r
+ this.drop_refFrames.TabIndex = 54;\r
+- this.ToolTip.SetToolTip(this.drop_refFrames, "参照フレームの数を指定します。1～6程度が適切です。\r\n大きくすると映像品質が向上しますが、エンコードが遅くなります。\r\nまた、大きくしすぎるとQuickTime" +\r
+- "での再生が重くなります。");\r
++ this.ToolTip.SetToolTip(this.drop_refFrames, resources.GetString("drop_refFrames.ToolTip"));\r
+ this.drop_refFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
+ // \r
+- // check_mixedReferences\r
+- // \r
+- this.check_mixedReferences.AutoSize = true;\r
+- this.check_mixedReferences.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.check_mixedReferences.Location = new System.Drawing.Point(25, 68);\r
+- this.check_mixedReferences.Name = "check_mixedReferences";\r
+- this.check_mixedReferences.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
+- this.check_mixedReferences.Size = new System.Drawing.Size(116, 17);\r
+- this.check_mixedReferences.TabIndex = 55;\r
+- this.check_mixedReferences.Text = "Mixed References:";\r
+- this.check_mixedReferences.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
+- this.ToolTip.SetToolTip(this.check_mixedReferences, "Onにすると、複数のフレームを参照フレームとして利用します。\r\nフレームを16×16のブロックに分割し、それぞれで複数のフレームを参照フレームとして利用できます。" +\r
+- "\r\nこれにより、映像品質の向上が期待できます。");\r
+- this.check_mixedReferences.UseVisualStyleBackColor = true;\r
+- this.check_mixedReferences.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
+- // \r
+ // ToolTip\r
+ // \r
+ this.ToolTip.Active = false;\r
+ this.ToolTip.AutomaticDelay = 1000;\r
+ this.ToolTip.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;\r
+ // \r
++ // check_weightp\r
++ // \r
++ this.check_weightp.AutoSize = true;\r
++ this.check_weightp.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;\r
++ this.check_weightp.ForeColor = System.Drawing.SystemColors.ControlText;\r
++ this.check_weightp.Location = new System.Drawing.Point(20, 134);\r
++ this.check_weightp.Name = "check_weightp";\r
++ this.check_weightp.RightToLeft = System.Windows.Forms.RightToLeft.No;\r
++ this.check_weightp.Size = new System.Drawing.Size(124, 17);\r
++ this.check_weightp.TabIndex = 87;\r
++ this.check_weightp.Text = "Weighted P-Frames:";\r
++ this.ToolTip.SetToolTip(this.check_weightp, resources.GetString("check_weightp.ToolTip"));\r
++ this.check_weightp.UseVisualStyleBackColor = true;\r
++ this.check_weightp.CheckedChanged += new System.EventHandler(this.widgetControlChanged);\r
++ // \r
++ // slider_adaptiveQuantStrength\r
++ // \r
++ this.slider_adaptiveQuantStrength.BackColor = System.Drawing.SystemColors.Window;\r
++ this.slider_adaptiveQuantStrength.Location = new System.Drawing.Point(425, 167);\r
++ this.slider_adaptiveQuantStrength.Maximum = 20;\r
++ this.slider_adaptiveQuantStrength.Name = "slider_adaptiveQuantStrength";\r
++ this.slider_adaptiveQuantStrength.Size = new System.Drawing.Size(131, 45);\r
++ this.slider_adaptiveQuantStrength.TabIndex = 88;\r
++ this.ToolTip.SetToolTip(this.slider_adaptiveQuantStrength, "Adaptive quantization controls how the encoder distributes bits across the frame." +\r
++ " \r\nHigher values take more bits away from edges and complex areas to improve ar" +\r
++ "eas with finer detail");\r
++ this.slider_adaptiveQuantStrength.Value = 10;\r
++ this.slider_adaptiveQuantStrength.Scroll += new System.EventHandler(this.widgetControlChanged);\r
++ // \r
++ // combo_pyrmidalBFrames\r
++ // \r
++ this.combo_pyrmidalBFrames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
++ this.combo_pyrmidalBFrames.FormattingEnabled = true;\r
++ this.combo_pyrmidalBFrames.Items.AddRange(new object[] {\r
++ "Default (Normal)",\r
++ "Off",\r
++ "Strict"});\r
++ this.combo_pyrmidalBFrames.Location = new System.Drawing.Point(129, 157);\r
++ this.combo_pyrmidalBFrames.Name = "combo_pyrmidalBFrames";\r
++ this.combo_pyrmidalBFrames.Size = new System.Drawing.Size(106, 21);\r
++ this.combo_pyrmidalBFrames.TabIndex = 92;\r
++ this.ToolTip.SetToolTip(this.combo_pyrmidalBFrames, resources.GetString("combo_pyrmidalBFrames.ToolTip"));\r
++ this.combo_pyrmidalBFrames.SelectedIndexChanged += new System.EventHandler(this.widgetControlChanged);\r
++ // \r
++ // lbl_adaptiveQuantStrength\r
++ // \r
++ this.lbl_adaptiveQuantStrength.AutoSize = true;\r
++ this.lbl_adaptiveQuantStrength.Location = new System.Drawing.Point(248, 171);\r
++ this.lbl_adaptiveQuantStrength.Name = "lbl_adaptiveQuantStrength";\r
++ this.lbl_adaptiveQuantStrength.Size = new System.Drawing.Size(163, 13);\r
++ this.lbl_adaptiveQuantStrength.TabIndex = 89;\r
++ this.lbl_adaptiveQuantStrength.Text = "Adaptive Quantization Strength:";\r
++ // \r
++ // label1\r
++ // \r
++ this.label1.AutoSize = true;\r
++ this.label1.BackColor = System.Drawing.Color.Transparent;\r
++ this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
++ this.label1.Location = new System.Drawing.Point(13, 193);\r
++ this.label1.Name = "label1";\r
++ this.label1.Size = new System.Drawing.Size(83, 13);\r
++ this.label1.TabIndex = 90;\r
++ this.label1.Text = "Psychovisual:";\r
++ // \r
++ // lbl_prymidalBframes\r
++ // \r
++ this.lbl_prymidalBframes.AutoSize = true;\r
++ this.lbl_prymidalBframes.Location = new System.Drawing.Point(20, 160);\r
++ this.lbl_prymidalBframes.Name = "lbl_prymidalBframes";\r
++ this.lbl_prymidalBframes.Size = new System.Drawing.Size(105, 13);\r
++ this.lbl_prymidalBframes.TabIndex = 91;\r
++ this.lbl_prymidalBframes.Text = "Pyramidal B-Frames:";\r
++ // \r
++ // label3\r
++ // \r
++ this.label3.AutoSize = true;\r
++ this.label3.BackColor = System.Drawing.Color.Transparent;\r
++ this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
++ this.label3.Location = new System.Drawing.Point(248, 13);\r
++ this.label3.Name = "label3";\r
++ this.label3.Size = new System.Drawing.Size(57, 13);\r
++ this.label3.TabIndex = 93;\r
++ this.label3.Text = "Analysis:";\r
++ // \r
+ // x264Panel\r
+ // \r
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;\r
+ this.BackColor = System.Drawing.Color.Transparent;\r
++ this.Controls.Add(this.label3);\r
++ this.Controls.Add(this.rtf_x264Query);\r
++ this.Controls.Add(this.lbl_prymidalBframes);\r
++ this.Controls.Add(this.combo_pyrmidalBFrames);\r
++ this.Controls.Add(this.label1);\r
+ this.Controls.Add(this.slider_psytrellis);\r
++ this.Controls.Add(this.slider_psyrd);\r
++ this.Controls.Add(this.lbl_adaptiveQuantStrength);\r
++ this.Controls.Add(this.slider_adaptiveQuantStrength);\r
++ this.Controls.Add(this.check_weightp);\r
+ this.Controls.Add(this.lbl_psytrellis);\r
+ this.Controls.Add(this.lbl_psyrd);\r
+- this.Controls.Add(this.slider_psyrd);\r
+ this.Controls.Add(this.lbl_adaptBFrames);\r
+ this.Controls.Add(this.drop_adaptBFrames);\r
+ this.Controls.Add(this.label43);\r
+ this.Controls.Add(this.btn_reset);\r
+- this.Controls.Add(this.rtf_x264Query);\r
+ this.Controls.Add(this.check_Cabac);\r
+ this.Controls.Add(this.check_noDCTDecimate);\r
+- this.Controls.Add(this.check_noFastPSkip);\r
+ this.Controls.Add(this.lbl_trellis);\r
+ this.Controls.Add(this.drop_trellis);\r
+ this.Controls.Add(this.drop_deblockBeta);\r
+ this.Controls.Add(this.label41);\r
+ this.Controls.Add(this.drop_deblockAlpha);\r
+- this.Controls.Add(this.panel3);\r
+- this.Controls.Add(this.panel1);\r
+- this.Controls.Add(this.panel2);\r
+ this.Controls.Add(this.check_8x8DCT);\r
+ this.Controls.Add(this.label45);\r
+ this.Controls.Add(this.drop_analysis);\r
+@@ -712,20 +712,18 @@ namespace Handbrake.Controls
+ this.Controls.Add(this.drop_MotionEstimationRange);\r
+ this.Controls.Add(this.label54);\r
+ this.Controls.Add(this.drop_MotionEstimationMethod);\r
+- this.Controls.Add(this.check_pyrmidalBFrames);\r
+- this.Controls.Add(this.check_weightedBFrames);\r
+ this.Controls.Add(this.lbl_direct_prediction);\r
+ this.Controls.Add(this.drop_directPrediction);\r
+ this.Controls.Add(this.label62);\r
+ this.Controls.Add(this.drop_bFrames);\r
+ this.Controls.Add(this.label64);\r
+ this.Controls.Add(this.drop_refFrames);\r
+- this.Controls.Add(this.check_mixedReferences);\r
+ this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+ this.Name = "x264Panel";\r
+- this.Size = new System.Drawing.Size(720, 306);\r
++ this.Size = new System.Drawing.Size(720, 305);\r
+ ((System.ComponentModel.ISupportInitialize)(this.slider_psytrellis)).EndInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.slider_psyrd)).EndInit();\r
++ ((System.ComponentModel.ISupportInitialize)(this.slider_adaptiveQuantStrength)).EndInit();\r
+ this.ResumeLayout(false);\r
+ this.PerformLayout();\r
+ \r
+@@ -744,15 +742,11 @@ namespace Handbrake.Controls
+ internal System.Windows.Forms.RichTextBox rtf_x264Query;\r
+ internal System.Windows.Forms.CheckBox check_Cabac;\r
+ internal System.Windows.Forms.CheckBox check_noDCTDecimate;\r
+- internal System.Windows.Forms.CheckBox check_noFastPSkip;\r
+ internal System.Windows.Forms.Label lbl_trellis;\r
+ internal System.Windows.Forms.ComboBox drop_trellis;\r
+ internal System.Windows.Forms.ComboBox drop_deblockBeta;\r
+ internal System.Windows.Forms.Label label41;\r
+ internal System.Windows.Forms.ComboBox drop_deblockAlpha;\r
+- internal System.Windows.Forms.Panel panel3;\r
+- internal System.Windows.Forms.Panel panel1;\r
+- internal System.Windows.Forms.Panel panel2;\r
+ internal System.Windows.Forms.CheckBox check_8x8DCT;\r
+ internal System.Windows.Forms.Label label45;\r
+ internal System.Windows.Forms.ComboBox drop_analysis;\r
+@@ -762,15 +756,19 @@ namespace Handbrake.Controls
+ internal System.Windows.Forms.ComboBox drop_MotionEstimationRange;\r
+ internal System.Windows.Forms.Label label54;\r
+ internal System.Windows.Forms.ComboBox drop_MotionEstimationMethod;\r
+- internal System.Windows.Forms.CheckBox check_pyrmidalBFrames;\r
+- internal System.Windows.Forms.CheckBox check_weightedBFrames;\r
+ internal System.Windows.Forms.Label lbl_direct_prediction;\r
+ internal System.Windows.Forms.ComboBox drop_directPrediction;\r
+ internal System.Windows.Forms.Label label62;\r
+ internal System.Windows.Forms.ComboBox drop_bFrames;\r
+ internal System.Windows.Forms.Label label64;\r
+ internal System.Windows.Forms.ComboBox drop_refFrames;\r
+- internal System.Windows.Forms.CheckBox check_mixedReferences;\r
+ private System.Windows.Forms.ToolTip ToolTip;\r
++ internal System.Windows.Forms.CheckBox check_weightp;\r
++ internal System.Windows.Forms.Label lbl_adaptiveQuantStrength;\r
++ internal System.Windows.Forms.TrackBar slider_adaptiveQuantStrength;\r
++ internal System.Windows.Forms.Label label1;\r
++ internal System.Windows.Forms.Label lbl_prymidalBframes;\r
++ internal System.Windows.Forms.ComboBox combo_pyrmidalBFrames;\r
++ internal System.Windows.Forms.Label label3;\r
+ }\r
+ }\r
OSDN Git Service
