aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Dlna/CodecProfile.cs11
-rw-r--r--MediaBrowser.Controller/Dlna/DeviceProfile.cs3
-rw-r--r--MediaBrowser.Controller/Dlna/TranscodingProfile.cs13
3 files changed, 25 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Dlna/CodecProfile.cs b/MediaBrowser.Controller/Dlna/CodecProfile.cs
index bff374298..a4592e654 100644
--- a/MediaBrowser.Controller/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Controller/Dlna/CodecProfile.cs
@@ -32,6 +32,12 @@ namespace MediaBrowser.Controller.Dlna
public ProfileConditionType Condition { get; set; }
public ProfileConditionValue Property { get; set; }
public string Value { get; set; }
+ public bool IsRequired { get; set; }
+
+ public ProfileCondition()
+ {
+ IsRequired = true;
+ }
}
public enum ProfileConditionType
@@ -46,11 +52,14 @@ namespace MediaBrowser.Controller.Dlna
{
AudioChannels,
AudioBitrate,
+ AudioProfile,
Filesize,
Width,
Height,
+ Has64BitOffsets,
VideoBitrate,
VideoFramerate,
- VideoLevel
+ VideoLevel,
+ VideoProfile
}
}
diff --git a/MediaBrowser.Controller/Dlna/DeviceProfile.cs b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
index 91be73bba..49568e7d4 100644
--- a/MediaBrowser.Controller/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
@@ -60,6 +60,9 @@ namespace MediaBrowser.Controller.Dlna
public int TimelineOffsetSeconds { get; set; }
+ public bool RequiresPlainVideoItems { get; set; }
+ public bool RequiresPlainFolders { get; set; }
+
public DeviceProfile()
{
DirectPlayProfiles = new DirectPlayProfile[] { };
diff --git a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
index 530a44b8c..1073f74aa 100644
--- a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
@@ -11,6 +11,10 @@ namespace MediaBrowser.Controller.Dlna
public string VideoCodec { get; set; }
public string AudioCodec { get; set; }
+ public bool EstimateContentLength { get; set; }
+
+ public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
+
public List<TranscodingSetting> Settings { get; set; }
public TranscodingProfile()
@@ -27,6 +31,13 @@ namespace MediaBrowser.Controller.Dlna
public enum TranscodingSettingType
{
- Profile
+ Profile = 0,
+ MaxAudioChannels = 1
+ }
+
+ public enum TranscodeSeekInfo
+ {
+ Auto = 0,
+ Bytes = 1
}
}