diff --git a/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs b/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs
index ecdab94b3c..98033c057d 100644
--- a/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/AudioHlsService.cs
@@ -18,8 +18,8 @@ namespace MediaBrowser.Api.Playback.Hls
}
- [Route("/Audio/{Id}/segments/{SegmentId}.mp3", "GET")]
- [Route("/Audio/{Id}/segments/{SegmentId}.aac", "GET")]
+ [Route("/Audio/{Id}/segments/{SegmentId}/stream.mp3", "GET")]
+ [Route("/Audio/{Id}/segments/{SegmentId}/stream.aac", "GET")]
[ServiceStack.ServiceHost.Api(Description = "Gets an Http live streaming segment file. Internal use only.")]
public class GetHlsAudioSegment
{
diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 1fb8a504fb..c27219bbf4 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -127,7 +127,7 @@ namespace MediaBrowser.Api.Playback.Hls
// The segement paths within the playlist are phsyical, so strip that out to make it relative
fileText = fileText.Replace(Path.GetDirectoryName(playlist) + Path.DirectorySeparatorChar, string.Empty);
- fileText = fileText.Replace(SegmentFilePrefix, "segments/");
+ fileText = fileText.Replace(SegmentFilePrefix, "segments/").Replace(".ts", "/stream.ts").Replace(".aac", "/stream.aac").Replace(".mp3", "/stream.mp3");
// Even though we specify target duration of 9, ffmpeg seems unable to keep all segments under that amount
fileText = fileText.Replace("#EXT-X-TARGETDURATION:9", "#EXT-X-TARGETDURATION:10");
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index dfbed538f4..59ac741297 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Api.Playback.Hls
}
- [Route("/Videos/{Id}/segments/{SegmentId}.ts", "GET")]
+ [Route("/Videos/{Id}/segments/{SegmentId}/stream.ts", "GET")]
[ServiceStack.ServiceHost.Api(Description = "Gets an Http live streaming segment file. Internal use only.")]
public class GetHlsVideoSegment
{
@@ -35,6 +35,7 @@ namespace MediaBrowser.Api.Playback.Hls
var file = SegmentFilePrefix + request.SegmentId + Path.GetExtension(Request.PathInfo);
file = Path.Combine(ApplicationPaths.EncodedMediaCachePath, file);
+ Logger.Info(file);
return ToStaticFileResult(file);
}
diff --git a/MediaBrowser.Installer/App.xaml.cs b/MediaBrowser.Installer/App.xaml.cs
index a7c1681e88..3e1230d441 100644
--- a/MediaBrowser.Installer/App.xaml.cs
+++ b/MediaBrowser.Installer/App.xaml.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
namespace MediaBrowser.Installer
{
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index 473e8d37ab..470a18463b 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -87,15 +87,11 @@
-
-
-
-
4.0
diff --git a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
index cdb6adbe73..89d1ea72d5 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/BaseRestService.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using System.Net;
+using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Logging;
@@ -257,6 +258,15 @@ namespace MediaBrowser.Server.Implementations.HttpServer
var stream = await factoryFn().ConfigureAwait(false);
+ var httpListenerResponse = (HttpListenerResponse) Response.OriginalResponse;
+ httpListenerResponse.SendChunked = false;
+
+ if (IsRangeRequest)
+ {
+ return new RangeRequestWriter(Request.Headers, httpListenerResponse, stream);
+ }
+
+ httpListenerResponse.ContentLength64 = stream.Length;
return new StreamWriter(stream);
}
diff --git a/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
new file mode 100644
index 0000000000..77e14362d1
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
@@ -0,0 +1,172 @@
+using ServiceStack.Service;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.HttpServer
+{
+ public class RangeRequestWriter : IStreamWriter
+ {
+ ///
+ /// Gets or sets the source stream.
+ ///
+ /// The source stream.
+ public Stream SourceStream { get; set; }
+ public HttpListenerResponse Response { get; set; }
+ public NameValueCollection RequestHeaders { get; set; }
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The request headers.
+ /// The response.
+ /// The source.
+ public RangeRequestWriter(NameValueCollection requestHeaders, HttpListenerResponse response, Stream source)
+ {
+ RequestHeaders = requestHeaders;
+ Response = response;
+ SourceStream = source;
+ }
+
+ ///
+ /// The _requested ranges
+ ///
+ private List> _requestedRanges;
+ ///
+ /// Gets the requested ranges.
+ ///
+ /// The requested ranges.
+ protected IEnumerable> RequestedRanges
+ {
+ get
+ {
+ if (_requestedRanges == null)
+ {
+ _requestedRanges = new List>();
+
+ // Example: bytes=0-,32-63
+ var ranges = RequestHeaders["Range"].Split('=')[1].Split(',');
+
+ foreach (var range in ranges)
+ {
+ var vals = range.Split('-');
+
+ long start = 0;
+ long? end = null;
+
+ if (!string.IsNullOrEmpty(vals[0]))
+ {
+ start = long.Parse(vals[0]);
+ }
+ if (!string.IsNullOrEmpty(vals[1]))
+ {
+ end = long.Parse(vals[1]);
+ }
+
+ _requestedRanges.Add(new KeyValuePair(start, end));
+ }
+ }
+
+ return _requestedRanges;
+ }
+ }
+
+ ///
+ /// Writes to.
+ ///
+ /// The response stream.
+ public void WriteTo(Stream responseStream)
+ {
+ Response.Headers["Accept-Ranges"] = "bytes";
+ Response.StatusCode = 206;
+
+ var task = WriteToAsync(responseStream);
+
+ Task.WaitAll(task);
+ }
+
+ ///
+ /// Writes to async.
+ ///
+ /// The response stream.
+ /// Task.
+ private Task WriteToAsync(Stream responseStream)
+ {
+ var requestedRange = RequestedRanges.First();
+
+ var totalLength = SourceStream.Length;
+
+ // If the requested range is "0-", we can optimize by just doing a stream copy
+ if (!requestedRange.Value.HasValue)
+ {
+ return ServeCompleteRangeRequest(requestedRange, responseStream, totalLength);
+ }
+
+ // This will have to buffer a portion of the content into memory
+ return ServePartialRangeRequest(requestedRange.Key, requestedRange.Value.Value, responseStream, totalLength);
+ }
+
+ ///
+ /// Handles a range request of "bytes=0-"
+ /// This will serve the complete content and add the content-range header
+ ///
+ /// The requested range.
+ /// The response stream.
+ /// Total length of the content.
+ /// Task.
+ private Task ServeCompleteRangeRequest(KeyValuePair requestedRange, Stream responseStream, long totalContentLength)
+ {
+ var rangeStart = requestedRange.Key;
+ var rangeEnd = totalContentLength - 1;
+ var rangeLength = 1 + rangeEnd - rangeStart;
+
+ // Content-Length is the length of what we're serving, not the original content
+ Response.ContentLength64 = rangeLength;
+ Response.Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", rangeStart, rangeEnd, totalContentLength);
+
+ if (rangeStart > 0)
+ {
+ SourceStream.Position = rangeStart;
+ }
+
+ return SourceStream.CopyToAsync(responseStream);
+ }
+
+ ///
+ /// Serves a partial range request
+ ///
+ /// The range start.
+ /// The range end.
+ /// The response stream.
+ /// Total length of the content.
+ /// Task.
+ private async Task ServePartialRangeRequest(long rangeStart, long rangeEnd, Stream responseStream, long totalContentLength)
+ {
+ var rangeLength = 1 + rangeEnd - rangeStart;
+
+ // Content-Length is the length of what we're serving, not the original content
+ Response.ContentLength64 = rangeLength;
+ Response.Headers["Content-Range"] = string.Format("bytes {0}-{1}/{2}", rangeStart, rangeEnd, totalContentLength);
+
+ SourceStream.Position = rangeStart;
+
+ // Fast track to just copy the stream to the end
+ if (rangeEnd == totalContentLength - 1)
+ {
+ await SourceStream.CopyToAsync(responseStream).ConfigureAwait(false);
+ }
+ else
+ {
+ // Read the bytes we need
+ var buffer = new byte[Convert.ToInt32(rangeLength)];
+ await SourceStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
+
+ await responseStream.WriteAsync(buffer, 0, Convert.ToInt32(rangeLength)).ConfigureAwait(false);
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index c8a7a2fc18..2bb75a18da 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -109,6 +109,7 @@
+