diff options
| -rw-r--r-- | MediaBrowser.Api/Playback/TranscodingThrottler.cs | 20 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 60 |
2 files changed, 70 insertions, 10 deletions
diff --git a/MediaBrowser.Api/Playback/TranscodingThrottler.cs b/MediaBrowser.Api/Playback/TranscodingThrottler.cs index 432f4667d..f22ef4326 100644 --- a/MediaBrowser.Api/Playback/TranscodingThrottler.cs +++ b/MediaBrowser.Api/Playback/TranscodingThrottler.cs @@ -14,11 +14,20 @@ namespace MediaBrowser.Api.Playback private Timer _timer; private bool _isPaused; + private readonly long _gapLengthInTicks = TimeSpan.FromMinutes(2).Ticks; + + public TranscodingThrottler(TranscodingJob job, ILogger logger, IProcessManager processManager) + { + _job = job; + _logger = logger; + _processManager = processManager; + } + public void Start() { if (_processManager.SupportsSuspension) { - _timer = new Timer(TimerCallback, null, 5000, 5000); + //_timer = new Timer(TimerCallback, null, 5000, 5000); } } @@ -78,15 +87,6 @@ namespace MediaBrowser.Api.Playback } } - private readonly long _gapLengthInTicks = TimeSpan.FromMinutes(2).Ticks; - - public TranscodingThrottler(TranscodingJob job, ILogger logger, IProcessManager processManager) - { - _job = job; - _logger = logger; - _processManager = processManager; - } - private bool IsThrottleAllowed(TranscodingJob job) { var bytesDownloaded = job.BytesDownloaded ?? 0; diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 5951262bf..1d30fdbff 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -179,6 +179,9 @@ <Content Include="CORE_RL_bzlib_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="CORE_RL_cairo_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="CORE_RL_exr_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -236,6 +239,9 @@ <Content Include="CORE_RL_zlib_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_bgr_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_bmp_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -245,12 +251,21 @@ <Content Include="ImageMagickCoders\x86\IM_MOD_RL_clipboard_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_clip_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_cmyk_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_cut_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_dib_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_emf_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_gif_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -260,6 +275,9 @@ <Content Include="ImageMagickCoders\x86\IM_MOD_RL_gray_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_hdr_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_histogram_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -281,15 +299,24 @@ <Content Include="ImageMagickCoders\x86\IM_MOD_RL_json_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_label_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_magick_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_map_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_mask_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_matte_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_mat_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_meta_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -302,6 +329,9 @@ <Content Include="ImageMagickCoders\x86\IM_MOD_RL_mpeg_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_null_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_pattern_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -314,6 +344,21 @@ <Content Include="ImageMagickCoders\x86\IM_MOD_RL_preview_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_ps2_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_ps3_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_psd_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_ps_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_raw_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_rgb_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> @@ -326,21 +371,36 @@ <Content Include="ImageMagickCoders\x86\IM_MOD_RL_tiff_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_tile_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_ttf_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_txt_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_url_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_uyvy_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_wbmp_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_webp_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_wmf_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="ImageMagickCoders\x86\IM_MOD_RL_xps_.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Include="ImageMagickCoders\x86\IM_MOD_RL_yuv_.dll"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="Resources\Images\Icon.ico" /> <Content Include="Resources\Images\mb3logo800.png" /> </ItemGroup> |