From e95239e28132b4d6486ee9272d20ec5ada46b66c Mon Sep 17 00:00:00 2001
From: Nyanmisaka <799610810@qq.com>
Date: Sat, 11 Jan 2020 01:36:25 +0800
Subject: [PATCH 1/4] add support for AMD h264_amf & hevc_amf

---
 MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 1feca0ec92..993cd3f747 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -55,7 +55,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
             "h264_vaapi",
             "hevc_vaapi",
             "h264_v4l2m2m",
-            "ac3"
+            "ac3",
+			"h264_amf",
+			"hevc_amf"
         };
 
         // Try and use the individual library versions to determine a FFmpeg version

From 08c4d3797fd2bb54936d4cba1b71de915432ebd1 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <799610810@qq.com>
Date: Sun, 12 Jan 2020 21:38:28 +0800
Subject: [PATCH 2/4] add support for AMF hardware encoding on Linux.

1) h264_amf is now supported on linux with 'amdgpu-pro' installed and '--enable-amf' when compiling ffmpeg.
2) Using vaapi decode and h264_amf encode on linux platform can avoid some weird transcoding errors in h264_vaapi with amd gpu.
---
 .../MediaEncoding/EncodingHelper.cs           | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 020f0553ed..a099087628 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2642,22 +2642,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                         else
                             return "-hwaccel dxva2";
                     }
-
-                    switch (videoStream.Codec.ToLowerInvariant())
+                    else
                     {
-                        case "avc":
-                        case "h264":
-                            if (_mediaEncoder.SupportsDecoder("h264_amf") && encodingOptions.HardwareDecodingCodecs.Contains("h264", StringComparer.OrdinalIgnoreCase))
-                            {
-                                return "-c:v h264_amf";
-                            }
-                            break;
-                        case "mpeg2video":
-                            if (_mediaEncoder.SupportsDecoder("hevc_amf") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg2video", StringComparer.OrdinalIgnoreCase))
-                            {
-                                return "-c:v mpeg2_mmal";
-                            }
-                            break;
+                        //h264_amf is now supported on linux with 'amdgpu-pro' installed and '--enable-amf' when compiling ffmpeg
+                        //using vaapi decode and h264_amf encode on linux platform can avoid some weird transcoding errors in h264_vaapi with amd gpu
+                        return "-hwaccel vaapi";
                     }
                 }
             }

From 8868ff2ffa7d50d19779e5e8c1f661ece9fd0321 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <799610810@qq.com>
Date: Wed, 15 Jan 2020 18:40:58 +0800
Subject: [PATCH 3/4] remove useless comment

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index a099087628..3b8cb93fcc 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2644,8 +2644,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                     }
                     else
                     {
-                        //h264_amf is now supported on linux with 'amdgpu-pro' installed and '--enable-amf' when compiling ffmpeg
-                        //using vaapi decode and h264_amf encode on linux platform can avoid some weird transcoding errors in h264_vaapi with amd gpu
                         return "-hwaccel vaapi";
                     }
                 }

From 2c10891b66bf5963d2bfca34b704607a3bc0de85 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <799610810@qq.com>
Date: Wed, 15 Jan 2020 18:45:28 +0800
Subject: [PATCH 4/4] turn on indentation.

---
 MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 993cd3f747..f5decdc0db 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -56,8 +56,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
             "hevc_vaapi",
             "h264_v4l2m2m",
             "ac3",
-			"h264_amf",
-			"hevc_amf"
+            "h264_amf",
+            "hevc_amf"
         };
 
         // Try and use the individual library versions to determine a FFmpeg version