aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-03-27 23:32:43 -0400
committerTim Hobbs <jesus.tesh@gmail.com>2014-03-28 03:28:31 -0700
commit87c8c429e7d29c94e3722e69d4d31f505c48cfb0 (patch)
treee66b5ef6a428721d3edebb9bba2eca98b2ceccf5 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parent0aec40966e281a1ffefe78ad6461b2f6582ce628 (diff)
added image encoder methods
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs41
1 files changed, 1 insertions, 40 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 55035a4ca..8b41d2105 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -880,45 +880,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
/// <summary>
- /// Starts the and wait for process.
- /// </summary>
- /// <param name="process">The process.</param>
- /// <param name="timeout">The timeout.</param>
- /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
- private bool StartAndWaitForProcess(Process process, int timeout = 10000)
- {
- process.Start();
-
- var ranToCompletion = process.WaitForExit(timeout);
-
- if (!ranToCompletion)
- {
- try
- {
- _logger.Info("Killing ffmpeg process");
-
- process.Kill();
-
- process.WaitForExit(1000);
- }
- catch (Win32Exception ex)
- {
- _logger.ErrorException("Error killing process", ex);
- }
- catch (InvalidOperationException ex)
- {
- _logger.ErrorException("Error killing process", ex);
- }
- catch (NotSupportedException ex)
- {
- _logger.ErrorException("Error killing process", ex);
- }
- }
-
- return ranToCompletion;
- }
-
- /// <summary>
/// Gets the file input argument.
/// </summary>
/// <param name="path">The path.</param>
@@ -950,7 +911,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
public Task<Stream> EncodeImage(ImageEncodingOptions options, CancellationToken cancellationToken)
{
- return new ImageEncoder(FFMpegPath, _logger).EncodeImage(options, cancellationToken);
+ return new ImageEncoder(FFMpegPath, _logger, _fileSystem).EncodeImage(options, cancellationToken);
}
/// <summary>