diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-16 13:12:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 13:12:31 -0400 |
| commit | fa0795b65b3208b28f8044081f0e9486d59dfb7b (patch) | |
| tree | 23a9cfd0479cbfe65793db40543bdc501b9a08a8 /MediaBrowser.Model | |
| parent | f87f16b6a190f772cc31ed3c6e1a8bd413c329be (diff) | |
| parent | 55f47d21204bd166ab214256c7b8dd05c4d7ccd4 (diff) | |
Merge pull request #2238 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamInfo.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/TranscodingProfile.cs | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 52b7fd43a..18e46b84c 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -478,6 +478,7 @@ namespace MediaBrowser.Model.Dlna playlistItem.VideoCodec = transcodingProfile.VideoCodec; playlistItem.CopyTimestamps = transcodingProfile.CopyTimestamps; playlistItem.EnableSubtitlesInManifest = transcodingProfile.EnableSubtitlesInManifest; + playlistItem.EnableSplittingOnNonKeyFrames = transcodingProfile.EnableSplittingOnNonKeyFrames; if (!string.IsNullOrEmpty(transcodingProfile.MaxAudioChannels)) { diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index c9cb873e1..b8db8a10c 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -37,6 +37,7 @@ namespace MediaBrowser.Model.Dlna public bool CopyTimestamps { get; set; } public bool EnableSubtitlesInManifest { get; set; } + public bool EnableSplittingOnNonKeyFrames { get; set; } public string[] AudioCodecs { get; set; } public int? AudioStreamIndex { get; set; } @@ -264,6 +265,7 @@ namespace MediaBrowser.Model.Dlna list.Add(new NameValuePair("EnableSubtitlesInManifest", item.EnableSubtitlesInManifest.ToString().ToLower())); list.Add(new NameValuePair("Tag", item.MediaSource.ETag ?? string.Empty)); + list.Add(new NameValuePair("EnableSplittingOnNonKeyFrames", item.EnableSplittingOnNonKeyFrames.ToString().ToLower())); return list; } diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs index beb83b053..eeab99678 100644 --- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs +++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs @@ -38,6 +38,9 @@ namespace MediaBrowser.Model.Dlna [XmlAttribute("enableSubtitlesInManifest")] public bool EnableSubtitlesInManifest { get; set; } + [XmlAttribute("enableSplittingOnNonKeyFrames")] + public bool EnableSplittingOnNonKeyFrames { get; set; } + [XmlAttribute("maxAudioChannels")] public string MaxAudioChannels { get; set; } |