Cold adversarial review returned BLOCKED on the documentation half. Addressed: - The new decision record carried no lifecycle metadata block, taking the repo from 82/82 to 83/82 and making it invisible to the by-key catalog lookup that #521 established the same day. Added key/status/since/supersedes/superseded-by (ffmpeg.qsv-extra-hw-frames-floor) and regenerated docs/decisions/README.md; decisions_validate.py now reports OK with no legacy-unmigrated notice. - The entry claimed to correct the #350 record but left that record untouched, so the stale "the burst is bounded" claim stayed authoritative for anyone resolving ffmpeg.hls-cold-start-burst. Added a forward-pointing correction note there (hence the [decisions-edit] token on this commit). - The floor was applied silently. QsvPipelineBuilder.SetAccelState now logs a warning naming both the configured and applied value, because raising a deliberately small pool costs additional surfaces (64 NV12 1080p surfaces is roughly 190 MiB, 760 MiB at 4K) on memory-constrained iGPUs. - Narrowed an overstated claim in the entry: 1..63 are untested, not known-bad. We raise them because the risk is a channel serving nothing, not because asking for less is illegitimate. Recorded as a deliberate over-reach with a stated cost. - Corrected a factual error: SubtitleScaleQsvFilter also formats extra_hw_frames but is dead code with no construction site, so it is NOT covered by the guard. - Config-vs-behavior mismatch: Create/UpdateFFmpegProfileHandler now normalize on save so stored rows converge on what the pipeline runs, and the SPA field carries min=64 rather than defaulting the display to 0. Render-time flooring is kept as the net that fixes existing deployments with no migration; the remaining gap for un-resaved rows is recorded as an accepted residual. - Tests strengthened: pinned to the literal measured 64 rather than to the constant (so lowering the floor cannot quietly satisfy them), added a negative-value case, added a deinterlace-upload case, and replaced the narrow ShouldNotContain with a regex asserting EVERY extra_hw_frames occurrence in the command is >= the minimum. Negative control re-run against the strengthened tests: reverting the floor fails 5, with the build verified succeeded first. Full suite green (4086 .NET, 891 web). Review finding that needed no change: the "single point" claim was independently verified — no bypass exists, every FFmpegState construction routes through MaybeQsvExtraHardwareFrames. Refs #350, #516, #519.
133 lines
5.7 KiB
C#
133 lines
5.7 KiB
C#
using ErsatzTV.Core;
|
|
using ErsatzTV.Core.Domain;
|
|
using ErsatzTV.Core.Errors;
|
|
using ErsatzTV.Core.Interfaces.Search;
|
|
using ErsatzTV.FFmpeg;
|
|
using ErsatzTV.Infrastructure.Data;
|
|
using ErsatzTV.Infrastructure.Extensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace ErsatzTV.Application.FFmpegProfiles;
|
|
|
|
public class CreateFFmpegProfileHandler :
|
|
IRequestHandler<CreateFFmpegProfile, Either<BaseError, CreateFFmpegProfileResult>>
|
|
{
|
|
private readonly IDbContextFactory<TvContext> _dbContextFactory;
|
|
private readonly ISearchTargets _searchTargets;
|
|
|
|
public CreateFFmpegProfileHandler(IDbContextFactory<TvContext> dbContextFactory, ISearchTargets searchTargets)
|
|
{
|
|
_dbContextFactory = dbContextFactory;
|
|
_searchTargets = searchTargets;
|
|
}
|
|
|
|
public async Task<Either<BaseError, CreateFFmpegProfileResult>> Handle(
|
|
CreateFFmpegProfile request,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
|
|
Option<int> maybeResolutionId = await ResolutionMustExist(dbContext, request, cancellationToken);
|
|
return await maybeResolutionId.Match(
|
|
Some: async resolutionId =>
|
|
{
|
|
Validation<BaseError, FFmpegProfile> validation = Validate(request, resolutionId);
|
|
return await validation.Apply(profile => PersistFFmpegProfile(dbContext, profile));
|
|
},
|
|
None: () => Task.FromResult<Either<BaseError, CreateFFmpegProfileResult>>(
|
|
new NotFoundError($"[Resolution] {request.ResolutionId} does not exist")));
|
|
}
|
|
|
|
private async Task<CreateFFmpegProfileResult> PersistFFmpegProfile(
|
|
TvContext dbContext,
|
|
FFmpegProfile ffmpegProfile)
|
|
{
|
|
await dbContext.FFmpegProfiles.AddAsync(ffmpegProfile);
|
|
await dbContext.SaveChangesAsync();
|
|
_searchTargets.SearchTargetsChanged();
|
|
return new CreateFFmpegProfileResult(ffmpegProfile.Id);
|
|
}
|
|
|
|
private static Validation<BaseError, FFmpegProfile> Validate(
|
|
CreateFFmpegProfile request,
|
|
int resolutionId) =>
|
|
(ValidateName(request), ValidateThreadCount(request))
|
|
.Apply((name, threadCount) =>
|
|
{
|
|
var hwAccel = request.NormalizeVideo
|
|
? request.HardwareAcceleration
|
|
: HardwareAccelerationKind.None;
|
|
|
|
return new FFmpegProfile
|
|
{
|
|
Name = name,
|
|
ThreadCount = threadCount,
|
|
|
|
NormalizeAudio = request.NormalizeAudio,
|
|
NormalizeVideo = request.NormalizeVideo,
|
|
|
|
HardwareAcceleration = hwAccel,
|
|
VaapiDriver = request.VaapiDriver,
|
|
VaapiDevice = request.VaapiDevice,
|
|
// store what the pipeline will actually use, never a pool size FFmpegState would
|
|
// floor away at render time (ersatztv#529)
|
|
QsvExtraHardwareFrames = request.QsvExtraHardwareFrames is { } frames
|
|
? Math.Max(frames, FFmpegState.MinimumQsvExtraHardwareFrames)
|
|
: null,
|
|
ResolutionId = resolutionId,
|
|
ScalingBehavior = request.ScalingBehavior,
|
|
|
|
// only allow customization with VAAPI accel
|
|
PadMode = hwAccel switch
|
|
{
|
|
HardwareAccelerationKind.None => FilterMode.Software,
|
|
HardwareAccelerationKind.Vaapi => request.PadMode,
|
|
_ => FilterMode.HardwareIfPossible
|
|
},
|
|
|
|
VideoFormat = request.NormalizeVideo ? request.VideoFormat : FFmpegProfileVideoFormat.Copy,
|
|
VideoProfile = request.VideoProfile,
|
|
VideoPreset = request.VideoPreset,
|
|
AllowBFrames = request.AllowBFrames,
|
|
|
|
// mpeg2video only supports 8-bit content
|
|
BitDepth = request.VideoFormat is FFmpegProfileVideoFormat.Mpeg2Video
|
|
? FFmpegProfileBitDepth.EightBit
|
|
: request.BitDepth,
|
|
|
|
VideoBitrate = request.VideoBitrate,
|
|
VideoBufferSize = request.VideoBufferSize,
|
|
TonemapAlgorithm = request.TonemapAlgorithm,
|
|
AudioFormat = request.NormalizeAudio ? request.AudioFormat : FFmpegProfileAudioFormat.Copy,
|
|
AudioBitrate = request.AudioBitrate,
|
|
AudioBufferSize = request.AudioBufferSize,
|
|
|
|
NormalizeLoudnessMode = request.NormalizeLoudnessMode,
|
|
TargetLoudness = request.NormalizeLoudnessMode is NormalizeLoudnessMode.LoudNorm
|
|
? request.TargetLoudness
|
|
: null,
|
|
|
|
AudioChannels = request.AudioChannels,
|
|
AudioSampleRate = request.AudioSampleRate,
|
|
NormalizeFramerate = request.NormalizeFramerate,
|
|
NormalizeColors = request.NormalizeColors,
|
|
DeinterlaceVideo = request.DeinterlaceVideo,
|
|
QsvPreferNativeDecoder = request.QsvPreferNativeDecoder
|
|
};
|
|
});
|
|
|
|
private static Validation<BaseError, string> ValidateName(CreateFFmpegProfile createFFmpegProfile) =>
|
|
createFFmpegProfile.NotEmpty(x => x.Name)
|
|
.Bind(_ => createFFmpegProfile.NotLongerThan(50)(x => x.Name));
|
|
|
|
private static Validation<BaseError, int> ValidateThreadCount(CreateFFmpegProfile createFFmpegProfile) =>
|
|
createFFmpegProfile.AtLeast(0)(p => p.ThreadCount);
|
|
|
|
private static Task<Option<int>> ResolutionMustExist(
|
|
TvContext dbContext,
|
|
CreateFFmpegProfile createFFmpegProfile,
|
|
CancellationToken cancellationToken) =>
|
|
dbContext.Resolutions
|
|
.SelectOneAsync(r => r.Id, r => r.Id == createFFmpegProfile.ResolutionId, cancellationToken)
|
|
.MapT(r => r.Id);
|
|
}
|