alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-02 20:32:52 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Async stream handling: Use interface instead of Func<Stream,Task>

Browse Source 
No functional changes
This commit is contained in:
softworkz
2016-08-05 06:08:11 +02:00
parent 894d87fabb
commit 433254c498
9 changed files with 223 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@@ -362,9 +362,9 @@ namespace MediaBrowser.Api.Playback.Progressive
outputHeaders[item.Key] = item.Value;
}
Func<Stream, Task> streamWriter = stream => new ProgressiveFileCopier(FileSystem, job, Logger).StreamFile(outputPath, stream, CancellationToken.None);
var streamSource = new ProgressiveFileCopier(FileSystem, outputPath, outputHeaders, job, Logger, CancellationToken.None);
return ResultFactory.GetAsyncStreamWriter(streamWriter, outputHeaders);
return ResultFactory.GetAsyncStreamWriter(streamSource);
}
finally
{

23
MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
View File

@@ -4,28 +4,45 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Controller.Net;
using System.Collections.Generic;
using ServiceStack.Web;
namespace MediaBrowser.Api.Playback.Progressive
{
public class ProgressiveFileCopier
public class ProgressiveFileCopier : IAsyncStreamSource, IHasOptions
{
private readonly IFileSystem _fileSystem;
private readonly TranscodingJob _job;
private readonly ILogger _logger;
private readonly string _path;
private readonly CancellationToken _cancellationToken;
private readonly Dictionary<string, string> _outputHeaders;
// 256k
private const int BufferSize = 81920;
private long _bytesWritten = 0;
public ProgressiveFileCopier(IFileSystem fileSystem, TranscodingJob job, ILogger logger)
public ProgressiveFileCopier(IFileSystem fileSystem, string path, Dictionary<string, string> outputHeaders, TranscodingJob job, ILogger logger, CancellationToken cancellationToken)
{
_fileSystem = fileSystem;
_path = path;
_outputHeaders = outputHeaders;
_job = job;
_logger = logger;
_cancellationToken = cancellationToken;
}
public async Task StreamFile(string path, Stream outputStream, CancellationToken cancellationToken)
public IDictionary<string, string> Options
{
get
{
return _outputHeaders;
}
}
public async Task WriteToAsync(Stream outputStream)
{
try
{