WinGui:

- Allow trellis and psy-trellis with cavlc

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

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index b15bf19..1abc1b6 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -925,27 +925,6 @@ namespace Handbrake.Controls
                         lbl_adaptBFrames.Visible = true;\r
                     }\r
                     break;\r
-                case "cabac":\r
-                    if (check_Cabac.Checked == false)\r
-                    {\r
-                        /* Without CABAC entropy coding, trellis doesn't run. */\r
-                        drop_trellis.Visible = false;\r
-                        drop_trellis.SelectedIndex = 0;\r
-                        lbl_trellis.Visible = false;\r
-\r
-                        slider_psytrellis.Visible = false;\r
-                        lbl_psytrellis.Visible = false;\r
-                        slider_psytrellis.Value = 0;\r
-                    }\r
-                    else\r
-                    {\r
-                        drop_trellis.Visible = true;\r
-                        lbl_trellis.Visible = true;\r
-\r
-                        slider_psytrellis.Visible = true;\r
-                        lbl_psytrellis.Visible = true;\r
-                    }\r
-                    break;\r
                 case "me": // Motion Estimation\r
                     if (drop_MotionEstimationMethod.SelectedIndex < 3)\r
                     {\r
@@ -976,7 +955,7 @@ namespace Handbrake.Controls
                         slider_psyrd.Visible = true;\r
                         lbl_psyrd.Visible = true;\r
 \r
-                        if (drop_trellis.SelectedIndex >= 2 && check_Cabac.Checked && slider_psytrellis.Visible == false)\r
+                        if (drop_trellis.SelectedIndex >= 2 && slider_psytrellis.Visible == false)\r
                         {\r
                             slider_psytrellis.Visible = true;\r
                             lbl_psytrellis.Visible = true;\r
@@ -992,9 +971,7 @@ namespace Handbrake.Controls
                     }\r
                     else\r
                     {\r
-                        if ((drop_subpixelMotionEstimation.SelectedIndex == 0 ||\r
-                             drop_subpixelMotionEstimation.SelectedIndex >= 7) && check_Cabac.Checked &&\r
-                            slider_psytrellis.Visible == false)\r
+                        if ((drop_subpixelMotionEstimation.SelectedIndex == 0 || drop_subpixelMotionEstimation.SelectedIndex >= 7) && slider_psytrellis.Visible == false)\r
                         {\r
                             slider_psytrellis.Visible = true;\r
                             lbl_psytrellis.Visible = true;\r

diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx
index 1339f1f..094e31a 100644 (file)
--- a/win/C#/Controls/x264Panel.resx
+++ b/win/C#/Controls/x264Panel.resx
@@ -144,10 +144,10 @@ Don't touch this unless you're having banding issues or other such cases where y
   </data>\r
   <data name="drop_trellis.ToolTip" xml:space="preserve">\r
     <value>Trellis fine-tunes the rounding of transform coefficients to squeeze out 3-5% more compression at the cost of some speed. \r
-\"Always\" uses trellis not only during the main encoding process, but also during analysis, \r
-which improves compression even more, albeit at great speed cost.  \r
+"Always" uses trellis not only during the main encoding process, but also during analysis, which improves compression even \r
+more, albeit at great speed cost. \r
 \r
-Trellis costs more speed at higher bitrates and requires CABAC.</value>\r
+Trellis costs more speed at higher bitrates</value>\r
   </data>\r
   <data name="drop_deblockBeta.ToolTip" xml:space="preserve">\r
     <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. \r