michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update sony dlna profiles

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-27 14:11:06 -04:00
parent d68e984120
commit 08d212c7a2
10 changed files with 55 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Dlna/DlnaManager.cs
View File

@ -206,7 +206,6 @@ namespace MediaBrowser.Dlna
throw new ArgumentNullException("headers"); throw new ArgumentNullException("headers");
} }
//_logger.Debug("GetProfile. Headers: " + _jsonSerializer.SerializeToString(headers));
// Convert to case insensitive // Convert to case insensitive
headers = new Dictionary<string, string>(headers, StringComparer.OrdinalIgnoreCase); headers = new Dictionary<string, string>(headers, StringComparer.OrdinalIgnoreCase);
@ -218,16 +217,12 @@ namespace MediaBrowser.Dlna
} }
else else
{ {
string userAgent = null; var msg = new StringBuilder();
headers.TryGetValue("User-Agent", out userAgent); foreach (var header in headers)
var msg = "No matching device profile via headers found. The default will be used. ";
if (!string.IsNullOrEmpty(userAgent))
{ {
msg += "User-agent: " + userAgent + ". "; msg.AppendLine(header.Key + ": " + header.Value);
} }
_logger.LogMultiline("No matching device profile found. The default will need to be used.", LogSeverity.Info, msg);
_logger.Debug(msg);
} }
return profile; return profile;

2
MediaBrowser.Dlna/PlayTo/PlayToController.cs
View File

@ -221,7 +221,7 @@ namespace MediaBrowser.Dlna.PlayTo
{ {
await _sessionManager.OnPlaybackStopped(new PlaybackStopInfo await _sessionManager.OnPlaybackStopped(new PlaybackStopInfo
{ {
ItemId = mediaInfo.Id, ItemId = streamInfo.ItemId,
SessionId = _session.Id, SessionId = _session.Id,
PositionTicks = positionTicks, PositionTicks = positionTicks,
MediaSourceId = streamInfo.MediaSourceId MediaSourceId = streamInfo.MediaSourceId

41
MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013.cs
View File

@ -12,8 +12,6 @@ namespace MediaBrowser.Dlna.Profiles
Identification = new DeviceIdentification Identification = new DeviceIdentification
{ {
FriendlyName = @"Blu-ray Disc Player",
Manufacturer = "Sony",
ModelNumber = "BDP-2013" ModelNumber = "BDP-2013"
}; };
@ -36,9 +34,9 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile new TranscodingProfile
{ {
Container = "ts", Container = "mkv",
VideoCodec = "h264", VideoCodec = "h264",
AudioCodec = "ac3", AudioCodec = "ac3,aac,mp3",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },
@ -53,21 +51,21 @@ namespace MediaBrowser.Dlna.Profiles
{ {
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "ts", Container = "ts,mpegts",
VideoCodec = "mpeg1video,mpeg2video,h264", VideoCodec = "mpeg1video,mpeg2video,h264",
AudioCodec = "ac3,aac,mp3,pcm", AudioCodec = "ac3,aac,mp3,pcm",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mpeg", Container = "mpeg,mpg",
VideoCodec = "mpeg1video,mpeg2video", VideoCodec = "mpeg1video,mpeg2video",
AudioCodec = "ac3,mp3,mp2,pcm", AudioCodec = "ac3,mp3,mp2,pcm",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mp4", Container = "mp4,m4v",
VideoCodec = "mpeg4,h264", VideoCodec = "mpeg4,h264",
AudioCodec = "ac3,aac,pcm,mp3", AudioCodec = "ac3,aac,pcm,mp3",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
@ -88,25 +86,24 @@ namespace MediaBrowser.Dlna.Profiles
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mp3", Container = "m2ts,mts",
AudioCodec = "mp3", VideoCodec = "h264,mpeg4,vc1",
AudioCodec = "aac,mp3,ac3,dca,dts",
Type = DlnaProfileType.Video
},
new DirectPlayProfile
{
Container = "wmv,asf",
Type = DlnaProfileType.Video
},
new DirectPlayProfile
{
Container = "mp3,m4a,wma,wav",
Type = DlnaProfileType.Audio Type = DlnaProfileType.Audio
}, },
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mp4", Container = "jpeg,png,gif",
AudioCodec = "aac",
Type = DlnaProfileType.Audio
},
new DirectPlayProfile
{
Container = "asf",
AudioCodec = "wmav2,wmapro,wmavoice",
Type = DlnaProfileType.Audio
},
new DirectPlayProfile
{
Container = "jpeg",
Type = DlnaProfileType.Photo Type = DlnaProfileType.Photo
} }
}; };

6
MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2014.cs
View File

@ -12,8 +12,6 @@ namespace MediaBrowser.Dlna.Profiles
Identification = new DeviceIdentification Identification = new DeviceIdentification
{ {
FriendlyName = @"Blu-ray Disc Player",
Manufacturer = "Sony",
ModelNumber = "BDP-2014" ModelNumber = "BDP-2014"
}; };
@ -36,9 +34,9 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile new TranscodingProfile
{ {
Container = "ts", Container = "mkv",
VideoCodec = "h264", VideoCodec = "h264",
AudioCodec = "ac3", AudioCodec = "ac3,aac,mp3",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },

6
MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2015.cs
View File

@ -12,8 +12,6 @@ namespace MediaBrowser.Dlna.Profiles
Identification = new DeviceIdentification Identification = new DeviceIdentification
{ {
FriendlyName = @"Blu-ray Disc Player",
Manufacturer = "Sony",
ModelNumber = "BDP-2015" ModelNumber = "BDP-2015"
}; };
@ -36,9 +34,9 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile new TranscodingProfile
{ {
Container = "ts", Container = "mkv",
VideoCodec = "h264", VideoCodec = "h264",
AudioCodec = "ac3", AudioCodec = "ac3,aac,mp3",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },

18
MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2016.cs
View File

@ -12,9 +12,17 @@ namespace MediaBrowser.Dlna.Profiles
Identification = new DeviceIdentification Identification = new DeviceIdentification
{ {
FriendlyName = @"Blu-ray Disc Player", ModelNumber = "BDP-2016",
Manufacturer = "Sony",
ModelNumber = "BDP-2016" Headers = new[]
{
new HttpHeaderInfo
{
Name = "X-AV-Physical-Unit-Info",
Value = "BDP-S3700",
Match = HeaderMatchType.Substring
}
}
}; };
AddXmlRootAttribute("xmlns:av", "urn:schemas-sony-com:av"); AddXmlRootAttribute("xmlns:av", "urn:schemas-sony-com:av");
@ -36,9 +44,9 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile new TranscodingProfile
{ {
Container = "ts", Container = "mkv",
VideoCodec = "h264", VideoCodec = "h264",
AudioCodec = "ac3", AudioCodec = "ac3,aac,mp3",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
}, },

18
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
View File

@ -2,9 +2,7 @@
<Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Name>Sony Blu-ray Player 2013</Name> <Name>Sony Blu-ray Player 2013</Name>
<Identification> <Identification>
<FriendlyName>Blu-ray Disc Player</FriendlyName>
<ModelNumber>BDP-2013</ModelNumber> <ModelNumber>BDP-2013</ModelNumber>
<Manufacturer>Sony</Manufacturer>
<Headers /> <Headers />
</Identification> </Identification>
<Manufacturer>Microsoft Corporation</Manufacturer> <Manufacturer>Microsoft Corporation</Manufacturer>
@ -37,19 +35,19 @@
<XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" /> <XmlAttribute name="xmlns:av" value="urn:schemas-sony-com:av" />
</XmlRootAttributes> </XmlRootAttributes>
<DirectPlayProfiles> <DirectPlayProfiles>
<DirectPlayProfile container="ts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" /> <DirectPlayProfile container="ts,mpegts" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg1video,mpeg2video,h264" type="Video" />
<DirectPlayProfile container="mpeg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" /> <DirectPlayProfile container="mpeg,mpg" audioCodec="ac3,mp3,mp2,pcm" videoCodec="mpeg1video,mpeg2video" type="Video" />
<DirectPlayProfile container="mp4" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" /> <DirectPlayProfile container="mp4,m4v" audioCodec="ac3,aac,pcm,mp3" videoCodec="mpeg4,h264" type="Video" />
<DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" /> <DirectPlayProfile container="avi" audioCodec="ac3,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
<DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" /> <DirectPlayProfile container="mkv" audioCodec="ac3,dca,aac,mp3,pcm" videoCodec="mpeg4,h264" type="Video" />
<DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" /> <DirectPlayProfile container="m2ts,mts" audioCodec="aac,mp3,ac3,dca,dts" videoCodec="h264,mpeg4,vc1" type="Video" />
<DirectPlayProfile container="mp4" audioCodec="aac" type="Audio" /> <DirectPlayProfile container="wmv,asf" type="Video" />
<DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" /> <DirectPlayProfile container="mp3,m4a,wma,wav" type="Audio" />
<DirectPlayProfile container="jpeg" type="Photo" /> <DirectPlayProfile container="jpeg,png,gif" type="Photo" />
</DirectPlayProfiles> </DirectPlayProfiles>
<TranscodingProfiles> <TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
</TranscodingProfiles> </TranscodingProfiles>
<ContainerProfiles> <ContainerProfiles>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2014.xml
View File

@ -2,9 +2,7 @@
<Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Name>Sony Blu-ray Player 2014</Name> <Name>Sony Blu-ray Player 2014</Name>
<Identification> <Identification>
<FriendlyName>Blu-ray Disc Player</FriendlyName>
<ModelNumber>BDP-2014</ModelNumber> <ModelNumber>BDP-2014</ModelNumber>
<Manufacturer>Sony</Manufacturer>
<Headers /> <Headers />
</Identification> </Identification>
<Manufacturer>Microsoft Corporation</Manufacturer> <Manufacturer>Microsoft Corporation</Manufacturer>
@ -49,7 +47,7 @@
</DirectPlayProfiles> </DirectPlayProfiles>
<TranscodingProfiles> <TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
</TranscodingProfiles> </TranscodingProfiles>
<ContainerProfiles> <ContainerProfiles>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2015.xml
View File

@ -2,9 +2,7 @@
<Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Name>Sony Blu-ray Player 2015</Name> <Name>Sony Blu-ray Player 2015</Name>
<Identification> <Identification>
<FriendlyName>Blu-ray Disc Player</FriendlyName>
<ModelNumber>BDP-2015</ModelNumber> <ModelNumber>BDP-2015</ModelNumber>
<Manufacturer>Sony</Manufacturer>
<Headers /> <Headers />
</Identification> </Identification>
<Manufacturer>Microsoft Corporation</Manufacturer> <Manufacturer>Microsoft Corporation</Manufacturer>
@ -49,7 +47,7 @@
</DirectPlayProfiles> </DirectPlayProfiles>
<TranscodingProfiles> <TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
</TranscodingProfiles> </TranscodingProfiles>
<ContainerProfiles> <ContainerProfiles>

8
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2016.xml
View File

@ -2,10 +2,10 @@
<Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <Profile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Name>Sony Blu-ray Player 2016</Name> <Name>Sony Blu-ray Player 2016</Name>
<Identification> <Identification>
<FriendlyName>Blu-ray Disc Player</FriendlyName>
<ModelNumber>BDP-2016</ModelNumber> <ModelNumber>BDP-2016</ModelNumber>
<Manufacturer>Sony</Manufacturer> <Headers>
<Headers /> <HttpHeaderInfo name="X-AV-Physical-Unit-Info" value="BDP-S3700" match="Substring" />
</Headers>
</Identification> </Identification>
<Manufacturer>Microsoft Corporation</Manufacturer> <Manufacturer>Microsoft Corporation</Manufacturer>
<ManufacturerUrl>http://emby.media/</ManufacturerUrl> <ManufacturerUrl>http://emby.media/</ManufacturerUrl>
@ -49,7 +49,7 @@
</DirectPlayProfiles> </DirectPlayProfiles>
<TranscodingProfiles> <TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mkv" type="Video" videoCodec="h264" audioCodec="ac3,aac,mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
<TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
</TranscodingProfiles> </TranscodingProfiles>
<ContainerProfiles> <ContainerProfiles>