Added support for QSV load balancing.

RandomEngy · RandomEngy · commit 39eb4d40ff6e · 2025-08-26T08:12:09.000-07:00
Added number of QSV cores to Options UI.
Implemented QSV hyperencode.
diff --git a/VidCoder/Resources/OptionsRes.Designer.cs b/VidCoder/Resources/OptionsRes.Designer.cs
diff --git a/VidCoder/Resources/OptionsRes.resx b/VidCoder/Resources/OptionsRes.resx
@@ -470,4 +470,9 @@ Polling: Periodically checks the contents of the folders. Uses significant CPU a
     <value>Supported codecs: {0}</value>
     <comment>Format string for codec lists. {0} is replaced with comma-separated list of codecs.</comment>
   </data>
+  <data name="QsvEncoderCount" xml:space="preserve">
+    <value>QSV Encoder Cores: {0}</value>
+    <comment>Indicator for how many QSV cores are available on the system.
+{0} is the number of cores, for example "2"</comment>
+  </data>
 </root>
diff --git a/VidCoder/Services/HandBrakeProxy/LocalEncodeProxy.cs b/VidCoder/Services/HandBrakeProxy/LocalEncodeProxy.cs
@@ -13,6 +13,7 @@
 using VidCoderCommon.Utilities;
 using HandBrake.Interop.Interop.Interfaces.EventArgs;
 using System.Text.Json;
+using Microsoft.AnyContainer;
 
 namespace VidCoder;
 
@@ -27,6 +28,8 @@ public class LocalEncodeProxy : IEncodeProxy
 	private ManualResetEventSlim encodeStartEvent;
 	private ManualResetEventSlim encodeEndEvent;
 
+	private QsvLoadBalancingService qsvLoadBalancingService = StaticResolver.Resolve<QsvLoadBalancingService>();
+
 	private bool encoding;
 
 	public event EventHandler EncodeStarted;
@@ -58,6 +61,7 @@ public Task StartEncodeAsync(
 						encodeTitle,
 						EncodingRes.DefaultChapterName,
 						VideoCodecUtilities.CreateJobConfiguration(),
+						this.qsvLoadBalancingService.GetQsvGpu(job),
 						true,
 						preview ? previewNumber : -1,
 						previewSeconds,
diff --git a/VidCoder/Services/HandBrakeProxy/RemoteEncodeProxy.cs b/VidCoder/Services/HandBrakeProxy/RemoteEncodeProxy.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using HandBrake.Interop.Interop.Interfaces.EventArgs;
+using Microsoft.AnyContainer;
 using PipeMethodCalls;
 using VidCoder.Model;
 using VidCoder.Resources;
@@ -34,6 +35,8 @@ public class RemoteEncodeProxy : RemoteProxyBase<IHandBrakeEncodeWorker, IHandBr
 	private SemaphoreSlim encodeStartEvent;
 	private SemaphoreSlim encodeEndEvent;
 
+	private QsvLoadBalancingService qsvLoadBalancingService = StaticResolver.Resolve<QsvLoadBalancingService>();
+
 	public async Task StartEncodeAsync(
 		VCJob job,
 		IAppLogger logger,
@@ -53,7 +56,8 @@ await this.RunOperationAsync(worker =>
 				preview ? previewNumber : -1,
 				previewSeconds,
 				EncodingRes.DefaultChapterName,
-				VideoCodecUtilities.CreateJobConfiguration())
+				VideoCodecUtilities.CreateJobConfiguration(),
+				qsvLoadBalancingService.GetQsvGpu(job))
 		);
 	}
 
diff --git a/VidCoder/Services/PreviewImageService.cs b/VidCoder/Services/PreviewImageService.cs
@@ -485,6 +485,7 @@ private void ProcessPreviewImageWork(object state)
 					imageJob.Title,
 					EncodingRes.DefaultChapterName,
 					VideoCodecUtilities.CreateJobConfiguration(),
+					qsvGpu: -1,
 					isEncode: false);
 
 				// Make a HandBrake call to get the image
diff --git a/VidCoder/Services/QsvLoadBalancingService.cs b/VidCoder/Services/QsvLoadBalancingService.cs
@@ -0,0 +1,42 @@
+﻿using HandBrake.Interop.Interop;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VidCoderCommon.Model;
+
+namespace VidCoder.Services;
+
+public class QsvLoadBalancingService
+{
+	private List<int> qsvGpus = new List<int>();
+	private int currentGpuIndex = -1;
+
+	public QsvLoadBalancingService()
+	{
+		this.qsvGpus = HandBrakeEncoderHelpers.GetQsvAdaptorList();
+	}
+
+	public int GetQsvGpu(VCJob job)
+	{
+		if (!job.EncodingProfile.VideoEncoder.StartsWith("qsv_", StringComparison.Ordinal))
+		{
+			return -1;
+		}
+
+		if (!Config.UseWorkerProcess)
+		{
+			return -1;
+		}
+
+		if (Config.MaxSimultaneousEncodes == 1)
+		{
+			return -1;
+		}
+
+		this.currentGpuIndex++;
+
+		return this.qsvGpus[this.currentGpuIndex % this.qsvGpus.Count];
+	}
+}
diff --git a/VidCoder/Utilities/Ioc.cs b/VidCoder/Utilities/Ioc.cs
@@ -64,6 +64,7 @@ public static void SetUp()
 		container.RegisterSingleton<StatusService>();
 		container.RegisterSingleton<PreviewUpdateService>();
 		container.RegisterSingleton<PreviewImageService>();
+		container.RegisterSingleton<QsvLoadBalancingService>();
 		container.RegisterSingleton<ClipboardService>();
 		container.RegisterSingleton<TrayService>();
 		container.RegisterSingleton<AppLoggerFactory>();
diff --git a/VidCoder/View/OptionsDialog.xaml b/VidCoder/View/OptionsDialog.xaml
@@ -475,7 +475,8 @@
 
 								<StackPanel Orientation="Vertical" Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource VisibilityConverter}}">
 									<controls:AvailabilityIndicator />
-									<TextBlock Text="{Binding QsvEncoders}" />
+									<TextBlock Margin="0 2 0 0" Text="{Binding QsvEncoders}" />
+									<TextBlock Margin="0 2 0 0" Text="{Binding QsvEncoderCount}" />
 
 									<CheckBox
 										Margin="0 6 0 0"
diff --git a/VidCoder/ViewModel/OptionsDialogViewModel.cs b/VidCoder/ViewModel/OptionsDialogViewModel.cs
@@ -183,6 +183,9 @@ public OptionsDialogViewModel(IUpdater updateService)
 
 		this.PlayerChoices = Players.All;
 
+		int qsvCount = HandBrakeEncoderHelpers.GetQsvAdaptorList().Count();
+		this.QsvEncoderCount = string.Format(OptionsRes.QsvEncoderCount, qsvCount);
+
 		int tabIndex = Config.OptionsDialogLastTab;
 		if (tabIndex >= this.Tabs.Count)
 		{
@@ -722,6 +725,8 @@ private static string GetEncodersByPrefix(List<HBVideoEncoder> encoders, string
 
 	public string MFEncoders => GetEncodersByPrefix(HandBrakeEncoderHelpers.VideoEncoders, "mf_");
 
+	public string QsvEncoderCount { get; }
+
 	public bool EnableQuickSyncDecoding
 	{
 		get => Config.EnableQuickSyncDecoding;
diff --git a/VidCoder/ViewModel/QueueTitlesWindowViewModel.cs b/VidCoder/ViewModel/QueueTitlesWindowViewModel.cs
@@ -91,6 +91,7 @@ private void OnSelectedTitlesCollectionChanged(object sender, System.Collections
 				title,
 				EncodingRes.DefaultChapterName,
 				VideoCodecUtilities.CreateJobConfiguration(),
+				qsvGpu: -1,
 				isEncode: false);
 
 			this.PreviewImage = BitmapUtilities.ConvertToBitmapImage(BitmapUtilities.ConvertByteArrayToBitmap(this.main.ScanInstance.GetPreview(jsonEncodeObject, 2)));
diff --git a/VidCoderCommon/IHandBrakeEncodeWorker.cs b/VidCoderCommon/IHandBrakeEncodeWorker.cs
@@ -15,7 +15,8 @@ void StartEncode(
 		int previewNumber,
 		int previewSeconds,
 		string defaultChapterNameFormat,
-		JobConfiguration jobConfiguration);
+		JobConfiguration jobConfiguration,
+		int qsvGpu);
 
 	/// <summary>
 	/// Starts an encode with the given encode JSON.
diff --git a/VidCoderCommon/Model/Job/JobConfiguration.cs b/VidCoderCommon/Model/Job/JobConfiguration.cs
@@ -10,6 +10,7 @@ public class JobConfiguration
 	{
 		public bool EnableQuickSyncDecoding { get; set; }
 		public bool UseQsvDecodeForNonQsvEncodes { get; set; }
+		public bool EnableQuickSyncHyperEncode { get; set; }
 		public bool EnableNVDec { get; set; }
 		public bool EnableDirectXDecoding { get; set; }
 	}
diff --git a/VidCoderCommon/Model/JsonEncodeFactory.cs b/VidCoderCommon/Model/JsonEncodeFactory.cs
@@ -47,7 +47,9 @@ public JsonEncodeFactory(ILogger logger)
 	/// <param name="job">The encode job to convert.</param>
 	/// <param name="title">The source title.</param>
 	/// <param name="defaultChapterNameFormat">The format for a default chapter name.</param>
-	/// <param name="enableNVDec">True to enable NVDec decoding.</param>
+	/// <param name="jobConfiguration">Values from user configuration.</param>
+	/// <param name="qsvGpu">The specific GPU to use for the QSV encode, or -1 if no specific GPU is chosen.</param>
+	/// <param name="isEncode">True if this is being created for an encode job. False for an image preview.</param>
 	/// <param name="previewNumber">The preview number to start at (0-based). Leave off for a normal encode.</param>
 	/// <param name="previewSeconds">The number of seconds long to make the preview.</param>
 	/// <param name="previewCount">The total number of previews.</param>
@@ -57,6 +59,7 @@ public JsonEncodeObject CreateJsonObject(
 		SourceTitle title,
 		string defaultChapterNameFormat,
 		JobConfiguration jobConfiguration,
+		int qsvGpu,
 		bool isEncode,
 		int previewNumber = -1,
 		int previewSeconds = 0,
@@ -94,6 +97,7 @@ public JsonEncodeObject CreateJsonObject(
 				job,
 				title,
 				jobConfiguration,
+				qsvGpu,
 				previewLengthSeconds: previewSeconds,
 				isEncode: isEncode)
 		};
@@ -942,6 +946,7 @@ private Video CreateVideo(
 		VCJob job,
 		SourceTitle title,
 		JobConfiguration jobConfiguration,
+		int qsvGpu,
 		int previewLengthSeconds,
 		bool isEncode)
 	{
@@ -955,13 +960,19 @@ private Video CreateVideo(
 		}
 
 		video.Encoder = videoEncoder.ShortName;
+		string videoOptions = profile.VideoOptions?.Trim() ?? string.Empty;
 
 		if (isEncode)
 		{
 			if (videoEncoder.IsQuickSync)
 			{
 				video.HardwareDecode = HandBrakeHardwareEncoderHelper.IsQsvAvailable && jobConfiguration.EnableQuickSyncDecoding ?
 					 NativeConstants.HB_DECODE_QSV | NativeConstants.HB_DECODE_FORCE_HW : 0;
+
+				if (qsvGpu >= 0 && !videoOptions.Contains("gpu="))
+				{
+					videoOptions = AdvancedOptionUtilities.Prepend($"gpu={qsvGpu}", videoOptions);
+				}
 			}
 
 			// Allow use of the QSV decoder is configurable for non QSV encoders.
@@ -971,6 +982,11 @@ private Video CreateVideo(
 					NativeConstants.HB_DECODE_QSV | NativeConstants.HB_DECODE_FORCE_HW : 0;
 			}
 
+			if (jobConfiguration.EnableQuickSyncHyperEncode && HandBrakeHardwareEncoderHelper.IsQsvAvailable)
+			{
+				videoOptions = AdvancedOptionUtilities.Prepend("hyperencode=adaptive", videoOptions);
+			}
+
 			if (jobConfiguration.EnableNVDec)
 			{
 				video.HardwareDecode = NativeConstants.HB_DECODE_NVDEC;
@@ -982,9 +998,8 @@ private Video CreateVideo(
 			}
 		}
 
-
 		video.Level = profile.VideoLevel ?? "auto";
-		video.Options = profile.VideoOptions?.Trim();
+		video.Options = videoOptions;
 		video.Preset = profile.VideoPreset;
 		video.Profile = profile.VideoProfile ?? "auto";
 
diff --git a/VidCoderCommon/Utilities/AdvancedOptionUtilities.cs b/VidCoderCommon/Utilities/AdvancedOptionUtilities.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VidCoderCommon.Utilities;
+
+public static class AdvancedOptionUtilities
+{
+	public static string Prepend(string option, string existingOptions)
+	{
+		if (string.IsNullOrEmpty(existingOptions))
+		{
+			return option;
+		}
+		else
+		{
+			return option + ":" + existingOptions;
+		}
+	}
+}
diff --git a/VidCoderWorker/HandBrakeEncodeWorker.cs b/VidCoderWorker/HandBrakeEncodeWorker.cs
@@ -39,13 +39,14 @@ public HandBrakeEncodeWorker(IPipeInvoker<IHandBrakeEncodeWorkerCallback> callba
 	/// <param name="previewNumber">The preview number to run.</param>
 	/// <param name="previewSeconds">The number of seconds the preview should be.</param>
 	/// <param name="defaultChapterNameFormat">The default format for chapter names.</param>
-	/// <param name="enableNVDec">Enable the NVDec hardware decoder.</param>
+	/// <param name="jobConfiguration">Values from user configuration.</param>
 	public void StartEncode(
 		VCJob job,
 		int previewNumber,
 		int previewSeconds,
 		string defaultChapterNameFormat,
-		JobConfiguration jobConfiguration)
+		JobConfiguration jobConfiguration,
+		int qsvGpu)
 	{
 		this.StartEncodeInternal(
 			job.SourcePath,
@@ -62,6 +63,7 @@ public void StartEncode(
 						encodeTitle,
 						defaultChapterNameFormat,
 						jobConfiguration,
+						qsvGpu,
 						true,
 						previewNumber,
 						previewSeconds,

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ public OptionsDialogViewModel(IUpdater updateService)`
`183`	`183`
`184`	`184`	`this.PlayerChoices = Players.All;`
`185`	`185`
	`186`	`+ int qsvCount = HandBrakeEncoderHelpers.GetQsvAdaptorList().Count();`
	`187`	`+ this.QsvEncoderCount = string.Format(OptionsRes.QsvEncoderCount, qsvCount);`
	`188`	`+`
`186`	`189`	`int tabIndex = Config.OptionsDialogLastTab;`
`187`	`190`	`if (tabIndex >= this.Tabs.Count)`
`188`	`191`	`{`
`@@ -722,6 +725,8 @@ private static string GetEncodersByPrefix(List<HBVideoEncoder> encoders, string`
`722`	`725`
`723`	`726`	`public string MFEncoders => GetEncodersByPrefix(HandBrakeEncoderHelpers.VideoEncoders, "mf_");`
`724`	`727`
	`728`	`+ public string QsvEncoderCount { get; }`
	`729`	`+`
`725`	`730`	`public bool EnableQuickSyncDecoding`
`726`	`731`	`{`
`727`	`732`	`get => Config.EnableQuickSyncDecoding;`