From d29a4234750a03dec61fef5b1b34dfa63fdc003a Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Sun, 22 May 2022 10:59:41 -0600
Subject: [PATCH 1/2] Enable SupportsTranscoding if device has transcoding
 profiles

---
 Jellyfin.Api/Helpers/MediaInfoHelper.cs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/Jellyfin.Api/Helpers/MediaInfoHelper.cs b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
index 31b9798365..e5e3688676 100644
--- a/Jellyfin.Api/Helpers/MediaInfoHelper.cs
+++ b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
@@ -255,10 +255,27 @@ namespace Jellyfin.Api.Helpers
                 streamInfo.PlaySessionId = playSessionId;
                 streamInfo.StartPositionTicks = startTimeTicks;
 
-                mediaSource.SupportsDirectPlay = streamInfo.PlayMethod == PlayMethod.DirectPlay;
+                if (mediaSource.SupportsDirectPlay)
+                {
+                    mediaSource.SupportsDirectPlay = streamInfo.PlayMethod == PlayMethod.DirectPlay;
+                }
+
                 // Players do not handle this being set according to PlayMethod
-                mediaSource.SupportsDirectStream = options.EnableDirectStream ? streamInfo.PlayMethod == PlayMethod.DirectPlay || streamInfo.PlayMethod == PlayMethod.DirectStream : streamInfo.PlayMethod == PlayMethod.DirectPlay;
-                mediaSource.SupportsTranscoding = streamInfo.PlayMethod == PlayMethod.DirectStream || mediaSource.TranscodingContainer != null;
+                if (mediaSource.SupportsDirectStream)
+                {
+                    mediaSource.SupportsDirectStream =
+                        options.EnableDirectStream
+                            ? streamInfo.PlayMethod == PlayMethod.DirectPlay || streamInfo.PlayMethod == PlayMethod.DirectStream
+                            : streamInfo.PlayMethod == PlayMethod.DirectPlay;
+                }
+
+                if (mediaSource.SupportsTranscoding)
+                {
+                    mediaSource.SupportsTranscoding =
+                        streamInfo.PlayMethod == PlayMethod.DirectStream
+                        || mediaSource.TranscodingContainer != null
+                        || profile.TranscodingProfiles.Any(i => i.Type == streamInfo.MediaType && i.Context == options.Context);
+                }
 
                 if (item is Audio)
                 {
@@ -290,7 +307,7 @@ namespace Jellyfin.Api.Helpers
                 }
                 else
                 {
-                    if (mediaSource.SupportsTranscoding || mediaSource.SupportsDirectStream)
+                    if (!mediaSource.SupportsDirectPlay && (mediaSource.SupportsTranscoding || mediaSource.SupportsDirectStream))
                     {
                         streamInfo.PlayMethod = PlayMethod.Transcode;
                         mediaSource.TranscodingUrl = streamInfo.ToUrl("-", auth.Token).TrimStart('-');

From c5dae180341ebb38720151deab208b98c2142a38 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Mon, 23 May 2022 07:49:54 -0600
Subject: [PATCH 2/2] Apply suggestions from review

---
 Jellyfin.Api/Helpers/MediaInfoHelper.cs | 27 +++++++++----------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/Jellyfin.Api/Helpers/MediaInfoHelper.cs b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
index e5e3688676..5c05c57a61 100644
--- a/Jellyfin.Api/Helpers/MediaInfoHelper.cs
+++ b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
@@ -255,27 +255,18 @@ namespace Jellyfin.Api.Helpers
                 streamInfo.PlaySessionId = playSessionId;
                 streamInfo.StartPositionTicks = startTimeTicks;
 
-                if (mediaSource.SupportsDirectPlay)
-                {
-                    mediaSource.SupportsDirectPlay = streamInfo.PlayMethod == PlayMethod.DirectPlay;
-                }
+                mediaSource.SupportsDirectPlay = streamInfo.PlayMethod == PlayMethod.DirectPlay;
 
                 // Players do not handle this being set according to PlayMethod
-                if (mediaSource.SupportsDirectStream)
-                {
-                    mediaSource.SupportsDirectStream =
-                        options.EnableDirectStream
-                            ? streamInfo.PlayMethod == PlayMethod.DirectPlay || streamInfo.PlayMethod == PlayMethod.DirectStream
-                            : streamInfo.PlayMethod == PlayMethod.DirectPlay;
-                }
+                mediaSource.SupportsDirectStream =
+                    options.EnableDirectStream
+                        ? streamInfo.PlayMethod == PlayMethod.DirectPlay || streamInfo.PlayMethod == PlayMethod.DirectStream
+                        : streamInfo.PlayMethod == PlayMethod.DirectPlay;
 
-                if (mediaSource.SupportsTranscoding)
-                {
-                    mediaSource.SupportsTranscoding =
-                        streamInfo.PlayMethod == PlayMethod.DirectStream
-                        || mediaSource.TranscodingContainer != null
-                        || profile.TranscodingProfiles.Any(i => i.Type == streamInfo.MediaType && i.Context == options.Context);
-                }
+                mediaSource.SupportsTranscoding =
+                    streamInfo.PlayMethod == PlayMethod.DirectStream
+                    || mediaSource.TranscodingContainer != null
+                    || profile.TranscodingProfiles.Any(i => i.Type == streamInfo.MediaType && i.Context == options.Context);
 
                 if (item is Audio)
                 {