lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tim Hobbs 2014-04-07 11:58:28 -07:00
commit f74628cca1
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
MediaBrowser.Server.Implementations/HttpServer/RangeRequestWriter.cs
View File

@ -1,4 +1,5 @@
using ServiceStack.Web;
using System.Threading;
using ServiceStack.Web;
using System;
using System.Collections.Generic;
using System.Globalization;
@ -178,8 +179,35 @@ namespace MediaBrowser.Server.Implementations.HttpServer
using (var source = SourceStream)
{
//Since we've already set the postion of the sourcestream, just copy the remains to the output
await source.CopyToAsync(responseStream).ConfigureAwait(false);
// If the requested range is "0-", we can optimize by just doing a stream copy
if (RangeEnd >= TotalContentLength - 1)
{
await source.CopyToAsync(responseStream).ConfigureAwait(false);
}
else
{
await CopyToAsyncInternal(source, responseStream, Convert.ToInt32(RangeLength), CancellationToken.None).ConfigureAwait(false);
}
}
}
private async Task CopyToAsyncInternal(Stream source, Stream destination, int copyLength, CancellationToken cancellationToken)
{
const int bufferSize = 81920;
var array = new byte[bufferSize];
int count;
while ((count = await source.ReadAsync(array, 0, array.Length, cancellationToken).ConfigureAwait(false)) != 0)
{
var bytesToCopy = Math.Min(count, copyLength);
await destination.WriteAsync(array, 0, bytesToCopy, cancellationToken).ConfigureAwait(false);
copyLength -= bytesToCopy;
if (copyLength <= 0)
{
break;
}
}
}
@ -201,4 +229,4 @@ namespace MediaBrowser.Server.Implementations.HttpServer
public string StatusDescription { get; set; }
}
}
}