aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-04-21 16:03:07 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-04-21 16:03:07 -0400
commit875588676123d9976ba8824ced006fcebbcad284 (patch)
tree21dd604a2b08b99540542407d1fdee216b84281c /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parent997b3577505f60dc6ae5b78205340c336fa48ef4 (diff)
switch to hwaccel auto
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs24
1 files changed, 1 insertions, 23 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 816f14f82..130afa3e3 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -49,11 +49,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// </summary>
private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(1, 1);
- /// <summary>
- /// The FF probe resource pool
- /// </summary>
- private readonly SemaphoreSlim _ffProbeResourcePool = new SemaphoreSlim(2, 2);
-
public string FFMpegPath { get; private set; }
public string FFProbePath { get; private set; }
@@ -591,20 +586,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
using (var processWrapper = new ProcessWrapper(process, this, _logger))
{
- await _ffProbeResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
- try
- {
- StartProcess(processWrapper);
- }
- catch (Exception ex)
- {
- _ffProbeResourcePool.Release();
-
- _logger.ErrorException("Error starting ffprobe", ex);
-
- throw;
- }
+ StartProcess(processWrapper);
try
{
@@ -655,10 +637,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
throw;
}
- finally
- {
- _ffProbeResourcePool.Release();
- }
}
}