aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Dlna/StreamInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model/Dlna/StreamInfo.cs')
-rw-r--r--MediaBrowser.Model/Dlna/StreamInfo.cs20
1 files changed, 8 insertions, 12 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index ba5251e8c..d70d89cf7 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.Model.Dlna
AudioCodecs = new string[] { };
VideoCodecs = new string[] { };
SubtitleCodecs = new string[] { };
+ TranscodeReasons = new List<TranscodeReason>();
}
public string ItemId { get; set; }
@@ -89,6 +90,7 @@ namespace MediaBrowser.Model.Dlna
public string PlaySessionId { get; set; }
public List<MediaSourceInfo> AllMediaSources { get; set; }
+ public List<TranscodeReason> TranscodeReasons { get; set; }
public string MediaSourceId
{
@@ -231,22 +233,11 @@ namespace MediaBrowser.Model.Dlna
list.Add(new NameValuePair("MaxWidth", item.MaxWidth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxWidth.Value) : string.Empty));
list.Add(new NameValuePair("MaxHeight", item.MaxHeight.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxHeight.Value) : string.Empty));
- var forceStartPosition = false;
long startPositionTicks = item.StartPositionTicks;
- //if (item.MediaSource.DateLiveStreamOpened.HasValue && startPositionTicks == 0)
- //{
- // var elapsed = DateTime.UtcNow - item.MediaSource.DateLiveStreamOpened.Value;
- // elapsed -= TimeSpan.FromSeconds(20);
- // if (elapsed.TotalSeconds >= 0)
- // {
- // startPositionTicks = elapsed.Ticks + startPositionTicks;
- // forceStartPosition = true;
- // }
- //}
var isHls = StringHelper.EqualsIgnoreCase(item.SubProtocol, "hls");
- if (isHls && !forceStartPosition)
+ if (isHls)
{
list.Add(new NameValuePair("StartTimeTicks", string.Empty));
}
@@ -310,6 +301,11 @@ namespace MediaBrowser.Model.Dlna
list.Add(new NameValuePair("BreakOnNonKeyFrames", item.BreakOnNonKeyFrames.ToString()));
}
+ if (isDlna || !item.IsDirectStream)
+ {
+ list.Add(new NameValuePair("TranscodeReasons", string.Join(",", item.TranscodeReasons.Distinct().Select(i => i.ToString()).ToArray())));
+ }
+
return list;
}