From a73ce1d7813825da99654f17d69f85f4eb63344d Mon Sep 17 00:00:00 2001
From: artiume <siderite@gmail.com>
Date: Thu, 6 Feb 2020 17:21:10 -0500
Subject: [PATCH] Update MediaInfoService.cs

---
 MediaBrowser.Api/Playback/MediaInfoService.cs | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index 3aa228a616..835a4366b3 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -415,11 +415,7 @@ namespace MediaBrowser.Api.Playback
             // Beginning of Playback Determination: Attempt DirectPlay first
             if (mediaSource.SupportsDirectPlay)
             {
-                if (mediaSource.IsRemote && forceDirectPlayRemoteMediaSource && user.Policy.ForceRemoteSourceTranscoding)
-                {
-                    mediaSource.SupportsDirectPlay = false;
-                }
-                else if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
+                if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
                 {
                     mediaSource.SupportsDirectPlay = false;
                 }
@@ -468,11 +464,7 @@ namespace MediaBrowser.Api.Playback
 
             if (mediaSource.SupportsDirectStream)
             {
-                if (mediaSource.IsRemote && forceDirectPlayRemoteMediaSource && user.Policy.ForceRemoteSourceTranscoding)
-                {
-                    mediaSource.SupportsDirectStream = false;
-                }
-                else if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
+                if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
                 {
                     mediaSource.SupportsDirectStream = false;
                 }
@@ -516,17 +508,6 @@ namespace MediaBrowser.Api.Playback
             {
 				if (mediaSource.IsRemote && user.Policy.ForceRemoteSourceTranscoding)
 				{
-					if (GetMaxBitrate(maxBitrate, user) < mediaSource.Bitrate)
-					{
-						options.MaxBitrate = GetMaxBitrate(maxBitrate, user);
-					}
-					else
-					{
-						options.MaxBitrate = mediaSource.Bitrate;
-					}
-				}
-				else
-			    {
 					options.MaxBitrate = GetMaxBitrate(maxBitrate, user);
 				}
 				
@@ -543,7 +524,10 @@ namespace MediaBrowser.Api.Playback
                         streamInfo.StartPositionTicks = startTimeTicks;
                         mediaSource.TranscodingUrl = streamInfo.ToUrl("-", auth.Token).TrimStart('-');
                         mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false";
-                        mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
+                        if (!allowAudioStreamCopy)
+                        {
+                            mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
+                        }
                         mediaSource.TranscodingContainer = streamInfo.Container;
                         mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol;