diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-25 01:07:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 01:07:08 -0400 |
| commit | 88d62050a6a16ce5b9c093501d9a4dc4ce4f62c9 (patch) | |
| tree | a7ea536feec327f28c8106caa0ecf9446a5bf0f4 /MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs | |
| parent | 1443dd1aeeba7f4477263f0eb5bd805491df856f (diff) | |
| parent | 076d4ca5b47fe2a500c0ed5e4625601dba3762d4 (diff) | |
Merge pull request #2914 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs index cb675ba68..bac2a6e65 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.Linq; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Services; @@ -39,18 +40,16 @@ namespace MediaBrowser.Controller.MediaEncoding MaxWidth = info.MaxWidth; MaxHeight = info.MaxHeight; MaxFramerate = info.MaxFramerate; - Profile = info.VideoProfile; ItemId = info.ItemId; MediaSourceId = info.MediaSourceId; - AudioCodec = info.TargetAudioCodec; + AudioCodec = info.TargetAudioCodec.FirstOrDefault(); MaxAudioChannels = info.MaxAudioChannels; AudioBitRate = info.AudioBitrate; AudioSampleRate = info.TargetAudioSampleRate; DeviceProfile = deviceProfile; - VideoCodec = info.TargetVideoCodec; + VideoCodec = info.TargetVideoCodec.FirstOrDefault(); VideoBitRate = info.VideoBitrate; AudioStreamIndex = info.AudioStreamIndex; - MaxRefFrames = info.MaxRefFrames; MaxVideoBitDepth = info.MaxVideoBitDepth; SubtitleMethod = info.SubtitleDeliveryMethod; Context = info.Context; @@ -60,11 +59,7 @@ namespace MediaBrowser.Controller.MediaEncoding { SubtitleStreamIndex = info.SubtitleStreamIndex; } - - if (info.VideoLevel.HasValue) - { - Level = info.VideoLevel.Value.ToString(_usCulture); - } + StreamOptions = info.StreamOptions; } } @@ -231,7 +226,7 @@ namespace MediaBrowser.Controller.MediaEncoding SetOption(qualifier + "-" + name, value); } - public Dictionary<string, string> StreamOptions { get; private set; } + public Dictionary<string, string> StreamOptions { get; set; } public void SetOption(string name, string value) { |
