Remove the OpenCL Bicubic scaling option. Unfortunatly it's causing too many problems...

diff --git a/test/test.c b/test/test.c
index eb1c0ced44468d2297187059126cf679fe2939c0..da5db9341a326e439cc4dca3dd5f34099efe78f2 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -1242,7 +1242,6 @@ static void ShowHelp()
 "   --queue-import-file <filename>\n"
 "                           Import an encode queue file created by the GUI\n"
 "       --no-dvdnav         Do not use dvdnav for reading DVDs\n"
-"       --no-opencl         Disable use of OpenCL\n"
 "\n"
 "\n"
 "Source Options ---------------------------------------------------------------\n"
@@ -1292,7 +1291,6 @@ static void ShowHelp()
 "       --no-optimize       Disable preset 'optimize'\n"
 "   -I, --ipod-atom         Add iPod 5G compatibility atom to MP4 container\n"
 "       --no-ipod-atom      Disable iPod 5G atom\n"
-"   -P, --use-opencl        Use OpenCL where applicable\n"
 "\n"
 "\n"
 "Video Options ----------------------------------------------------------------\n"
@@ -2039,7 +2037,6 @@ static int ParseOptions( int argc, char ** argv )
             { "describe",    no_argument,       NULL,    DESCRIBE },
             { "verbose",     optional_argument, NULL,    'v' },
             { "no-dvdnav",   no_argument,       NULL,    DVDNAV },
-            { "no-opencl",   no_argument,       &use_opencl, 0 },
 
 #ifdef USE_QSV
             { "qsv-baseline",         no_argument,       NULL,        QSV_BASELINE,       },
@@ -2056,7 +2053,6 @@ static int ParseOptions( int argc, char ** argv )
             { "no-optimize", no_argument,       &mp4_optimize, 0 },
             { "ipod-atom",   no_argument,       NULL,        'I' },
             { "no-ipod-atom",no_argument,       &ipod_atom,    0 },
-            { "use-opencl",  no_argument,       NULL,        'P' },
 
             { "title",       required_argument, NULL,    't' },
             { "min-duration",required_argument, NULL,    MIN_DURATION },
@@ -2305,9 +2301,6 @@ static int ParseOptions( int argc, char ** argv )
             case 'I':
                 ipod_atom = 1;
                 break;
-            case 'P':
-                use_opencl = 1;
-                break;
             case 't':
                 titleindex = atoi( optarg );
                 break;

diff --git a/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs b/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs
index 6a7323ca1ad4c400e88359cde753258024f51b87..4f407881cebd2360c8a673236461a53242859337 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs
@@ -19,9 +19,5 @@ namespace HandBrake.ApplicationServices.Model
         [DisplayName("Lanczos (default)")]\r
         [ShortName("swscale")]\r
         Lanczos = 0,\r
-\r
-        [DisplayName("Bicubic (OpenCL)")]\r
-        [ShortName("opencl")]\r
-        BicubicCl,\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index aa6a7e1a07a7693d7e9dc8682bdac5e0e8136820..13bc0a31225d7fdf0003c9b02d3bbc153e7e77b2 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1924,15 +1924,6 @@ namespace HandBrakeWPF.Properties {
             }\r
         }\r
         \r
-        /// <summary>\r
-        ///   Looks up a localized string similar to Requires a graphics card that supports OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use. Performance gain up to 5%. Minor decrease in quality in some cases..\r
-        /// </summary>\r
-        public static string Video_ScalingModes {\r
-            get {\r
-                return ResourceManager.GetString("Video_ScalingModes", resourceCulture);\r
-            }\r
-        }\r
-        \r
         /// <summary>\r
         ///   Looks up a localized string similar to Reduce decoder CPU usage.\r
         ///\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index c765c9423c5aa8679ebf25dabdd13a3892e6a7ec..dbd14c314ee02d7466fdbfdae5313605a44b4ec3 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -321,9 +321,6 @@ In order to use the QuickSync encoder, you must:
 - Have the HD Graphics enabled.\r
 - On older versions of windows before 8, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required.</value>\r
   </data>\r
-  <data name="Video_ScalingModes" xml:space="preserve">\r
-    <value>Requires a graphics card that supports OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use. Performance gain up to 5%. Minor decrease in quality in some cases.</value>\r
-  </data>\r
   <data name="Error" xml:space="preserve">\r
     <value>Error</value>\r
   </data>\r

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index efa595c4b7b981bd7ec1955f0f0247645b9c69ae..20e4eff14e4da1cd418a62a16a87eddf49174b99 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -302,8 +302,6 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 video.Turbo = job.TurboFirstPass;
             }
 
-            video.OpenCL = configuration.ScalingMode == VideoScaler.BicubicCl;
-
             video.QSV.Decode = SystemInfo.IsQsvAvailable && !configuration.DisableQuickSyncDecoding;
 
             // The use of the QSV decoder is configurable for non QSV encoders.

diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index 955e769eda75d6ebab8dca93351162891aeaafcc..de104924ff8a629c2f3e06d1bc46a9bcf78d4708 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -261,7 +261,7 @@ namespace HandBrakeWPF.Services.Scan
                 HandBrakeUtils.SetDvdNav(!configuraiton.IsDvdNavDisabled);
 
                 this.ServiceLogMessage("Starting Scan ...");
-                this.instance.StartScan(sourcePath.ToString(), previewCount, minDuration, title != 0 ? title : 0, configuraiton.ScalingMode == VideoScaler.BicubicCl);
+                this.instance.StartScan(sourcePath.ToString(), previewCount, minDuration, title != 0 ? title : 0);
 
                 if (this.ScanStarted != null)
                     this.ScanStarted(this, System.EventArgs.Empty);

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 69338721b262fcc222af5627330b3f73274d14c1..c621612646a07c2bafe4c57f543ed1f0ed243f5c 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -88,9 +88,8 @@ namespace HandBrakeWPF.ViewModels
         private bool showAdvancedTab;\r
         private bool removePunctuation;\r
         private bool resetWhenDoneAction;\r
-        private VideoScaler selectedScalingMode;\r
+\r
         private bool disableQuickSyncDecoding;\r
-        private bool isClScaling;\r
         private bool showQueueInline;\r
         private bool pauseOnLowDiskspace;\r
         private long pauseOnLowDiskspaceLevel;\r
@@ -971,18 +970,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Gets or sets the selected scaling mode.\r
         /// </summary>\r
-        public VideoScaler SelectedScalingMode\r
-        {\r
-            get\r
-            {\r
-                return this.selectedScalingMode;\r
-            }\r
-            set\r
-            {\r
-                this.selectedScalingMode = value;\r
-                this.IsClScaling = value == VideoScaler.BicubicCl;\r
-            }\r
-        }\r
+        public VideoScaler SelectedScalingMode { get; set; }\r
 \r
         /// <summary>\r
         /// Gets a value indicating whether is quick sync available.\r
@@ -1034,26 +1022,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether is cl scaling.\r
-        /// </summary>\r
-        public bool IsClScaling\r
-        {\r
-            get\r
-            {\r
-                return this.isClScaling;\r
-            }\r
-            set\r
-            {\r
-                if (value.Equals(this.isClScaling))\r
-                {\r
-                    return;\r
-                }\r
-                this.isClScaling = value;\r
-                this.NotifyOfPropertyChange(() => this.IsClScaling);\r
-            }\r
-        }\r
-\r
         #endregion\r
 \r
         #endregion\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index f0e902585486b3464e6605c4f1dc9c0a61fa66ca..4be816551fbab72554490c816fc85fe96a2ac5d9 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -243,20 +243,15 @@
                                         Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
                         </StackPanel>\r
 \r
-                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaling}" FontSize="14" Margin="0,20,0,10" />\r
+                        <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaling}" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />\r
 \r
-                        <StackPanel Orientation="Horizontal" Margin="20,0,0,0">\r
+                        <StackPanel Orientation="Horizontal" Margin="20,0,0,0" Visibility="Collapsed">\r
                             <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaler}" Margin="0,0,5,0" VerticalAlignment="Center" />\r
                             <ComboBox  ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}" \r
                                        SelectedItem="{Binding SelectedScalingMode, Converter={StaticResource enumComboConverter}}" \r
                                        Width="120" VerticalAlignment="Center" />\r
                         </StackPanel>\r
 \r
-                        <StackPanel Orientation="Vertical" Margin="26,2,0,0" >\r
-                            <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap"\r
-                                       Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />\r
-                        </StackPanel>\r
-\r
                     </StackPanel>\r
 \r
 \r