Merge branch 'master' into comparisons

4 files changed, 55 insertions, 3 deletions

diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs
index 65afe5cf3..5ad7d783a 100644
--- a/MediaBrowser.Model/Session/BrowseRequest.cs
+++ b/MediaBrowser.Model/Session/BrowseRequest.cs
@@ -1,3 +1,5 @@
+using Jellyfin.Data.Enums;
+
 #nullable disable
 namespace MediaBrowser.Model.Session
 {
@@ -8,10 +10,9 @@ namespace MediaBrowser.Model.Session
     {
         /// <summary>
         /// Gets or sets the item type.
-        /// Artist, Genre, Studio, Person, or any kind of BaseItem.
         /// </summary>
         /// <value>The type of the item.</value>
-        public string ItemType { get; set; }
+        public BaseItemKind ItemType { get; set; }
 
         /// <summary>
         /// Gets or sets the item id.
diff --git a/MediaBrowser.Model/Session/HardwareEncodingType.cs b/MediaBrowser.Model/Session/HardwareEncodingType.cs
new file mode 100644
index 000000000..0e172f35f
--- /dev/null
+++ b/MediaBrowser.Model/Session/HardwareEncodingType.cs
@@ -0,0 +1,48 @@
+namespace MediaBrowser.Model.Session
+{
+    /// <summary>
+    /// Enum HardwareEncodingType.
+    /// </summary>
+    public enum HardwareEncodingType
+    {
+        /// <summary>
+        /// AMD AMF
+        /// </summary>
+        AMF = 0,
+
+        /// <summary>
+        /// Intel Quick Sync Video
+        /// </summary>
+        QSV = 1,
+
+        /// <summary>
+        /// NVIDIA NVENC
+        /// </summary>
+        NVENC = 2,
+
+        /// <summary>
+        /// OpenMax OMX
+        /// </summary>
+        OMX = 3,
+
+        /// <summary>
+        /// Exynos V4L2 MFC
+        /// </summary>
+        V4L2M2M = 4,
+
+        /// <summary>
+        /// MediaCodec Android
+        /// </summary>
+        MediaCodec = 5,
+
+        /// <summary>
+        /// Video Acceleration API (VAAPI)
+        /// </summary>
+        VAAPI = 6,
+
+        /// <summary>
+        /// Video ToolBox
+        /// </summary>
+        VideoToolBox = 7
+    }
+}
diff --git a/MediaBrowser.Model/Session/TranscodeReason.cs b/MediaBrowser.Model/Session/TranscodeReason.cs
index e93b5d288..3c95df66d 100644
--- a/MediaBrowser.Model/Session/TranscodeReason.cs
+++ b/MediaBrowser.Model/Session/TranscodeReason.cs
@@ -26,6 +26,7 @@ namespace MediaBrowser.Model.Session
         VideoProfileNotSupported = 19,
         AudioBitDepthNotSupported = 20,
         SubtitleCodecNotSupported = 21,
-        DirectPlayError = 22
+        DirectPlayError = 22,
+        AudioIsExternal = 23
     }
 }
diff --git a/MediaBrowser.Model/Session/TranscodingInfo.cs b/MediaBrowser.Model/Session/TranscodingInfo.cs
index 064a087d5..68ab691f8 100644
--- a/MediaBrowser.Model/Session/TranscodingInfo.cs
+++ b/MediaBrowser.Model/Session/TranscodingInfo.cs
@@ -34,6 +34,8 @@ namespace MediaBrowser.Model.Session
 
         public int? AudioChannels { get; set; }
 
+        public HardwareEncodingType? HardwareAccelerationType { get; set; }
+
         public TranscodeReason[] TranscodeReasons { get; set; }
     }
 }