Remove the OpenCL Bicubic scaling option. Unfortunatly it's causing too many problems and it's maximum 5% performance improvement (in ideal circumstances) doesn't justify the effort to continue with it. The OpenCL framework will remain in place in case we decide to use it for something in the future. Closes #690

1 files changed, 2 insertions, 34 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 69338721b..c62161264 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -88,9 +88,8 @@ namespace HandBrakeWPF.ViewModels
         private bool showAdvancedTab;

         private bool removePunctuation;

         private bool resetWhenDoneAction;

-        private VideoScaler selectedScalingMode;

+

         private bool disableQuickSyncDecoding;

-        private bool isClScaling;

         private bool showQueueInline;

         private bool pauseOnLowDiskspace;

         private long pauseOnLowDiskspaceLevel;

@@ -971,18 +970,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Gets or sets the selected scaling mode.

         /// </summary>

-        public VideoScaler SelectedScalingMode

-        {

-            get

-            {

-                return this.selectedScalingMode;

-            }

-            set

-            {

-                this.selectedScalingMode = value;

-                this.IsClScaling = value == VideoScaler.BicubicCl;

-            }

-        }

+        public VideoScaler SelectedScalingMode { get; set; }

 

         /// <summary>

         /// Gets a value indicating whether is quick sync available.

@@ -1034,26 +1022,6 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-        /// <summary>

-        /// Gets or sets a value indicating whether is cl scaling.

-        /// </summary>

-        public bool IsClScaling

-        {

-            get

-            {

-                return this.isClScaling;

-            }

-            set

-            {

-                if (value.Equals(this.isClScaling))

-                {

-                    return;

-                }

-                this.isClScaling = value;

-                this.NotifyOfPropertyChange(() => this.IsClScaling);

-            }

-        }

-

         #endregion

 

         #endregion