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

Merge pull request #1 from jellyfin/master

Browse Source 
Pull latest to my fork
This commit is contained in:
Peter Maar
2020-03-19 22:02:08 -04:00
committed by GitHub
parent 818695a01e af5d3e8eae
commit adbf375efe
867 changed files with 6291 additions and 5054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Model/Configuration/EncodingOptions.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public class EncodingOptions
@@ -8,12 +10,14 @@ namespace MediaBrowser.Model.Configuration
public bool EnableThrottling { get; set; }
public int ThrottleDelaySeconds { get; set; }
public string HardwareAccelerationType { get; set; }
/// <summary>
/// FFmpeg path as set by the user via the UI
/// FFmpeg path as set by the user via the UI.
/// </summary>
public string EncoderAppPath { get; set; }
/// <summary>
/// The current FFmpeg path being used by the system and displayed on the transcode page
/// The current FFmpeg path being used by the system and displayed on the transcode page.
/// </summary>
public string EncoderAppPathDisplay { get; set; }
public string VaapiDevice { get; set; }
@@ -29,7 +33,7 @@ namespace MediaBrowser.Model.Configuration
public EncodingOptions()
{
DownMixAudioBoost = 2;
EnableThrottling = true;
EnableThrottling = false;
ThrottleDelaySeconds = 180;
EncodingThreadCount = -1;
// This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything