From 5dc20ebd1bb9e14243943c077fa96ba07f18d715 Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Sat, 6 Dec 2025 10:03:24 -0600
Subject: [PATCH] use software pad with amd vaapi h264 main (#2708)

---
 CHANGELOG.md                                     | 5 ++++-
 ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d985735d..d71ec79db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix detection of Plex Other Video libraries using `Plex Personal Media` agent
   - If the library is already detected as a Movies library in ETV, synchronization must be disabled for the library to change it to an Other Videos library
   - A warning will be logged when this scenario is detected
-- AMD VAAPI: work around buggy ffmpeg behavior where hevc_vaapi encoder with RadeonSI driver incorrectly outputs height of 1088 instead of 1080
 - Graphics Engine:
   - Optimize graphics engine to generate element frames in parallel and to eliminate redundant frame copies
   - Match graphics engine framerate with source content (or channel normalized) framerate
@@ -46,6 +45,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix playout sorting after using channel number editor
 - VAAPI: Only include `-sei a53_cc` flags when misc packed headers are supported by the encoder
   - This should fix playback in some cases, e.g. AMD VAAPI h264 encoder
+- AMD VAAPI:
+  - work around buggy ffmpeg behavior where hevc_vaapi encoder with RadeonSI driver incorrectly outputs height of 1088 instead of 1080
+  - fix green padding when encoding h264 using main profile
+
 
 ### Changed
 - No longer round framerate to nearest integer when normalizing framerate
diff --git a/ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs b/ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs
index 8700ca3a6..e61cdec3e 100644
--- a/ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs
+++ b/ErsatzTV.FFmpeg/Pipeline/VaapiPipelineBuilder.cs
@@ -626,12 +626,19 @@ public class VaapiPipelineBuilder : SoftwarePipelineBuilder
         {
             // pad_vaapi seems to pad with green when input is HDR
             // also green with i965 driver
+            // also green with radeonsi and h264 main profile
             // so use software pad in these cases
             bool is965 = ffmpegState.VaapiDriver
                 .IfNone(string.Empty)
                 .Contains("i965", StringComparison.OrdinalIgnoreCase);
 
-            if (isHdrTonemap || is965)
+            bool isRadeonSiMain = ffmpegState.VaapiDriver.IfNone(string.Empty)
+                                      .Contains("radeonsi", StringComparison.OrdinalIgnoreCase)
+                                  && ffmpegState.EncoderHardwareAccelerationMode is HardwareAccelerationMode.Vaapi
+                                  && desiredState.VideoFormat is VideoFormat.H264
+                                  && desiredState.VideoProfile.IfNone(string.Empty) is VideoProfile.Main;
+
+            if (isHdrTonemap || is965 || isRadeonSiMain)
             {
                 var padStep = new PadFilter(currentState, desiredState.PaddedSize);
                 currentState = padStep.NextState(currentState);