diff options
| author | sr55 <[email protected]> | 2008-09-19 14:09:52 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-09-19 14:09:52 +0000 |
| commit | 4c7c7aecd71c171844a5f8d620bb17f4a1575860 (patch) | |
| tree | 182bf088cb0e746f7f9fa7459b3ea38b40ab5e60 /win/C#/Functions | |
| parent | 63358f3ed712537de16a10698e55bccc72a2793a (diff) | |
WinGui:
- Updated for x264's new default subme of 6. Remember to update your built-in presets!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1729 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Functions')
| -rw-r--r-- | win/C#/Functions/x264Panel.cs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/win/C#/Functions/x264Panel.cs b/win/C#/Functions/x264Panel.cs index 8a93a2121..13a734f6f 100644 --- a/win/C#/Functions/x264Panel.cs +++ b/win/C#/Functions/x264Panel.cs @@ -796,21 +796,20 @@ namespace Handbrake.Functions }
else if (mainWindow.drop_bFrames.SelectedIndex == 2)
{
- /* Only 1 b-frame? Disable b-pyramid. */
+ /* Only 1 b-frame? Disable b-pyramid. */
mainWindow.check_pyrmidalBFrames.Visible = false;
mainWindow.check_pyrmidalBFrames.CheckState = CheckState.Unchecked;
mainWindow.check_weightedBFrames.Visible = true;
mainWindow.check_BidirectionalRefinement.Visible = true;
-
/* Only show B-RDO if both bframes and subme allow it. */
- if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7)
+ if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)
mainWindow.check_bFrameRateDistortion.Visible = true;
-
+
/* Only show direct pred when allowed by both bframes and analysis.*/
- if ( mainWindow.drop_analysis.SelectedIndex != 1)
- {
+ if (mainWindow.drop_analysis.SelectedIndex != 1)
+ {
mainWindow.drop_directPrediction.Visible = true;
mainWindow.lbl_direct_prediction.Visible = true;
}
@@ -822,12 +821,12 @@ namespace Handbrake.Functions mainWindow.check_BidirectionalRefinement.Visible = true;
/* Only show B-RDO if both bframes and subme allow it. */
- if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7)
+ if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex >= 7 || mainWindow.drop_subpixelMotionEstimation.SelectedIndex == 0)
mainWindow.check_bFrameRateDistortion.Visible = true;
-
+
/* Only show direct pred when allowed by both bframes and analysis.*/
- if ( mainWindow.drop_analysis.SelectedIndex != 1)
- {
+ if (mainWindow.drop_analysis.SelectedIndex != 1)
+ {
mainWindow.drop_directPrediction.Visible = true;
mainWindow.lbl_direct_prediction.Visible = true;
}
@@ -847,29 +846,27 @@ namespace Handbrake.Functions mainWindow.lbl_trellis.Visible = true;
}
-
- if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex < 7)
+ if (mainWindow.drop_subpixelMotionEstimation.SelectedIndex < 7 && mainWindow.drop_subpixelMotionEstimation.SelectedIndex != 0)
{
/* When subme < 6, B-RDO doesn't work. */
mainWindow.check_bFrameRateDistortion.Visible = false;
if (sender == "subq" && sender != "brdo")
mainWindow.check_bFrameRateDistortion.CheckState = CheckState.Unchecked;
}
- else if (mainWindow.drop_bFrames.SelectedIndex >= 2 )
+ else if (mainWindow.drop_bFrames.SelectedIndex >= 2)
{
/* Make sure to only display B-RDO if allowed by both
the subme and bframe option settings. */
mainWindow.check_bFrameRateDistortion.Visible = true;
}
-
if (mainWindow.drop_analysis.SelectedIndex == 1)
{
/* No analysis? Disable 8x8dct and direct pred */
mainWindow.check_8x8DCT.Visible = false;
if (sender != "8x8dct")
mainWindow.check_8x8DCT.CheckState = CheckState.Unchecked;
-
+
mainWindow.drop_directPrediction.Visible = false;
if (sender != "direct")
mainWindow.drop_directPrediction.SelectedIndex = 0;
@@ -878,7 +875,7 @@ namespace Handbrake.Functions {
mainWindow.check_8x8DCT.Visible = true;
- if ( mainWindow.drop_bFrames.SelectedIndex >= 2)
+ if (mainWindow.drop_bFrames.SelectedIndex >= 2)
{
/* Onlt show direct pred when allowed by both analysis and bframes */
mainWindow.drop_directPrediction.Visible = true;
|