3 files changed, 30 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Drawing/ImageHelper.cs b/MediaBrowser.Controller/Drawing/ImageHelper.cs
index 9ef92bc981..6f26b7d912 100644
--- a/MediaBrowser.Controller/Drawing/ImageHelper.cs
+++ b/MediaBrowser.Controller/Drawing/ImageHelper.cs
@@ -11,7 +11,9 @@ namespace MediaBrowser.Controller.Drawing
             // Determine the output size based on incoming parameters
             var newSize = DrawingUtils.Resize(originalImageSize, options.Width ?? 0, options.Height ?? 0, options.MaxWidth ?? 0, options.MaxHeight ?? 0);
             newSize = DrawingUtils.ResizeFill(newSize, options.FillWidth, options.FillHeight);
-            return newSize;
+
+            // Never encode larger than the source.
+            return DrawingUtils.ScaleDownToFit(newSize, originalImageSize);
         }
     }
 }
diff --git a/MediaBrowser.Controller/Library/SearchProviderQuery.cs b/MediaBrowser.Controller/Library/SearchProviderQuery.cs
index 845588c872..b1ff800fa0 100644
--- a/MediaBrowser.Controller/Library/SearchProviderQuery.cs
+++ b/MediaBrowser.Controller/Library/SearchProviderQuery.cs
@@ -19,7 +19,9 @@ public class SearchProviderQuery
     public Guid? UserId { get; init; }
 
     /// <summary>
-    /// Gets the item types to include in the search.
+    /// Gets the item types to include in the search. An empty array means every type is eligible.
+    /// When this is non-empty it is the authoritative type filter and <see cref="ExcludeItemTypes"/>
+    /// does not apply; excludes only take effect when no include types were requested.
     /// </summary>
     public BaseItemKind[] IncludeItemTypes { get; init; } = [];
 
@@ -29,7 +31,9 @@ public class SearchProviderQuery
     public BaseItemKind[] ExcludeItemTypes { get; init; } = [];
 
     /// <summary>
-    /// Gets the media types to include in the search.
+    /// Gets the media types to include in the search. This is an additional constraint rather than
+    /// an alternative one: a provider must return only items that match both the requested media
+    /// types and the requested item types, not the union of the two.
     /// </summary>
     public MediaType[] MediaTypes { get; init; } = [];
 
@@ -39,7 +43,9 @@ public class SearchProviderQuery
     public int? Limit { get; init; }
 
     /// <summary>
-    /// Gets the parent ID to scope the search.
+    /// Gets the parent ID to scope the search. This scopes to the whole subtree, not just direct
+    /// children - callers routinely pass a library folder id and expect items nested arbitrarily
+    /// deep beneath it (an episode under a season under a series) to match.
     /// </summary>
     public Guid? ParentId { get; init; }
 }
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index fb68bfb770..d9bc79dec5 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -28,6 +28,7 @@ namespace MediaBrowser.Controller.Session
         private readonly Lock _progressLock = new();
         private Timer _progressTimer;
         private PlaybackProgressInfo _lastProgressInfo;
+        private long? _lastPlaybackCheckInPositionTicks;
 
         private bool _disposed;
 
@@ -125,6 +126,22 @@ namespace MediaBrowser.Controller.Session
         public DateTime LastPlaybackCheckIn { get; set; }
 
         /// <summary>
+        /// Gets the position reported by the client at the last playback check-in.
+        /// </summary>
+        /// <value>The position ticks, or <see langword="null"/> if the client did not report a position.</value>
+        [JsonIgnore]
+        public long? LastPlaybackCheckInPositionTicks
+        {
+            get
+            {
+                lock (_progressLock)
+                {
+                    return _lastPlaybackCheckInPositionTicks;
+                }
+            }
+        }
+
+        /// <summary>
         /// Gets or sets the last paused date.
         /// </summary>
         /// <value>The last paused date.</value>
@@ -372,6 +389,7 @@ namespace MediaBrowser.Controller.Session
 
             lock (_progressLock)
             {
+                _lastPlaybackCheckInPositionTicks = progressInfo.PositionTicks;
                 _lastProgressInfo = progressInfo;
 
                 if (_progressTimer is null)