update dlna profiles

pull/702/head
Luke Pulverenti 9 years ago
parent 3aa349fd1f
commit 66d2f25555

@ -1,5 +1,5 @@
using System.Xml.Serialization; using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dlna; using System.Xml.Serialization;
namespace MediaBrowser.Dlna.Profiles namespace MediaBrowser.Dlna.Profiles
{ {
@ -10,8 +10,6 @@ namespace MediaBrowser.Dlna.Profiles
{ {
Name = "BubbleUPnp"; Name = "BubbleUPnp";
TimelineOffsetSeconds = 5;
Identification = new DeviceIdentification Identification = new DeviceIdentification
{ {
ModelName = "BubbleUPnp", ModelName = "BubbleUPnp",
@ -27,16 +25,18 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile new TranscodingProfile
{ {
Container = "mp3", Container = "mp3",
Type = DlnaProfileType.Audio, AudioCodec = "mp3",
AudioCodec = "mp3" Type = DlnaProfileType.Audio
}, },
new TranscodingProfile new TranscodingProfile
{ {
Container = "ts", Container = "ts",
Type = DlnaProfileType.Video, Type = DlnaProfileType.Video,
VideoCodec = "h264", AudioCodec = "aac",
AudioCodec = "aac" VideoCodec = "h264"
}, },
new TranscodingProfile new TranscodingProfile
{ {
Container = "jpeg", Container = "jpeg",
@ -48,21 +48,20 @@ namespace MediaBrowser.Dlna.Profiles
{ {
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "avi,mpeg,mkv,ts,mp4,mov,m4v,asf,webm,ogg,ogv,iso", Container = "",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mp3,flac,asf,off,oga,aac", Container = "",
Type = DlnaProfileType.Audio Type = DlnaProfileType.Audio
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "",
Type = DlnaProfileType.Photo, Type = DlnaProfileType.Photo,
Container = "jpeg,png,gif,bmp,tiff"
} }
}; };
@ -71,6 +70,77 @@ namespace MediaBrowser.Dlna.Profiles
ContainerProfiles = new ContainerProfile[] { }; ContainerProfiles = new ContainerProfile[] { };
CodecProfiles = new CodecProfile[] { }; CodecProfiles = new CodecProfile[] { };
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ass",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ssa",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "smi",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "dvdsub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgs",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgssub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
}
};
} }
} }
} }

@ -1,5 +1,5 @@
using System.Xml.Serialization; using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dlna; using System.Xml.Serialization;
namespace MediaBrowser.Dlna.Profiles namespace MediaBrowser.Dlna.Profiles
{ {
@ -10,6 +10,7 @@ namespace MediaBrowser.Dlna.Profiles
{ {
Name = "Vlc"; Name = "Vlc";
TimelineOffsetSeconds = 5; TimelineOffsetSeconds = 5;
Identification = new DeviceIdentification Identification = new DeviceIdentification
@ -27,16 +28,18 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile new TranscodingProfile
{ {
Container = "mp3", Container = "mp3",
Type = DlnaProfileType.Audio, AudioCodec = "mp3",
AudioCodec = "mp3" Type = DlnaProfileType.Audio
}, },
new TranscodingProfile new TranscodingProfile
{ {
Container = "ts", Container = "ts",
Type = DlnaProfileType.Video, Type = DlnaProfileType.Video,
VideoCodec = "h264", AudioCodec = "aac",
AudioCodec = "aac" VideoCodec = "h264"
}, },
new TranscodingProfile new TranscodingProfile
{ {
Container = "jpeg", Container = "jpeg",
@ -48,21 +51,20 @@ namespace MediaBrowser.Dlna.Profiles
{ {
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "avi,mpeg,mkv,ts,mp4,mov,m4v,asf,webm,ogg,ogv,iso", Container = "",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mp3,flac,asf,off,oga,aac", Container = "",
Type = DlnaProfileType.Audio Type = DlnaProfileType.Audio
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "",
Type = DlnaProfileType.Photo, Type = DlnaProfileType.Photo,
Container = "jpeg,png,gif,bmp,tiff"
} }
}; };
@ -71,6 +73,77 @@ namespace MediaBrowser.Dlna.Profiles
ContainerProfiles = new ContainerProfile[] { }; ContainerProfiles = new ContainerProfile[] { };
CodecProfiles = new CodecProfile[] { }; CodecProfiles = new CodecProfile[] { };
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ass",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ssa",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "smi",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "dvdsub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgs",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgssub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
}
};
} }
} }
} }

File diff suppressed because one or more lines are too long

@ -35,9 +35,9 @@
<IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests> <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
<XmlRootAttributes /> <XmlRootAttributes />
<DirectPlayProfiles> <DirectPlayProfiles>
<DirectPlayProfile container="avi,mpeg,mkv,ts,mp4,mov,m4v,asf,webm,ogg,ogv,iso" type="Video" /> <DirectPlayProfile container="" type="Video" />
<DirectPlayProfile container="mp3,flac,asf,off,oga,aac" type="Audio" /> <DirectPlayProfile container="" type="Audio" />
<DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" /> <DirectPlayProfile container="" type="Photo" />
</DirectPlayProfiles> </DirectPlayProfiles>
<TranscodingProfiles> <TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" forceLiveStream="false" /> <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" forceLiveStream="false" />
@ -47,5 +47,16 @@
<ContainerProfiles /> <ContainerProfiles />
<CodecProfiles /> <CodecProfiles />
<ResponseProfiles /> <ResponseProfiles />
<SubtitleProfiles /> <SubtitleProfiles>
<SubtitleProfile format="srt" method="External" />
<SubtitleProfile format="sub" method="External" />
<SubtitleProfile format="srt" method="Embed" didlMode="" />
<SubtitleProfile format="ass" method="Embed" didlMode="" />
<SubtitleProfile format="ssa" method="Embed" didlMode="" />
<SubtitleProfile format="smi" method="Embed" didlMode="" />
<SubtitleProfile format="dvdsub" method="Embed" didlMode="" />
<SubtitleProfile format="pgs" method="Embed" didlMode="" />
<SubtitleProfile format="pgssub" method="Embed" didlMode="" />
<SubtitleProfile format="sub" method="Embed" didlMode="" />
</SubtitleProfiles>
</Profile> </Profile>
Loading…
Cancel
Save