1 files changed, 11 insertions, 13 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 92404de508..7aad97ce01 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -87,11 +87,6 @@ public class StreamInfo
     public int? MinSegments { get; set; }
 
     /// <summary>
-    /// Gets or sets a value indicating whether the stream can be broken on non-keyframes.
-    /// </summary>
-    public bool BreakOnNonKeyFrames { get; set; }
-
-    /// <summary>
     /// Gets or sets a value indicating whether the stream requires AVC.
     /// </summary>
     public bool RequireAvc { get; set; }
@@ -900,7 +895,7 @@ public class StreamInfo
 
         if (SubProtocol == MediaStreamProtocol.hls)
         {
-            sb.Append("/master.m3u8?");
+            sb.Append("/master.m3u8");
         }
         else
         {
@@ -911,10 +906,10 @@ public class StreamInfo
                 sb.Append('.');
                 sb.Append(Container);
             }
-
-            sb.Append('?');
         }
 
+        var queryStart = sb.Length;
+
         if (!string.IsNullOrEmpty(DeviceProfileId))
         {
             sb.Append("&DeviceProfileId=");
@@ -1018,9 +1013,6 @@ public class StreamInfo
                 sb.Append("&MinSegments=");
                 sb.Append(MinSegments.Value.ToString(CultureInfo.InvariantCulture));
             }
-
-            sb.Append("&BreakOnNonKeyFrames=");
-            sb.Append(BreakOnNonKeyFrames.ToString(CultureInfo.InvariantCulture));
         }
         else
         {
@@ -1141,6 +1133,12 @@ public class StreamInfo
             sb.Append(query);
         }
 
+        // Replace the first '&' with '?' to form a valid query string.
+        if (sb.Length > queryStart)
+        {
+            sb[queryStart] = '?';
+        }
+
         return sb.ToString();
     }
 
@@ -1260,11 +1258,11 @@ public class StreamInfo
                 stream.Index.ToString(CultureInfo.InvariantCulture),
                 startPositionTicks.ToString(CultureInfo.InvariantCulture),
                 subtitleProfile.Format);
-            info.IsExternalUrl = false; // Default to API URL
+            info.IsExternalUrl = false;
 
             // Check conditions for potentially using the direct path
             if (stream.IsExternal // Must be external
-                && MediaSource?.Protocol != MediaProtocol.File // Main media must not be a local file
+                && stream.SupportsExternalStream
                 && string.Equals(stream.Codec, subtitleProfile.Format, StringComparison.OrdinalIgnoreCase) // Format must match (no conversion needed)
                 && !string.IsNullOrEmpty(stream.Path) // Path must exist
                 && Uri.TryCreate(stream.Path, UriKind.Absolute, out Uri? uriResult) // Path must be an absolute URI