1 files changed, 36 insertions, 65 deletions

diff --git a/Jellyfin.Api/Controllers/UniversalAudioController.cs b/Jellyfin.Api/Controllers/UniversalAudioController.cs
index 6fcafd426..01e13b4fe 100644
--- a/Jellyfin.Api/Controllers/UniversalAudioController.cs
+++ b/Jellyfin.Api/Controllers/UniversalAudioController.cs
@@ -6,17 +6,15 @@ using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
+using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
 using Jellyfin.Api.Models.StreamingDtos;
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -30,8 +28,6 @@ namespace Jellyfin.Api.Controllers
     [Route("")]
     public class UniversalAudioController : BaseJellyfinApiController
     {
-        private readonly IAuthorizationContext _authorizationContext;
-        private readonly IDeviceManager _deviceManager;
         private readonly ILibraryManager _libraryManager;
         private readonly ILogger<UniversalAudioController> _logger;
         private readonly MediaInfoHelper _mediaInfoHelper;
@@ -41,24 +37,18 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Initializes a new instance of the <see cref="UniversalAudioController"/> class.
         /// </summary>
-        /// <param name="authorizationContext">Instance of the <see cref="IAuthorizationContext"/> interface.</param>
-        /// <param name="deviceManager">Instance of the <see cref="IDeviceManager"/> interface.</param>
         /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
         /// <param name="logger">Instance of the <see cref="ILogger{UniversalAudioController}"/> interface.</param>
         /// <param name="mediaInfoHelper">Instance of <see cref="MediaInfoHelper"/>.</param>
         /// <param name="audioHelper">Instance of <see cref="AudioHelper"/>.</param>
         /// <param name="dynamicHlsHelper">Instance of <see cref="DynamicHlsHelper"/>.</param>
         public UniversalAudioController(
-            IAuthorizationContext authorizationContext,
-            IDeviceManager deviceManager,
             ILibraryManager libraryManager,
             ILogger<UniversalAudioController> logger,
             MediaInfoHelper mediaInfoHelper,
             AudioHelper audioHelper,
             DynamicHlsHelper dynamicHlsHelper)
         {
-            _authorizationContext = authorizationContext;
-            _deviceManager = deviceManager;
             _libraryManager = libraryManager;
             _logger = logger;
             _mediaInfoHelper = mediaInfoHelper;
@@ -117,76 +107,57 @@ namespace Jellyfin.Api.Controllers
             [FromQuery] bool enableRedirection = true)
         {
             var deviceProfile = GetDeviceProfile(container, transcodingContainer, audioCodec, transcodingProtocol, breakOnNonKeyFrames, transcodingAudioChannels, maxAudioSampleRate, maxAudioBitDepth, maxAudioChannels);
-            (await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false)).DeviceId = deviceId;
 
-            var authInfo = await _authorizationContext.GetAuthorizationInfo(Request).ConfigureAwait(false);
-
-            _logger.LogInformation("GetPostedPlaybackInfo profile: {@Profile}", deviceProfile);
-
-            if (deviceProfile == null)
+            if (!userId.HasValue || userId.Value.Equals(Guid.Empty))
             {
-                var clientCapabilities = _deviceManager.GetCapabilities(authInfo.DeviceId);
-                if (clientCapabilities != null)
-                {
-                    deviceProfile = clientCapabilities.DeviceProfile;
-                }
+                userId = User.GetUserId();
             }
 
+            _logger.LogInformation("GetPostedPlaybackInfo profile: {@Profile}", deviceProfile);
+
             var info = await _mediaInfoHelper.GetPlaybackInfo(
                     itemId,
                     userId,
                     mediaSourceId)
                 .ConfigureAwait(false);
 
-            if (deviceProfile != null)
-            {
-                // set device specific data
-                var item = _libraryManager.GetItemById(itemId);
-
-                foreach (var sourceInfo in info.MediaSources)
-                {
-                    _mediaInfoHelper.SetDeviceSpecificData(
-                        item,
-                        sourceInfo,
-                        deviceProfile,
-                        authInfo,
-                        maxStreamingBitrate ?? deviceProfile.MaxStreamingBitrate,
-                        startTimeTicks ?? 0,
-                        mediaSourceId ?? string.Empty,
-                        null,
-                        null,
-                        maxAudioChannels,
-                        info.PlaySessionId!,
-                        userId ?? Guid.Empty,
-                        true,
-                        true,
-                        true,
-                        true,
-                        true,
-                        Request.HttpContext.GetNormalizedRemoteIp());
-                }
+            // set device specific data
+            var item = _libraryManager.GetItemById(itemId);
 
-                _mediaInfoHelper.SortMediaSources(info, maxStreamingBitrate);
+            foreach (var sourceInfo in info.MediaSources)
+            {
+                _mediaInfoHelper.SetDeviceSpecificData(
+                    item,
+                    sourceInfo,
+                    deviceProfile,
+                    User,
+                    maxStreamingBitrate ?? deviceProfile.MaxStreamingBitrate,
+                    startTimeTicks ?? 0,
+                    mediaSourceId ?? string.Empty,
+                    null,
+                    null,
+                    maxAudioChannels,
+                    info.PlaySessionId!,
+                    userId ?? Guid.Empty,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    Request.HttpContext.GetNormalizedRemoteIp());
             }
 
-            if (info.MediaSources != null)
+            _mediaInfoHelper.SortMediaSources(info, maxStreamingBitrate);
+
+            foreach (var source in info.MediaSources)
             {
-                foreach (var source in info.MediaSources)
-                {
-                    _mediaInfoHelper.NormalizeMediaSourceContainer(source, deviceProfile!, DlnaProfileType.Video);
-                }
+                _mediaInfoHelper.NormalizeMediaSourceContainer(source, deviceProfile, DlnaProfileType.Video);
             }
 
-            var mediaSource = info.MediaSources![0];
-            if (mediaSource.SupportsDirectPlay && mediaSource.Protocol == MediaProtocol.Http)
+            var mediaSource = info.MediaSources[0];
+            if (mediaSource.SupportsDirectPlay && mediaSource.Protocol == MediaProtocol.Http && enableRedirection && mediaSource.IsRemote && enableRemoteMedia.HasValue && enableRemoteMedia.Value)
             {
-                if (enableRedirection)
-                {
-                    if (mediaSource.IsRemote && enableRemoteMedia.HasValue && enableRemoteMedia.Value)
-                    {
-                        return Redirect(mediaSource.Path);
-                    }
-                }
+                return Redirect(mediaSource.Path);
             }
 
             var isStatic = mediaSource.SupportsDirectStream;
@@ -249,7 +220,7 @@ namespace Jellyfin.Api.Controllers
                 BreakOnNonKeyFrames = breakOnNonKeyFrames,
                 AudioSampleRate = maxAudioSampleRate,
                 MaxAudioChannels = maxAudioChannels,
-                AudioBitRate = isStatic ? (int?)null : (audioBitRate ?? maxStreamingBitrate),
+                AudioBitRate = isStatic ? null : (audioBitRate ?? maxStreamingBitrate),
                 MaxAudioBitDepth = maxAudioBitDepth,
                 AudioChannels = maxAudioChannels,
                 CopyTimestamps = true,