Fixes for 10.10 (#84)

jellyfin · Oct 26, 2024 · 9f3fccd · 9f3fccd
1 parent b89cee0
commit 9f3fccd
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 28 deletions.
diff --git a/src/Jellyfin.Plugin.Dlna.Model/DlnaDeviceProfile.cs b/src/Jellyfin.Plugin.Dlna.Model/DlnaDeviceProfile.cs
@@ -5,6 +5,7 @@
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
 
 namespace Jellyfin.Plugin.Dlna.Model;
@@ -109,7 +110,7 @@ public class DlnaDeviceProfile : DeviceProfile
     /// Gets or sets the maximum allowed height of embedded icons.
     /// </summary>
     public int? MaxIconHeight { get; set; }
-    
+
     /// <summary>
     /// Gets or sets the content of the aggregationFlags element in the urn:schemas-sonycom:av namespace.
     /// </summary>
@@ -154,19 +155,19 @@ public class DlnaDeviceProfile : DeviceProfile
     /// Gets or sets the XmlRootAttributes.
     /// </summary>
     public XmlAttribute[] XmlRootAttributes { get; set; } = Array.Empty<XmlAttribute>();
-    
+
     /// <summary>
     /// Gets or sets the ResponseProfiles.
     /// </summary>
     public ResponseProfile[] ResponseProfiles { get; set; } = Array.Empty<ResponseProfile>();
-    
+
     /// <summary>
     /// The GetSupportedMediaTypes.
     /// </summary>
     /// <returns>The .</returns>
     public MediaType[] GetSupportedMediaTypes()
     {
-        return ContainerProfile.SplitValue(SupportedMediaTypes)
+        return ContainerHelper.Split(SupportedMediaTypes)
             .Select(m => Enum.TryParse<MediaType>(m, out var parsed) ? parsed : MediaType.Unknown)
             .Where(m => m != MediaType.Unknown)
             .ToArray();
@@ -185,7 +186,7 @@ public MediaType[] GetSupportedMediaTypes()
         return TranscodingProfiles
             .Where(i => i.Type == DlnaProfileType.Audio)
             .Where(i => string.Equals(container, i.Container, StringComparison.OrdinalIgnoreCase))
-            .FirstOrDefault(i => i.GetAudioCodecs().Contains(audioCodec ?? string.Empty, StringComparison.OrdinalIgnoreCase));
+            .FirstOrDefault(i => ContainerHelper.Split(i.AudioCodec).Contains(audioCodec ?? string.Empty, StringComparison.OrdinalIgnoreCase));
     }
 
     /// <summary>
@@ -202,7 +203,7 @@ public MediaType[] GetSupportedMediaTypes()
         return TranscodingProfiles
             .Where(i => i.Type == DlnaProfileType.Video)
             .Where(i => string.Equals(container, i.Container, StringComparison.OrdinalIgnoreCase))
-            .Where(i => i.GetAudioCodecs().Contains(audioCodec ?? string.Empty, StringComparison.OrdinalIgnoreCase))
+            .Where(i => ContainerHelper.Split(i.AudioCodec).Contains(audioCodec ?? string.Empty, StringComparison.OrdinalIgnoreCase))
             .FirstOrDefault(i => string.Equals(videoCodec, i.VideoCodec, StringComparison.OrdinalIgnoreCase));
     }
 
@@ -225,7 +226,7 @@ public MediaType[] GetSupportedMediaTypes()
                 continue;
             }
 
-            if (!ContainerProfile.ContainsContainer(i.GetContainers(), container))
+            if (!ContainerHelper.ContainsContainer(i.Container, container))
             {
                 continue;
             }
@@ -273,7 +274,7 @@ public MediaType[] GetSupportedMediaTypes()
                 continue;
             }
 
-            if (!ContainerProfile.ContainsContainer(i.GetContainers(), container))
+            if (!ContainerHelper.ContainsContainer(i.Container, container))
             {
                 continue;
             }
@@ -352,7 +353,7 @@ public MediaType[] GetSupportedMediaTypes()
                 continue;
             }
 
-            if (!ContainerProfile.ContainsContainer(i.GetContainers(), container))
+            if (!ContainerHelper.ContainsContainer(i.Container, container))
             {
                 continue;
             }

diff --git a/src/Jellyfin.Plugin.Dlna.Model/ResponseProfile.cs b/src/Jellyfin.Plugin.Dlna.Model/ResponseProfile.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Extensions;
 
 namespace Jellyfin.Plugin.Dlna.Model;
 
@@ -34,17 +35,11 @@ public ResponseProfile()
     public ProfileCondition[] Conditions { get; set; }
 
     public string[] GetContainers()
-    {
-        return ContainerProfile.SplitValue(Container);
-    }
+        => ContainerHelper.Split(Container);
 
     public string[] GetAudioCodecs()
-    {
-        return ContainerProfile.SplitValue(AudioCodec);
-    }
+        => ContainerHelper.Split(AudioCodec);
 
     public string[] GetVideoCodecs()
-    {
-        return ContainerProfile.SplitValue(VideoCodec);
-    }
+        => ContainerHelper.Split(VideoCodec);
 }
diff --git a/src/Jellyfin.Plugin.Dlna.Playback/Api/DlnaVideosController.cs b/src/Jellyfin.Plugin.Dlna.Playback/Api/DlnaVideosController.cs
@@ -14,6 +14,7 @@
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Streaming;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Net;
 using Microsoft.AspNetCore.Http;
@@ -318,7 +319,7 @@ public async Task<ActionResult> GetVideoStream(
 
         // Need to start ffmpeg (because media can't be returned directly)
         var encodingOptions = _serverConfigurationManager.GetEncodingOptions();
-        var ffmpegCommandLineArguments = _encodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions, "superfast");
+        var ffmpegCommandLineArguments = _encodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions,  EncoderPreset.superfast);
         return await FileStreamResponseHelpers.GetTranscodedFile(
             state,
             isHeadRequest,

diff --git a/src/Jellyfin.Plugin.Dlna.Playback/StreamingHelpers.cs b/src/Jellyfin.Plugin.Dlna.Playback/StreamingHelpers.cs
@@ -232,11 +232,17 @@ public static async Task<DlnaStreamState> GetStreamingState(
                 }
                 else
                 {
+                    var h264EquivalentBitrate = EncodingHelper.ScaleBitrate(
+                        state.OutputVideoBitrate.Value,
+                        state.ActualOutputVideoCodec,
+                        "h264");
                     var resolution = ResolutionNormalizer.Normalize(
                         state.VideoStream?.BitRate,
                         state.OutputVideoBitrate.Value,
+                        h264EquivalentBitrate,
                         state.VideoRequest.MaxWidth,
-                        state.VideoRequest.MaxHeight);
+                        state.VideoRequest.MaxHeight,
+                        state.TargetFramerate);
 
                     state.VideoRequest.MaxWidth = resolution.MaxWidth;
                     state.VideoRequest.MaxHeight = resolution.MaxHeight;

diff --git a/src/Jellyfin.Plugin.Dlna/ContentDirectory/ControlHandler.cs b/src/Jellyfin.Plugin.Dlna/ContentDirectory/ControlHandler.cs
@@ -1004,7 +1004,7 @@ private QueryResult<ServerItem> GetNextUp(BaseItem parent, InternalItemsQuery qu
                 Limit = query.Limit,
                 StartIndex = query.StartIndex,
                 // User cannot be null here as the caller has set it
-                UserId = query.User!.Id
+                User = query.User!
             },
             new[] { parent },
             query.DtoOptions);
@@ -1027,7 +1027,7 @@ private QueryResult<ServerItem> GetLatest(BaseItem parent, InternalItemsQuery qu
             new LatestItemsQuery
             {
                 // User cannot be null here as the caller has set it
-                UserId = query.User!.Id,
+                User = query.User!,
                 Limit = query.Limit ?? 50,
                 IncludeItemTypes = new[] { itemType },
                 ParentId = parent?.Id ?? Guid.Empty,

diff --git a/src/Jellyfin.Plugin.Dlna/DlnaManager.cs b/src/Jellyfin.Plugin.Dlna/DlnaManager.cs
@@ -9,6 +9,7 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Jellyfin.Extensions;
 using Jellyfin.Extensions.Json;
 using Jellyfin.Plugin.Dlna.Model;
 using Jellyfin.Plugin.Dlna.Profiles;
@@ -255,7 +256,7 @@ private IEnumerable<DeviceProfile> GetProfiles(string path, DeviceProfileType ty
                 var tempProfile = (DlnaDeviceProfile)_xmlSerializer.DeserializeFromFile(typeof(DlnaDeviceProfile), path);
                 var profile = ReserializeProfile(tempProfile);
 
-                profile.Id = path.ToLowerInvariant().GetMD5().ToString("N", CultureInfo.InvariantCulture);
+                profile.Id = path.ToLowerInvariant().GetMD5();
 
                 _profiles[path] = new Tuple<InternalProfileInfo, DlnaDeviceProfile>(GetInternalProfileInfo(_fileSystem.GetFileInfo(path), type), profile);
 
@@ -389,7 +390,10 @@ public void UpdateProfile(string profileId, DlnaDeviceProfile profile)
     {
         profile = ReserializeProfile(profile);
 
-        ArgumentException.ThrowIfNullOrEmpty(profile.Id);
+        if (profile.Id.IsNullOrEmpty())
+        {
+            throw new ArgumentException("Profile id cannot be empty.", nameof(profile.Id));
+        }
 
         ArgumentException.ThrowIfNullOrEmpty(profile.Name);
 

diff --git a/src/Jellyfin.Plugin.Dlna/Extensions/StreamInfoExtensions.cs b/src/Jellyfin.Plugin.Dlna/Extensions/StreamInfoExtensions.cs
@@ -81,11 +81,11 @@ private static IEnumerable<NameValuePair> BuildParams(StreamInfo item, string? a
     {
         var list = new List<NameValuePair>();
 
-        string audioCodecs = item.AudioCodecs.Length == 0 ?
+        string audioCodecs = item.AudioCodecs.Count == 0 ?
             string.Empty :
             string.Join(',', item.AudioCodecs);
 
-        string videoCodecs = item.VideoCodecs.Length == 0 ?
+        string videoCodecs = item.VideoCodecs.Count == 0 ?
             string.Empty :
             string.Join(',', item.VideoCodecs);
 
@@ -164,7 +164,7 @@ private static IEnumerable<NameValuePair> BuildParams(StreamInfo item, string? a
 
         list.Add(new NameValuePair("Tag", item.MediaSource?.ETag ?? string.Empty));
 
-        string subtitleCodecs = item.SubtitleCodecs.Length == 0 ?
+        string subtitleCodecs = item.SubtitleCodecs.Count == 0 ?
             string.Empty :
             string.Join(",", item.SubtitleCodecs);
 

diff --git a/src/Jellyfin.Plugin.Dlna/Profiles/DefaultProfile.cs b/src/Jellyfin.Plugin.Dlna/Profiles/DefaultProfile.cs
@@ -12,7 +12,7 @@ public class DefaultProfile : DlnaDeviceProfile
 {
     public DefaultProfile()
     {
-        Id = Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture);
+        Id = Guid.NewGuid();
         Name = "Generic Device";
 
         ProtocolInfo = "http-get:*:video/mpeg:*,http-get:*:video/mp4:*,http-get:*:video/vnd.dlna.mpeg-tts:*,http-get:*:video/avi:*,http-get:*:video/x-matroska:*,http-get:*:video/x-ms-wmv:*,http-get:*:video/wtv:*,http-get:*:audio/mpeg:*,http-get:*:audio/mp3:*,http-get:*:audio/mp4:*,http-get:*:audio/x-ms-wma:*,http-get:*:audio/wav:*,http-get:*:audio/L16:*,http-get:*:image/jpeg:*,http-get:*:image/png:*,http-get:*:image/gif:*,http-get:*:image/tiff:*";