timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

fix transcoding tests; fix vaapi subtitle crop (#2568)

Browse Source 
* fix transcoding tests using text subtitles

* fix vaapi picture subtitle overlay with crop

* more test improvements
This commit is contained in:
Jason Dove
2025-10-26 08:51:24 -05:00
committed by GitHub
parent 1f8834c280
commit 3b254735e6
7 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Scanner.Tests/Core/FFmpeg/TranscodingTests.cs
+25 -16
View File
@@ -113,7 +113,7 @@ public class TranscodingTests
public static Watermark[] Watermarks =
[
Watermark.None,
//Watermark.PermanentOpaqueScaled,
Watermark.PermanentOpaqueScaled,
// Watermark.PermanentOpaqueActualSize,
// Watermark.PermanentTransparentScaled,
// Watermark.PermanentTransparentActualSize
@@ -122,8 +122,8 @@ public class TranscodingTests
public static Subtitle[] Subtitles =
[
Subtitle.None,
//Subtitle.Picture,
// Subtitle.Text
Subtitle.Picture,
Subtitle.Text
];
public static Padding[] Paddings =
@@ -151,7 +151,7 @@ public class TranscodingTests
new("libx264", "yuv420p", "tv", "smpte170m", "bt709", "smpte170m"),
// // //
// // // // example format that requires setparams filter
//new("libx264", "yuv420p", string.Empty, string.Empty, string.Empty, string.Empty),
new("libx264", "yuv420p", string.Empty, string.Empty, string.Empty, string.Empty),
// // //
// // // // new("libx264", "yuvj420p"),
//new("libx264", "yuv420p10le"),
@@ -159,7 +159,7 @@ public class TranscodingTests
// // //
// // // // new("mpeg1video", "yuv420p"),
// // // //
//new("mpeg2video", "yuv420p"),
new("mpeg2video", "yuv420p"),
// //
//new InputFormat("libx265", "yuv420p"),
//new("libx265", "yuv420p10le"),
@@ -188,7 +188,7 @@ public class TranscodingTests
public static FFmpegProfileBitDepth[] BitDepths =
[
FFmpegProfileBitDepth.EightBit,
//FFmpegProfileBitDepth.TenBit
FFmpegProfileBitDepth.TenBit
];
public static FFmpegProfileVideoFormat[] VideoFormats =
@@ -200,10 +200,10 @@ public class TranscodingTests
public static HardwareAccelerationKind[] TestAccelerations =
[
//HardwareAccelerationKind.None,
HardwareAccelerationKind.Nvenc
//HardwareAccelerationKind.Vaapi
//HardwareAccelerationKind.Qsv,
HardwareAccelerationKind.None,
//HardwareAccelerationKind.Nvenc
HardwareAccelerationKind.Vaapi,
HardwareAccelerationKind.Qsv,
// HardwareAccelerationKind.VideoToolbox,
// HardwareAccelerationKind.Amf
];
@@ -388,7 +388,7 @@ public class TranscodingTests
watermarks,
[],
"drm",
VaapiDriver.RadeonSI,
VaapiDriver.iHD,
"/dev/dri/renderD128",
Option<int>.None,
false,
@@ -400,6 +400,7 @@ public class TranscodingTests
None,
Option<string>.None,
_ => { },
canProxy: false,
CancellationToken.None);
// Console.WriteLine($"ffmpeg arguments {process.Arguments}");
@@ -410,7 +411,7 @@ public class TranscodingTests
profileBitDepth,
profileVideoFormat,
profileAcceleration,
VaapiDriver.RadeonSI,
VaapiDriver.iHD,
localStatisticsProvider,
streamingMode,
() => videoVersion);
@@ -444,7 +445,14 @@ public class TranscodingTests
[ValueSource(typeof(TestData), nameof(TestData.StreamingModes))]
StreamingMode streamingMode)
{
NvEncSharpRedirector.Init();
try
{
NvEncSharpRedirector.Init();
}
catch (FileNotFoundException)
{
// do nothing
}
string file = fileToTest;
if (string.IsNullOrWhiteSpace(file))
@@ -602,7 +610,7 @@ public class TranscodingTests
// TODO: bit depth
bool hasPadding = filterChain.VideoFilterSteps.Any(s => s is PadFilter);
bool hasPadding = filterChain.VideoFilterSteps.Any(s => s is PadFilter or PadVaapiFilter);
// TODO: optimize out padding
// hasPadding.ShouldBe(padding == Padding.WithPadding);
@@ -699,7 +707,7 @@ public class TranscodingTests
watermarks,
[],
"drm",
VaapiDriver.RadeonSI,
VaapiDriver.iHD,
"/dev/dri/renderD128",
Option<int>.None,
false,
@@ -711,6 +719,7 @@ public class TranscodingTests
None,
Option<string>.None,
PipelineAction,
canProxy: false,
CancellationToken.None);
// Console.WriteLine($"ffmpeg arguments {string.Join(" ", process.StartInfo.ArgumentList)}");
@@ -721,7 +730,7 @@ public class TranscodingTests
profileBitDepth,
profileVideoFormat,
profileAcceleration,
VaapiDriver.RadeonSI,
VaapiDriver.iHD,
localStatisticsProvider,
streamingMode,
() => v);