pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

rework qsv initialization on windows

rework-qsv-init-windows
Jason Dove 1 month ago
parent
7c5137a4af
commit
ba3c736140
No known key found for this signature in database
6 changed files with 103 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 11
      ErsatzTV.FFmpeg/Environment/CudaVisibleDevicesVariable.cs
  3. 4
      ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/QsvHardwareAccelerationOption.cs
  4. 2
      ErsatzTV.FFmpeg/InputOption/StreamSeekInputOption.cs
  5. 4
      ErsatzTV.FFmpeg/Pipeline/QsvPipelineBuilder.cs
  6. 131
      ErsatzTV.Scanner.Tests/Core/FFmpeg/TranscodingTests.cs

1
.gitignore vendored
Unescape View File

@ -40,6 +40,7 @@ msbuild.wrn @@ -40,6 +40,7 @@ msbuild.wrn
core
scripts/generate-api-sdk/swagger.json
scripts/download-test-content.sh
docker-compose.override.yml

11
ErsatzTV.FFmpeg/Environment/CudaVisibleDevicesVariable.cs
Unescape View File

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
namespace ErsatzTV.FFmpeg.Environment;
public class CudaVisibleDevicesVariable(string visibleDevices) : IPipelineStep
{
public EnvironmentVariable[] EnvironmentVariables => [ new("CUDA_VISIBLE_DEVICES", visibleDevices) ];
public string[] GlobalOptions => [];
public string[] InputOptions(InputFile inputFile) => [];
public string[] FilterOptions => [];
public string[] OutputOptions => [];
public FrameState NextState(FrameState currentState) => currentState;
}

4
ErsatzTV.FFmpeg/GlobalOption/HardwareAcceleration/QsvHardwareAccelerationOption.cs
Unescape View File

@ -16,9 +16,7 @@ public class QsvHardwareAccelerationOption(Option<string> device, FFmpegCapabili @@ -16,9 +16,7 @@ public class QsvHardwareAccelerationOption(Option<string> device, FFmpegCapabili
{
get
{
string[] initDevices = OperatingSystem.IsWindows()
? new[] { "-init_hw_device", "d3d11va=hw:,vendor=0x8086", "-filter_hw_device", "hw" }
: new[] { "-init_hw_device", "qsv=hw", "-filter_hw_device", "hw" };
string[] initDevices = ["-init_hw_device", "qsv=hw", "-filter_hw_device", "hw"];
var result = new List<string>
{

2
ErsatzTV.FFmpeg/InputOption/StreamSeekInputOption.cs
Unescape View File

@ -15,7 +15,7 @@ public class StreamSeekInputOption : IInputOption @@ -15,7 +15,7 @@ public class StreamSeekInputOption : IInputOption
public string[] OutputOptions => Array.Empty<string>();
public FrameState NextState(FrameState currentState) => currentState;
public bool AppliesTo(AudioInputFile audioInputFile) => true;
public bool AppliesTo(AudioInputFile audioInputFile) => audioInputFile is not NullAudioInputFile;
// don't seek into a still image
public bool AppliesTo(VideoInputFile videoInputFile) => videoInputFile.VideoStreams.All(s => !s.StillImage);

4
ErsatzTV.FFmpeg/Pipeline/QsvPipelineBuilder.cs
Unescape View File

@ -3,6 +3,7 @@ using ErsatzTV.FFmpeg.Decoder; @@ -3,6 +3,7 @@ using ErsatzTV.FFmpeg.Decoder;
using ErsatzTV.FFmpeg.Decoder.Qsv;
using ErsatzTV.FFmpeg.Encoder;
using ErsatzTV.FFmpeg.Encoder.Qsv;
using ErsatzTV.FFmpeg.Environment;
using ErsatzTV.FFmpeg.Filter;
using ErsatzTV.FFmpeg.Filter.Qsv;
using ErsatzTV.FFmpeg.Format;
@ -89,6 +90,9 @@ public class QsvPipelineBuilder : SoftwarePipelineBuilder @@ -89,6 +90,9 @@ public class QsvPipelineBuilder : SoftwarePipelineBuilder
decodeCapability = FFmpegCapability.Software;
}
// give a bogus value so no cuda devices are visible to ffmpeg
pipelineSteps.Add(new CudaVisibleDevicesVariable("999"));
pipelineSteps.Add(new QsvHardwareAccelerationOption(ffmpegState.VaapiDevice, decodeCapability));
// disable hw accel if decoder/encoder isn't supported

131
ErsatzTV.Scanner.Tests/Core/FFmpeg/TranscodingTests.cs
Unescape View File

@ -105,28 +105,34 @@ public class TranscodingTests @@ -105,28 +105,34 @@ public class TranscodingTests
Text
}
public enum Seek
{
None,
Middle
}
private class TestData
{
public static Watermark[] Watermarks =
[
Watermark.None,
Watermark.PermanentOpaqueScaled,
Watermark.PermanentOpaqueActualSize,
Watermark.PermanentTransparentScaled,
Watermark.PermanentTransparentActualSize
//Watermark.PermanentOpaqueActualSize,
//Watermark.PermanentTransparentScaled,
//Watermark.PermanentTransparentActualSize
];
public static Subtitle[] Subtitles =
[
Subtitle.None,
Subtitle.Picture,
Subtitle.Text
//Subtitle.Picture,
//Subtitle.Text
];
public static Padding[] Paddings =
[
Padding.NoPadding,
Padding.WithPadding
//Padding.WithPadding
];
public static ScalingBehavior[] ScalingBehaviors =
@ -159,14 +165,14 @@ public class TranscodingTests @@ -159,14 +165,14 @@ public class TranscodingTests
// new("mpeg2video", "yuv420p"),
// //
//new InputFormat("libx265", "yuv420p"),
new InputFormat("libx265", "yuv420p10le")
//new("libx265", "yuv420p10le"),
//
// new("mpeg4", "yuv420p"),
//
// new("libvpx-vp9", "yuv420p"),
// new("libvpx-vp9", "yuv420p10le"),
//
// // // new("libaom-av1", "yuv420p")
//new("libsvtav1", "yuv420p")
// // // av1 yuv420p10le 51
// //
// new("msmpeg4v2", "yuv420p"),
@ -175,6 +181,12 @@ public class TranscodingTests @@ -175,6 +181,12 @@ public class TranscodingTests
// // wmv3 yuv420p 1
];
public static Seek[] Seeks =
[
Seek.None,
Seek.Middle
];
public static Resolution[] Resolutions =
[
new Resolution { Width = 1920, Height = 1080 },
@ -212,7 +224,7 @@ public class TranscodingTests @@ -212,7 +224,7 @@ public class TranscodingTests
//StreamingMode.HttpLiveStreamingSegmenterV2
];
public static string[] FilesToTest => [string.Empty];
public static string[] FilesToTest => Directory.GetFiles("/home/jason/Videos/ErsatzTV/test-content");
}
[Test]
@ -393,6 +405,7 @@ public class TranscodingTests @@ -393,6 +405,7 @@ public class TranscodingTests
VaapiDriver.RadeonSI,
localStatisticsProvider,
streamingMode,
watermark,
() => videoVersion);
}
@ -401,8 +414,10 @@ public class TranscodingTests @@ -401,8 +414,10 @@ public class TranscodingTests
public async Task Transcode(
[ValueSource(typeof(TestData), nameof(TestData.FilesToTest))]
string fileToTest,
[ValueSource(typeof(TestData), nameof(TestData.InputFormats))]
InputFormat inputFormat,
//[ValueSource(typeof(TestData), nameof(TestData.InputFormats))]
//InputFormat inputFormat,
[ValueSource(typeof(TestData), nameof(TestData.Seeks))]
Seek seek,
[ValueSource(typeof(TestData), nameof(TestData.Resolutions))]
Resolution profileResolution,
[ValueSource(typeof(TestData), nameof(TestData.BitDepths))]
@ -425,29 +440,29 @@ public class TranscodingTests @@ -425,29 +440,29 @@ public class TranscodingTests
StreamingMode streamingMode)
{
string file = fileToTest;
if (string.IsNullOrWhiteSpace(file))
{
// some formats don't support interlaced content (mpeg1video, msmpeg4v2, msmpeg4v3)
// others (libx265, any 10-bit) are unlikely to have interlaced content, so don't bother testing
if (inputFormat.Encoder is "mpeg1video" or "msmpeg4v2" or "msmpeg4v3" or "libx265" ||
inputFormat.PixelFormat.Contains("10"))
{
if (videoScanKind == VideoScanKind.Interlaced)
{
Assert.Inconclusive(
$"{inputFormat.Encoder}/{inputFormat.PixelFormat} does not support interlaced content");
return;
}
}
string name = GetStringSha256Hash($"{inputFormat}_{videoScanKind}_{padding}_{scalingBehavior}_{subtitle}");
file = Path.Combine(TestContext.CurrentContext.TestDirectory, $"{name}.mkv");
if (!File.Exists(file))
{
await GenerateTestFile(inputFormat, padding, scalingBehavior, videoScanKind, subtitle, file);
}
}
// if (string.IsNullOrWhiteSpace(file))
// {
// // some formats don't support interlaced content (mpeg1video, msmpeg4v2, msmpeg4v3)
// // others (libx265, any 10-bit) are unlikely to have interlaced content, so don't bother testing
// if (inputFormat.Encoder is "mpeg1video" or "msmpeg4v2" or "msmpeg4v3" or "libx265" ||
// inputFormat.PixelFormat.Contains("10"))
// {
// if (videoScanKind == VideoScanKind.Interlaced)
// {
// Assert.Inconclusive(
// $"{inputFormat.Encoder}/{inputFormat.PixelFormat} does not support interlaced content");
// return;
// }
// }
//
// string name = GetStringSha256Hash($"{inputFormat}_{videoScanKind}_{padding}_{scalingBehavior}_{subtitle}");
//
// file = Path.Combine(TestContext.CurrentContext.TestDirectory, $"{name}.mkv");
// if (!File.Exists(file))
// {
// await GenerateTestFile(inputFormat, padding, scalingBehavior, videoScanKind, subtitle, file);
// }
// }
var v = new MediaVersion
{
@ -574,7 +589,7 @@ public class TranscodingTests @@ -574,7 +589,7 @@ public class TranscodingTests
.Any();
// TODO: sometimes scaling is used for pixel format, so this is harder to assert the absence
if (profileResolution.Width != 1920 && profileResolution.Width != 640)
if (v.Width != profileResolution.Width && v.Height != profileResolution.Height)
{
hasScaling.ShouldBeTrue();
}
@ -614,6 +629,12 @@ public class TranscodingTests @@ -614,6 +629,12 @@ public class TranscodingTests
FFmpegLibraryProcessService service = GetService();
TimeSpan startTime = TimeSpan.Zero;
if (seek is Seek.Middle)
{
startTime = v.Duration / 2.0;
}
Command process = await service.ForPlayoutItem(
ExecutableName("ffmpeg"),
ExecutableName("ffprobe"),
@ -653,8 +674,8 @@ public class TranscodingTests @@ -653,8 +674,8 @@ public class TranscodingTests
Option<int>.None,
false,
FillerKind.None,
TimeSpan.Zero,
TimeSpan.FromSeconds(3),
startTime,
startTime + TimeSpan.FromSeconds(3),
0,
None,
false,
@ -671,6 +692,7 @@ public class TranscodingTests @@ -671,6 +692,7 @@ public class TranscodingTests
VaapiDriver.RadeonSI,
localStatisticsProvider,
streamingMode,
watermark,
() => v);
}
@ -688,7 +710,9 @@ public class TranscodingTests @@ -688,7 +710,9 @@ public class TranscodingTests
// TODO: how do we make sure this actually appears
FrequencyMinutes = 1,
DurationSeconds = 2,
Opacity = 100
Opacity = 100,
HorizontalMarginPercent = 5,
VerticalMarginPercent = 5
};
case Watermark.IntermittentTransparent:
return new ChannelWatermark
@ -698,7 +722,9 @@ public class TranscodingTests @@ -698,7 +722,9 @@ public class TranscodingTests
// TODO: how do we make sure this actually appears
FrequencyMinutes = 1,
DurationSeconds = 2,
Opacity = 80
Opacity = 80,
HorizontalMarginPercent = 5,
VerticalMarginPercent = 5
};
case Watermark.PermanentOpaqueScaled:
return new ChannelWatermark
@ -707,7 +733,9 @@ public class TranscodingTests @@ -707,7 +733,9 @@ public class TranscodingTests
Mode = ChannelWatermarkMode.Permanent,
Opacity = 100,
Size = WatermarkSize.Scaled,
WidthPercent = 15
WidthPercent = 15,
HorizontalMarginPercent = 5,
VerticalMarginPercent = 5
};
case Watermark.PermanentOpaqueActualSize:
return new ChannelWatermark
@ -715,7 +743,9 @@ public class TranscodingTests @@ -715,7 +743,9 @@ public class TranscodingTests
ImageSource = ChannelWatermarkImageSource.Custom,
Mode = ChannelWatermarkMode.Permanent,
Opacity = 100,
Size = WatermarkSize.ActualSize
Size = WatermarkSize.ActualSize,
HorizontalMarginPercent = 5,
VerticalMarginPercent = 5
};
case Watermark.PermanentTransparentScaled:
return new ChannelWatermark
@ -724,7 +754,9 @@ public class TranscodingTests @@ -724,7 +754,9 @@ public class TranscodingTests
Mode = ChannelWatermarkMode.Permanent,
Opacity = 80,
Size = WatermarkSize.Scaled,
WidthPercent = 15
WidthPercent = 15,
HorizontalMarginPercent = 5,
VerticalMarginPercent = 5
};
case Watermark.PermanentTransparentActualSize:
return new ChannelWatermark
@ -732,7 +764,9 @@ public class TranscodingTests @@ -732,7 +764,9 @@ public class TranscodingTests
ImageSource = ChannelWatermarkImageSource.Custom,
Mode = ChannelWatermarkMode.Permanent,
Opacity = 80,
Size = WatermarkSize.ActualSize
Size = WatermarkSize.ActualSize,
HorizontalMarginPercent = 5,
VerticalMarginPercent = 5
};
}
@ -777,7 +811,7 @@ public class TranscodingTests @@ -777,7 +811,7 @@ public class TranscodingTests
: string.Empty;
var args =
$"-y -f lavfi -i anoisesrc=color=brown -f lavfi -i testsrc=duration=1:size={resolution}:rate=30 {videoFilter} -c:a aac -c:v {inputFormat.Encoder}{colorRange}{colorSpace}{colorTransfer}{colorPrimaries} -shortest -pix_fmt {inputFormat.PixelFormat} -strict -2 {flags} {file}";
$"-y -f lavfi -i anoisesrc=color=brown:duration=10 -f lavfi -i testsrc=duration=10:size={resolution}:rate=30 {videoFilter} -c:a aac -c:v {inputFormat.Encoder}{colorRange}{colorSpace}{colorTransfer}{colorPrimaries} -shortest -pix_fmt {inputFormat.PixelFormat} -strict -2 {flags} {file}";
BufferedCommandResult p1 = await Cli.Wrap(ExecutableName("ffmpeg"))
.WithArguments(args)
.WithValidation(CommandResultValidation.None)
@ -925,6 +959,7 @@ public class TranscodingTests @@ -925,6 +959,7 @@ public class TranscodingTests
VaapiDriver vaapiDriver,
ILocalStatisticsProvider localStatisticsProvider,
StreamingMode streamingMode,
Watermark watermark,
Func<MediaVersion> getFinalMediaVersion)
{
string[] unsupportedMessages =
@ -1015,8 +1050,12 @@ public class TranscodingTests @@ -1015,8 +1050,12 @@ public class TranscodingTests
v.VideoScanKind.ShouldNotBe(VideoScanKind.Interlaced);
// verify resolution
v.Height.ShouldBe(profileResolution.Height);
v.Width.ShouldBe(profileResolution.Width);
// NVIDIA with watermark currently has a bug (overlay_cuda)
if (profileAcceleration is not HardwareAccelerationKind.Nvenc || watermark is Watermark.None)
{
v.Height.ShouldBe(profileResolution.Height);
v.Width.ShouldBe(profileResolution.Width);
}
foreach (MediaStream videoStream in v.Streams.Filter(s => s.MediaStreamKind == MediaStreamKind.Video))
{

Write Preview
Loading…
Cancel
Save