From b2d85a02c21fb22c3a164a6d8e23c2b5beacb324 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Fri, 24 Dec 2021 16:50:40 +0800
Subject: Apply suggestions from code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: Bond_009 <bond.009@outlook.com>
---
 .../Encoder/EncoderValidator.cs                    |  6 ++----
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 25 ++++------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder')

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index 871e7d57d..fe3069934 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -351,18 +351,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 return false;
             }
 
-            string output;
             try
             {
-                output = GetProcessOutput(_encoderPath, "-v verbose -hide_banner -init_hw_device vaapi=va:" + renderNodePath, true);
+                var output = GetProcessOutput(_encoderPath, "-v verbose -hide_banner -init_hw_device vaapi=va:" + renderNodePath, true);
+                return output.Contains(driverName, StringComparison.Ordinal);
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Error detecting the given vaapi render node path");
                 return false;
             }
-
-            return output.Contains(driverName, StringComparison.Ordinal);
         }
 
         private IEnumerable<string> GetHwaccelTypes()
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7b7bb8100..65f9f1149 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -91,6 +91,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         /// <inheritdoc />
         public string EncoderPath => _ffmpegPath;
+        public Version EncoderVersion => _ffmpegVersion;
+        public bool IsVaapiDeviceAmd => _isVaapiDeviceAmd;
+        public bool IsVaapiDeviceInteliHD => _isVaapiDeviceInteliHD;
+        public bool IsVaapiDeviceInteli965 => _isVaapiDeviceInteli965;
 
         /// <summary>
         /// Run at startup or if the user removes a Custom path from transcode page.
@@ -138,7 +142,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 SetAvailableHwaccels(validator.GetHwaccels());
                 SetMediaEncoderVersion(validator);
 
-                options = _configurationManager.GetEncodingOptions();
                 _threads = EncodingHelper.GetNumberOfThreads(null, options, null);
 
                 // Check the Vaapi device vendor
@@ -329,26 +332,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return false;
         }
 
-        public bool IsVaapiDeviceAmd()
-        {
-            return _isVaapiDeviceAmd;
-        }
-
-        public bool IsVaapiDeviceInteliHD()
-        {
-            return _isVaapiDeviceInteliHD;
-        }
-
-        public bool IsVaapiDeviceInteli965()
-        {
-            return _isVaapiDeviceInteli965;
-        }
-
-        public Version GetMediaEncoderVersion()
-        {
-            return _ffmpegVersion;
-        }
-
         public bool CanEncodeToAudioCodec(string codec)
         {
             if (string.Equals(codec, "opus", StringComparison.OrdinalIgnoreCase))
-- 
cgit v1.2.3