From ea7e5e639de3e373c67f5b20c737f3fedf83cd98 Mon Sep 17 00:00:00 2001
From: Ace Olszowka <aolszowka@gmail.com>
Date: Mon, 7 Feb 2022 20:41:07 -0700
Subject: [PATCH] Fix h264_v4l2m2m acceleration in Raspberry Pi 4

---
 .../MediaEncoding/EncodingHelper.cs                    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index bde10dbbfc..cdfde97f60 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1281,11 +1281,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 param += " -low_power 1";
             }
 
-            if (string.Equals(videoEncoder, "h264_v4l2m2m", StringComparison.OrdinalIgnoreCase))
-            {
-                param += " -pix_fmt nv21";
-            }
-
             var isVc1 = string.Equals(state.VideoStream?.Codec, "vc1", StringComparison.OrdinalIgnoreCase);
             var isLibX265 = string.Equals(videoEncoder, "libx265", StringComparison.OrdinalIgnoreCase);
 
@@ -2695,6 +2690,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var vidDecoder = GetHardwareVideoDecoder(state, options) ?? string.Empty;
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isVaapiEncoder = vidEncoder.Contains("vaapi", StringComparison.OrdinalIgnoreCase);
+            var isV4l2Encoder = vidEncoder.Contains("h264_v4l2m2m", StringComparison.OrdinalIgnoreCase);
 
             var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
             var doDeintHevc = state.DeInterlace("h265", true) || state.DeInterlace("hevc", true);
@@ -2723,6 +2719,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 outFormat = "nv12";
             }
+            else if (isV4l2Encoder)
+            {
+                outFormat = "yuv420p";
+            }
 
             // sw scale
             mainFilters.Add(swScaleFilter);