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

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

(limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 1feca0ec9..993cd3f74 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
-- 
cgit v1.2.3


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

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

(limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 993cd3f74..f5decdc0d 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
-- 
cgit v1.2.3


From db2366066029fa8e261d308d9db845070c0b9ca4 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Mon, 30 Mar 2020 15:53:49 +0800
Subject: prefer to use libfdk_aac for better audio quality

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 +++++
 MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs  | 1 +
 2 files changed, 6 insertions(+)

(limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 342c76414..2037a27fa 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -424,6 +424,11 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (string.Equals(codec, "aac", StringComparison.OrdinalIgnoreCase))
             {
+                // Prefer to use libfdk_aac for better audio quality while using the custom build FFmpeg
+                if (_mediaEncoder.SupportsEncoder("libfdk_aac"))
+                {
+                    return "libfdk_aac";
+                }
                 return "aac -strict experimental";
             }
 
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index f5decdc0d..6e036d24c 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -42,6 +42,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             "libvpx",
             "libvpx-vp9",
             "aac",
+            "libfdk_aac",
             "libmp3lame",
             "libopus",
             "libvorbis",
-- 
cgit v1.2.3