1 files changed, 20 insertions, 11 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 10892e6cd..931337bf4 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1292,11 +1292,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);
 
@@ -1354,29 +1349,37 @@ namespace MediaBrowser.Controller.MediaEncoding
                 switch (encodingOptions.EncoderPreset)
                 {
                     case "veryslow":
-
-                        param += " -preset slow"; // lossless is only supported on maxwell and newer(2014+)
+                        param += " -preset p7";
                         break;
 
                     case "slow":
+                        param += " -preset p6";
+                        break;
+
                     case "slower":
-                        param += " -preset slow";
+                        param += " -preset p5";
                         break;
 
                     case "medium":
-                        param += " -preset medium";
+                        param += " -preset p4";
                         break;
 
                     case "fast":
+                        param += " -preset p3";
+                        break;
+
                     case "faster":
+                        param += " -preset p2";
+                        break;
+
                     case "veryfast":
                     case "superfast":
                     case "ultrafast":
-                        param += " -preset fast";
+                        param += " -preset p1";
                         break;
 
                     default:
-                        param += " -preset default";
+                        param += " -preset p4";
                         break;
                 }
             }
@@ -2178,6 +2181,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     // Important: If this is ever re-enabled, make sure not to use it with wtv because it breaks seeking
                     if (!string.Equals(state.InputContainer, "wtv", StringComparison.OrdinalIgnoreCase)
                         && state.TranscodingType != TranscodingJobType.Progressive
+                        && state.TranscodingType != TranscodingJobType.Hls
                         && !state.EnableBreakOnNonKeyFrames(outputVideoCodec)
                         && (state.BaseRequest.StartTimeTicks ?? 0) > 0)
                     {
@@ -2706,6 +2710,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);
@@ -2734,6 +2739,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 outFormat = "nv12";
             }
+            else if (isV4l2Encoder)
+            {
+                outFormat = "yuv420p";
+            }
 
             // sw scale
             mainFilters.Add(swScaleFilter);