pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dlna fixes

This commit is contained in:
Luke Pulverenti 2016-03-01 11:17:03 -05:00
parent 9d20e298e1
commit aa66c1defe
28 changed files with 59 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Dlna/PlayTo/PlayToManager.cs
View File

@ -85,8 +85,6 @@ namespace MediaBrowser.Dlna.PlayTo
try
{
var uri = new Uri(location);
lock (_nonRendererUrls)
{
if ((DateTime.UtcNow - _lastRendererClear).TotalMinutes >= 10)
@ -101,6 +99,7 @@ namespace MediaBrowser.Dlna.PlayTo
}
}
var uri = new Uri(location);
var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger).ConfigureAwait(false);
if (device.RendererCommands == null)

4
MediaBrowser.Dlna/Profiles/DefaultProfile.cs
View File

@ -31,8 +31,8 @@ namespace MediaBrowser.Dlna.Profiles
MaxIconWidth = 48;
MaxIconHeight = 48;
MaxStreamingBitrate = 10000000;
MaxStaticBitrate = 10000000;
MaxStreamingBitrate = 12000000;
MaxStaticBitrate = 12000000;
MusicStreamingTranscodingBitrate = 128000;
MusicSyncBitrate = 128000;

4
MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Default.xml
View File

@ -17,8 +17,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
View File

@ -22,8 +22,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
View File

@ -21,8 +21,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml
View File

@ -17,8 +17,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

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

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

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

@ -25,8 +25,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Vlc.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
View File

@ -24,8 +24,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

4
MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
View File

@ -23,8 +23,8 @@
<MaxAlbumArtHeight>480</MaxAlbumArtHeight>
<MaxIconWidth>48</MaxIconWidth>
<MaxIconHeight>48</MaxIconHeight>
<MaxStreamingBitrate>10000000</MaxStreamingBitrate>
<MaxStaticBitrate>10000000</MaxStaticBitrate>
<MaxStreamingBitrate>12000000</MaxStreamingBitrate>
<MaxStaticBitrate>12000000</MaxStaticBitrate>
<MusicStreamingTranscodingBitrate>128000</MusicStreamingTranscodingBitrate>
<MusicSyncBitrate>128000</MusicSyncBitrate>
<XDlnaDoc>DMS-1.50</XDlnaDoc>

28
MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
View File

@ -132,11 +132,6 @@ namespace MediaBrowser.Dlna.Ssdp
internal bool IgnoreMessage(SsdpMessageEventArgs args, bool isMulticast)
{
if (!isMulticast)
{
return false;
}
string usn;
if (args.Headers.TryGetValue("USN", out usn))
{
@ -243,7 +238,7 @@ namespace MediaBrowser.Dlna.Ssdp
{
if (i > 0)
{
await Task.Delay(200).ConfigureAwait(false);
await Task.Delay(500).ConfigureAwait(false);
}
var dgram = new Datagram(endpoint, localAddress, _logger, msg, isBroadcast, enableDebugLogging);
@ -308,17 +303,9 @@ namespace MediaBrowser.Dlna.Ssdp
var msg = new SsdpMessageBuilder().BuildMessage(header, values);
var ipEndPoint = endpoint as IPEndPoint;
if (ipEndPoint != null)
{
SendUnicastRequest(msg, ipEndPoint);
}
else
{
SendDatagram(msg, endpoint, null, false, 2);
SendDatagram(msg, endpoint, new IPEndPoint(d.Address, 0), false, 2);
//SendDatagram(header, values, endpoint, null, true);
}
SendDatagram(msg, endpoint, null, false, 2);
SendDatagram(msg, endpoint, new IPEndPoint(d.Address, 0), false, 2);
//SendDatagram(header, values, endpoint, null, true);
if (enableDebugLogging)
{
@ -481,7 +468,6 @@ namespace MediaBrowser.Dlna.Ssdp
values["NTS"] = "ssdp:" + type;
values["NT"] = dev.Type;
values["USN"] = dev.USN;
values["X-EMBY-SERVERID"] = _appHost.SystemId;
if (logMessage)
{
@ -490,7 +476,7 @@ namespace MediaBrowser.Dlna.Ssdp
var msg = new SsdpMessageBuilder().BuildMessage(header, values);
SendDatagram(msg, _ssdpEndp, new IPEndPoint(dev.Address, 0), true);
SendDatagram(msg, _ssdpEndp, new IPEndPoint(dev.Address, 0), true, 1);
//SendUnicastRequest(msg, 1);
}
@ -612,8 +598,6 @@ namespace MediaBrowser.Dlna.Ssdp
return;
}
_logger.Debug("Sending unicast search request");
var ipSsdp = IPAddress.Parse(SSDPAddr);
var ipTxEnd = new IPEndPoint(ipSsdp, SSDPPort);
@ -627,7 +611,7 @@ namespace MediaBrowser.Dlna.Ssdp
return;
}
_logger.Debug("Sending unicast search request");
//_logger.Debug("Sending unicast request");
byte[] req = Encoding.ASCII.GetBytes(request);