diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/SyncJob.cs | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index e1b0514e7a..55d05418cc 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -13,9 +13,10 @@ namespace MediaBrowser.Model.Configuration public string VaapiDevice { get; set; } public int H264Crf { get; set; } public string H264Preset { get; set; } - public bool EnableHardwareDecoding { get; set; } public bool EnableHardwareEncoding { get; set; } + public string[] HardwareDecodingCodecs { get; set; } + public EncodingOptions() { DownMixAudioBoost = 2; @@ -24,8 +25,9 @@ namespace MediaBrowser.Model.Configuration EncodingThreadCount = -1; VaapiDevice = "/dev/dri/card0"; H264Crf = 23; - EnableHardwareDecoding = true; EnableHardwareEncoding = true; + + HardwareDecodingCodecs = new string[] { "h264", "mpeg2video", "vc1" }; } } } diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs index f0e262c501..eb153427c7 100644 --- a/MediaBrowser.Model/Sync/SyncJob.cs +++ b/MediaBrowser.Model/Sync/SyncJob.cs @@ -105,12 +105,9 @@ namespace MediaBrowser.Model.Sync public string PrimaryImageItemId { get; set; } public string PrimaryImageTag { get; set; } - public bool EnableAutomaticResync { get; set; } - public SyncJob() { RequestedItemIds = new List<string>(); - EnableAutomaticResync = true; } } } |
