diff options
| author | sr55 <[email protected]> | 2010-08-27 19:32:25 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2010-08-27 19:32:25 +0000 |
| commit | 2bc197b2073a28497175e98d0bf6ee0b52652ca0 (patch) | |
| tree | 0b5f0023a2afccdb731ee8ea559c946a0b74a639 /win | |
| parent | e97e93ae2745f67d0557f12129888b2e322d78be (diff) | |
WinGui:
- Allow trellis and psy-trellis with cavlc
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3495 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Controls/x264Panel.cs | 27 | ||||
| -rw-r--r-- | win/C#/Controls/x264Panel.resx | 6 |
2 files changed, 5 insertions, 28 deletions
diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs index b15bf195d..1abc1b6ef 100644 --- a/win/C#/Controls/x264Panel.cs +++ b/win/C#/Controls/x264Panel.cs @@ -925,27 +925,6 @@ namespace Handbrake.Controls lbl_adaptBFrames.Visible = true;
}
break;
- case "cabac":
- if (check_Cabac.Checked == false)
- {
- /* Without CABAC entropy coding, trellis doesn't run. */
- 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 "me": // Motion Estimation
if (drop_MotionEstimationMethod.SelectedIndex < 3)
{
@@ -976,7 +955,7 @@ namespace Handbrake.Controls slider_psyrd.Visible = true;
lbl_psyrd.Visible = true;
- if (drop_trellis.SelectedIndex >= 2 && check_Cabac.Checked && slider_psytrellis.Visible == false)
+ if (drop_trellis.SelectedIndex >= 2 && slider_psytrellis.Visible == false)
{
slider_psytrellis.Visible = true;
lbl_psytrellis.Visible = true;
@@ -992,9 +971,7 @@ namespace Handbrake.Controls }
else
{
- if ((drop_subpixelMotionEstimation.SelectedIndex == 0 ||
- drop_subpixelMotionEstimation.SelectedIndex >= 7) && check_Cabac.Checked &&
- slider_psytrellis.Visible == false)
+ if ((drop_subpixelMotionEstimation.SelectedIndex == 0 || drop_subpixelMotionEstimation.SelectedIndex >= 7) && slider_psytrellis.Visible == false)
{
slider_psytrellis.Visible = true;
lbl_psytrellis.Visible = true;
diff --git a/win/C#/Controls/x264Panel.resx b/win/C#/Controls/x264Panel.resx index 1339f1faf..094e31ae0 100644 --- 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>
<data name="drop_trellis.ToolTip" xml:space="preserve">
<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.
+"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>
+Trellis costs more speed at higher bitrates</value>
</data>
<data name="drop_deblockBeta.ToolTip" xml:space="preserve">
<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.
|