Merge pull request #14328 from crobibero/trickplay-info

Use dto instead of db object when returning trickplay

Emby.Server.Implementations/Dto/DtoService.cs

@@ -1065,7 +1065,12 @@ namespace Emby.Server.Implementations.Dto
 
                 if (options.ContainsField(ItemFields.Trickplay))
                 {
-                    dto.Trickplay = _trickplayManager.GetTrickplayManifest(item).GetAwaiter().GetResult();
+                    var trickplay = _trickplayManager.GetTrickplayManifest(item).GetAwaiter().GetResult();
+                    dto.Trickplay = trickplay.ToDictionary(
+                        mediaStream => mediaStream.Key,
+                        mediaStream => mediaStream.Value.ToDictionary(
+                            width => width.Key,
+                            width => new TrickplayInfoDto(width.Value)));
                 }
 
                 dto.ExtraType = video.ExtraType;

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -569,7 +569,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the trickplay manifest.
         /// </summary>
         /// <value>The trickplay manifest.</value>
-        public Dictionary<string, Dictionary<int, TrickplayInfo>> Trickplay { get; set; }
+        public Dictionary<string, Dictionary<int, TrickplayInfoDto>> Trickplay { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the location.

MediaBrowser.Model/Dto/TrickplayInfoDto.cs

@@ -0,0 +1,62 @@
+using System;
+using Jellyfin.Database.Implementations.Entities;
+
+namespace MediaBrowser.Model.Dto;
+
+/// <summary>
+/// The trickplay api model.
+/// </summary>
+public record TrickplayInfoDto
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TrickplayInfoDto"/> class.
+    /// </summary>
+    /// <param name="info">The trickplay info.</param>
+    public TrickplayInfoDto(TrickplayInfo info)
+    {
+        ArgumentNullException.ThrowIfNull(info);
+
+        Width = info.Width;
+        Height = info.Height;
+        TileWidth = info.TileWidth;
+        TileHeight = info.TileHeight;
+        ThumbnailCount = info.ThumbnailCount;
+        Interval = info.Interval;
+        Bandwidth = info.Bandwidth;
+    }
+
+    /// <summary>
+    /// Gets the width of an individual thumbnail.
+    /// </summary>
+    public int Width { get; init; }
+
+    /// <summary>
+    /// Gets the height of an individual thumbnail.
+    /// </summary>
+    public int Height { get; init; }
+
+    /// <summary>
+    /// Gets the amount of thumbnails per row.
+    /// </summary>
+    public int TileWidth { get; init; }
+
+    /// <summary>
+    /// Gets the amount of thumbnails per column.
+    /// </summary>
+    public int TileHeight { get; init; }
+
+    /// <summary>
+    /// Gets the total amount of non-black thumbnails.
+    /// </summary>
+    public int ThumbnailCount { get; init; }
+
+    /// <summary>
+    /// Gets the interval in milliseconds between each trickplay thumbnail.
+    /// </summary>
+    public int Interval { get; init; }
+
+    /// <summary>
+    /// Gets the peak bandwidth usage in bits per second.
+    /// </summary>
+    public int Bandwidth { get; init; }
+}