cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 10:29:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove EOF counter

Browse Source
This commit is contained in:
cvium 2020-09-26 19:03:23 +02:00
parent 6ca313abc1
commit 146cad6150
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Jellyfin.Api/Helpers/ProgressiveFileStream.cs
View File

@ -79,13 +79,10 @@ namespace Jellyfin.Api.Helpers
/// <inheritdoc /> /// <inheritdoc />
public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{ {
var eofCount = 0;
const int EmptyReadLimit = 20;
int totalBytesRead = 0; int totalBytesRead = 0;
int remainingBytesToRead = count; int remainingBytesToRead = count;
while (eofCount < EmptyReadLimit && remainingBytesToRead > 0) while (remainingBytesToRead > 0)
{ {
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
int bytesRead; int bytesRead;
@ -109,20 +106,15 @@ namespace Jellyfin.Api.Helpers
_job.BytesDownloaded = Math.Max(_job.BytesDownloaded ?? _bytesWritten, _bytesWritten); _job.BytesDownloaded = Math.Max(_job.BytesDownloaded ?? _bytesWritten, _bytesWritten);
} }
} }
else
if (bytesRead == 0)
{ {
if (_job == null || _job.HasExited) if (_job == null || _job.HasExited)
{ {
eofCount++; break;
} }
await Task.Delay(100, cancellationToken).ConfigureAwait(false); await Task.Delay(100, cancellationToken).ConfigureAwait(false);
} }
else
{
eofCount = 0;
}
} }
return totalBytesRead; return totalBytesRead;
@ -148,6 +140,8 @@ namespace Jellyfin.Api.Helpers
return; return;
} }
try
{
if (disposing) if (disposing)
{ {
_fileStream.Dispose(); _fileStream.Dispose();
@ -157,8 +151,12 @@ namespace Jellyfin.Api.Helpers
_transcodingJobHelper.OnTranscodeEndRequest(_job); _transcodingJobHelper.OnTranscodeEndRequest(_job);
} }
} }
}
finally
{
_disposed = true; _disposed = true;
base.Dispose(disposing);
}
} }
} }
} }