lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable Throttling when transcoding without Hardware-Acceleration

Browse Source
This commit is contained in:
Maximilian Marschall 2020-01-12 00:31:17 +01:00
parent a272638a84
commit 081d942d03
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -32,6 +32,7 @@
- [nevado](https://github.com/nevado) - [nevado](https://github.com/nevado)
- [mark-monteiro](https://github.com/mark-monteiro) - [mark-monteiro](https://github.com/mark-monteiro)
- [ullmie02](https://github.com/ullmie02) - [ullmie02](https://github.com/ullmie02)
- [geilername](https://github.com/geilername)
# Emby Contributors # Emby Contributors

12
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -327,6 +327,18 @@ namespace MediaBrowser.Api.Playback
private bool EnableThrottling(StreamState state) private bool EnableThrottling(StreamState state)
{ {
var encodingOptions = ServerConfigurationManager.GetEncodingOptions();
// enable throttling when not using hardware acceleration
if (encodingOptions.HardwareAccelerationType == string.Empty)
{
return state.InputProtocol == MediaProtocol.File &&
state.RunTimeTicks.HasValue &&
state.RunTimeTicks.Value >= TimeSpan.FromMinutes(5).Ticks &&
state.IsInputVideo &&
state.VideoType == VideoType.VideoFile &&
!string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase);
}
return false; return false;
//// do not use throttling with hardware encoders //// do not use throttling with hardware encoders
//return state.InputProtocol == MediaProtocol.File && //return state.InputProtocol == MediaProtocol.File &&