summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/test.c7
-rw-r--r--win/CS/HandBrake.ApplicationServices/Model/VideoScaler.cs4
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs9
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx3
-rw-r--r--win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs2
-rw-r--r--win/CS/HandBrakeWPF/Services/Scan/LibScan.cs2
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs36
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml9
8 files changed, 5 insertions, 67 deletions
diff --git a/test/test.c b/test/test.c
index eb1c0ced4..da5db9341 100644
--- 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 6a7323ca1..4f407881c 100644
--- 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)")]
[ShortName("swscale")]
Lanczos = 0,
-
- [DisplayName("Bicubic (OpenCL)")]
- [ShortName("opencl")]
- BicubicCl,
}
}
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index aa6a7e1a0..13bc0a312 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1925,15 +1925,6 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// 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..
- /// </summary>
- public static string Video_ScalingModes {
- get {
- return ResourceManager.GetString("Video_ScalingModes", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to Reduce decoder CPU usage.
///
///Set this if your device is struggling to play the output. (i.e. dropped frames).
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index c765c9423..dbd14c314 100644
--- 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.
- On older versions of windows before 8, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required.</value>
</data>
- <data name="Video_ScalingModes" xml:space="preserve">
- <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>
- </data>
<data name="Error" xml:space="preserve">
<value>Error</value>
</data>
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index efa595c4b..20e4eff14 100644
--- 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 955e769ed..de104924f 100644
--- 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 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
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index f0e902585..4be816551 100644
--- 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}" />
</StackPanel>
- <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaling}" FontSize="14" Margin="0,20,0,10" />
+ <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaling}" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />
- <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
+ <StackPanel Orientation="Horizontal" Margin="20,0,0,0" Visibility="Collapsed">
<TextBlock Text="{x:Static Properties:ResourcesUI.Options_Scaler}" Margin="0,0,5,0" VerticalAlignment="Center" />
<ComboBox ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}"
SelectedItem="{Binding SelectedScalingMode, Converter={StaticResource enumComboConverter}}"
Width="120" VerticalAlignment="Center" />
</StackPanel>
- <StackPanel Orientation="Vertical" Margin="26,2,0,0" >
- <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap"
- Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />
- </StackPanel>
-
</StackPanel>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 14:37:15 +0000