style(498): normalize pre-existing whitespace in touched files (#311 fix-as-you-touch)
Whitespace-only (git diff -w is empty); the #311 format job checks whole touched files, and these two legacy files carried pre-existing violations never caught before (no PR had touched them since the gate landed). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -174,7 +174,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
|
||||
foreach (Subtitle subtitle in maybeSubtitle)
|
||||
{
|
||||
if (subtitle.SubtitleKind == SubtitleKind.Sidecar || subtitle is
|
||||
{ SubtitleKind: SubtitleKind.Embedded, IsImage: false, IsExtracted: true })
|
||||
{ SubtitleKind: SubtitleKind.Embedded, IsImage: false, IsExtracted: true })
|
||||
{
|
||||
// proxy to avoid dealing with escaping
|
||||
subtitle.Path = $"http://localhost:{Settings.StreamingPort}/media/subtitle/{subtitle.Id}";
|
||||
@@ -287,20 +287,20 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
|
||||
outputFormat = OutputFormatKind.Hls;
|
||||
break;
|
||||
case StreamingMode.HttpLiveStreamingDirect:
|
||||
{
|
||||
// use mpeg-ts by default
|
||||
outputFormat = OutputFormatKind.MpegTs;
|
||||
|
||||
// override with setting if applicable
|
||||
Option<OutputFormatKind> maybeOutputFormat = await _configElementRepository
|
||||
.GetValue<OutputFormatKind>(ConfigElementKey.FFmpegHlsDirectOutputFormat, cancellationToken);
|
||||
foreach (OutputFormatKind of in maybeOutputFormat)
|
||||
{
|
||||
outputFormat = of;
|
||||
}
|
||||
// use mpeg-ts by default
|
||||
outputFormat = OutputFormatKind.MpegTs;
|
||||
|
||||
break;
|
||||
}
|
||||
// override with setting if applicable
|
||||
Option<OutputFormatKind> maybeOutputFormat = await _configElementRepository
|
||||
.GetValue<OutputFormatKind>(ConfigElementKey.FFmpegHlsDirectOutputFormat, cancellationToken);
|
||||
foreach (OutputFormatKind of in maybeOutputFormat)
|
||||
{
|
||||
outputFormat = of;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Option<string> subtitleLanguage = Option<string>.None;
|
||||
@@ -445,7 +445,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
|
||||
Option<string> hlsInitTemplate = outputFormat switch
|
||||
{
|
||||
OutputFormatKind.HlsMp4 => $"{nowSeconds}_init.mp4",
|
||||
_ => Option<string>.None
|
||||
_ => Option<string>.None
|
||||
};
|
||||
|
||||
Option<string> hlsSegmentOptions = Option<string>.None;
|
||||
|
||||
@@ -208,7 +208,7 @@ public class QsvPipelineBuilder : SoftwarePipelineBuilder
|
||||
|
||||
// need to download for any sort of overlay (and always for setpts)
|
||||
if (currentState.FrameDataLocation == FrameDataLocation.Hardware) //&&
|
||||
//(context.HasSubtitleOverlay || context.HasWatermark || context.HasGraphicsEngine))
|
||||
//(context.HasSubtitleOverlay || context.HasWatermark || context.HasGraphicsEngine))
|
||||
{
|
||||
var hardwareDownload = new HardwareDownloadFilter(currentState);
|
||||
currentState = hardwareDownload.NextState(currentState);
|
||||
@@ -635,7 +635,7 @@ public class QsvPipelineBuilder : SoftwarePipelineBuilder
|
||||
DecoderHardwareAccelerationMode: HardwareAccelerationMode.None,
|
||||
EncoderHardwareAccelerationMode: HardwareAccelerationMode.None
|
||||
} && context is
|
||||
{ HasGraphicsEngine: false, HasWatermark: false, HasSubtitleOverlay: false, ShouldDeinterlace: false };
|
||||
{ HasGraphicsEngine: false, HasWatermark: false, HasSubtitleOverlay: false, ShouldDeinterlace: false };
|
||||
|
||||
// auto_scale filter seems to muck up 10-bit software decode => hardware scale, so use software scale in that case
|
||||
useSoftwareFilter = useSoftwareFilter ||
|
||||
|
||||
Reference in New Issue
Block a user