fix videotoolbox acceleration with new transcoder (#658)

* fix videotoolbox acceleration with new transcoder

* cleanup

ErsatzTV.FFmpeg/Decoder/AvailableDecoders.cs

@@ -41,6 +41,9 @@ public static class AvailableDecoders
                 // vaapi should use implicit decoders
                 (HardwareAccelerationMode.Vaapi, _, _) => new DecoderVaapi(),
 
+                // videotoolbox should use implicit decoders
+                (HardwareAccelerationMode.VideoToolbox, _, _) => new DecoderVideoToolbox(),
+
                 (_, VideoFormat.Hevc, _) => new DecoderHevc(),
                 (_, VideoFormat.H264, _) => new DecoderH264(),
                 (_, VideoFormat.Mpeg1Video, _) => new DecoderMpeg1Video(),

ErsatzTV.FFmpeg/Decoder/DecoderVideoToolbox.cs

@@ -0,0 +1,8 @@
+namespace ErsatzTV.FFmpeg.Decoder;
+
+public class DecoderVideoToolbox : DecoderBase
+{
+    protected override FrameDataLocation OutputFrameDataLocation => FrameDataLocation.Software;
+    public override string Name => "implicit_videotoolbox";
+    public override IList<string> InputOptions(InputFile inputFile) => Array.Empty<string>();
+}

ErsatzTV.FFmpeg/Filter/OverlayFilter.cs

@@ -18,26 +18,7 @@ public class OverlayFilter : BaseFilter
 
     public override FrameState NextState(FrameState currentState) => currentState;
 
-    public override string Filter
-    {
-        get
-        {
-            string hwdownload = string.Empty;
-            if (_currentState.FrameDataLocation == FrameDataLocation.Hardware)
-            {
-                hwdownload = "hwdownload,";
-                foreach (IPixelFormat pixelFormat in _currentState.PixelFormat)
-                {
-                    if (pixelFormat.FFmpegName == FFmpegFormat.NV12)
-                    {
-                        hwdownload = "hwdownload,format=nv12,";
-                    }
-                }
-            }
-
-            return $"{hwdownload}overlay={Position}";
-        }
-    }
+    public override string Filter => $"overlay={Position}";
 
     protected string Position
     {

ErsatzTV.FFmpeg/Filter/WatermarkHardwareUploadFilter.cs

@@ -23,6 +23,9 @@ public class WatermarkHardwareUploadFilter : BaseFilter
         HardwareAccelerationMode.Vaapi when _currentState.FrameDataLocation == FrameDataLocation.Software =>
             string.Empty,
 
+        // leave videotoolbox in software since we use a software overlay filter
+        HardwareAccelerationMode.VideoToolbox => string.Empty,
+
         _ => "hwupload"
     };
 }

ErsatzTV.FFmpeg/Option/HardwareAcceleration/VideoToolboxHardwareAccelerationOption.cs

@@ -3,4 +3,9 @@
 public class VideoToolboxHardwareAccelerationOption : GlobalOption
 {
     public override IList<string> GlobalOptions => new List<string> { "-hwaccel", "videotoolbox" };
+        
+    public override FrameState NextState(FrameState currentState) => currentState with
+    {
+        FrameDataLocation = FrameDataLocation.Software
+    };
 }

ErsatzTV.FFmpeg/PipelineBuilder.cs

@@ -443,7 +443,8 @@ public class PipelineBuilder
 
             foreach (WatermarkInputFile watermarkInputFile in _watermarkInputFile)
             {
-                // vaapi uses a software overlay, so we need to ensure the background is already in software
+                // vaapi and videotoolbox use a software overlay, so we need to ensure the background is already in software
+                // though videotoolbox uses software decoders, so no need to download for that
                 if (ffmpegState.HardwareAccelerationMode == HardwareAccelerationMode.Vaapi)
                 {
                     var downloadFilter = new HardwareDownloadFilter(currentState);