fix nvenc playback when color metadata changes mid-stream (#2740)

* fix nvenc playback when color metadata changes mid-stream

* update dependencies (needed to fix unit test runner)

* limit noautoscale to when it's not already present

CHANGELOG.md

@@ -55,7 +55,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Automatically kill playback troubleshooting ffmpeg process if it hasn't completed after two minutes
 - Fix playback of certain BT.2020 content
 - Use playlist item count when using a playlist as filler (instead of a fixed count of 1 for each playlist item)
-- NVIDIA: fix stream failure with certain content that should decode in hardware but falls back to software
+- NVIDIA:
+  - Fix stream failure with certain content that should decode in hardware but falls back to software
+  - Fix stream failure with content that changes color metadata mid-stream
 - Fix stream failure when configured fallback filler collection is empty
 - Fix high CPU when errors are displayed; errors will now work ahead before throttling to realtime, similar to primary content
 - Fix startup error caused by duplicate smart collection names (and no longer allow duplicate smart collection names)

ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@@ -18,7 +18,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="NUnit" Version="4.4.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
         <PackageReference Include="Serilog" Version="4.3.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
         <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />

ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj

@@ -12,7 +12,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="NUnit" Version="4.4.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
         <PackageReference Include="Shouldly" Version="4.3.0" />
         <PackageReference Include="coverlet.collector" Version="6.0.4">
             <PrivateAssets>all</PrivateAssets>

ErsatzTV.FFmpeg/Pipeline/NvidiaPipelineBuilder.cs

@@ -364,6 +364,21 @@ public class NvidiaPipelineBuilder : SoftwarePipelineBuilder
                     desiredState.CroppedSize.IfNone(desiredState.PaddedSize)));
         }
 
+        // unknown color params can *change* during transcoding,
+        // which can cause ffmpeg to insert an autoscale filter that
+        // cannot accept hardware frames.
+        // this filter isn't actually needed (the encoder accepts the frames just fine) so disable it
+        if (ffmpegState.EncoderHardwareAccelerationMode is HardwareAccelerationMode.Nvenc &&
+            currentState.FrameDataLocation is FrameDataLocation.Hardware &&
+            videoStream.ColorParams.IsUnknown &&
+            (context.HasGraphicsEngine || context.HasSubtitleOverlay || context.HasWatermark))
+        {
+            if (pipelineSteps.All(p => p is not NoAutoScaleOutputOption))
+            {
+                pipelineSteps.Add(new NoAutoScaleOutputOption());
+            }
+        }
+
         return new FilterChain(
             videoInputFile.FilterSteps,
             watermarkInputFile.Map(wm => wm.FilterSteps).IfNone([]),

ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj

@@ -12,7 +12,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="NUnit" Version="4.4.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
         <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@@ -19,7 +19,7 @@
         <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.2.2" />
         <PackageReference Include="Humanizer.Core" Version="3.0.1" />
         <PackageReference Include="Jint" Version="4.4.2" />
-        <PackageReference Include="JsonSchema.Net" Version="8.0.4" />
+        <PackageReference Include="JsonSchema.Net" Version="8.0.5" />
         <PackageReference Include="Lucene.Net" Version="4.8.0-beta00017" />
         <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00017" />
         <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00017" />

ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj

@@ -13,7 +13,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="NUnit" Version="4.4.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
         <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

ErsatzTV/ErsatzTV.csproj

@@ -55,7 +55,7 @@
         <PackageReference Include="MudBlazor" Version="8.15.0" />
         <PackageReference Include="NaturalSort.Extension" Version="4.4.1" />
         <PackageReference Include="Refit.HttpClientFactory" Version="9.0.2" />
-        <PackageReference Include="Scalar.AspNetCore" Version="2.11.8" />
+        <PackageReference Include="Scalar.AspNetCore" Version="2.11.10" />
         <PackageReference Include="Serilog" Version="4.3.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
         <PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />