starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix roku thumbnails

Browse Source
This commit is contained in:
Luke Pulverenti
2015-04-15 11:41:42 -04:00
parent 9189b551ec
commit 064b5e82e4
4 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -513,8 +513,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;
process.Dispose();
if (exitCode == -1 || memoryStream.Length == 0)
{
memoryStream.Dispose();
@@ -594,7 +592,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
bool ranToCompletion;
bool ranToCompletion = false;
var processWrapper = new ProcessWrapper(process, this);
@@ -609,19 +607,23 @@ namespace MediaBrowser.MediaEncoding.Encoder
bool isResponsive = true;
int lastCount = 0;
while (isResponsive && !process.WaitForExit(30000))
while (isResponsive)
{
if (process.WaitForExit(30000))
{
ranToCompletion = true;
break;
}
cancellationToken.ThrowIfCancellationRequested();
int jpegCount = Directory.GetFiles(targetDirectory)
var jpegCount = Directory.GetFiles(targetDirectory)
.Count(i => string.Equals(Path.GetExtension(i), ".jpg", StringComparison.OrdinalIgnoreCase));
isResponsive = (jpegCount > lastCount);
lastCount = jpegCount;
}
ranToCompletion = process.HasExited;
if (!ranToCompletion)
{
StopProcess(processWrapper, 1000, false);
@@ -634,8 +636,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
var exitCode = ranToCompletion ? processWrapper.ExitCode ?? 0 : -1;
process.Dispose();
if (exitCode == -1)
{
var msg = string.Format("ffmpeg image extraction failed for {0}", inputArgument);