diff options
28 files changed, 59 insertions, 76 deletions
diff --git a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs index 06697dee6..0328111c5 100644 --- a/MediaBrowser.Dlna/PlayTo/PlayToManager.cs +++ b/MediaBrowser.Dlna/PlayTo/PlayToManager.cs @@ -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) diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs index 37ce0ce67..09e10cecf 100644 --- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs +++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs @@ -31,8 +31,8 @@ namespace MediaBrowser.Dlna.Profiles MaxIconWidth = 48; MaxIconHeight = 48; - MaxStreamingBitrate = 10000000; - MaxStaticBitrate = 10000000; + MaxStreamingBitrate = 12000000; + MaxStaticBitrate = 12000000; MusicStreamingTranscodingBitrate = 128000; MusicSyncBitrate = 128000; diff --git a/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml b/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml index 5b8268f22..409fe95e8 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index 6f68f8bd6..ad378b01c 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index 24356b99a..ea0ea8143 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml index 782e0ae1b..7ce7668a1 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/DirecTV HD-DVR.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml index 309eb7261..49f0dde8c 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Dish Hopper-Joey.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml index f82f4aaf9..95aed7c1d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index d8f80de48..c7dbc62f9 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml index 58021a247..2f28f67a1 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/MediaMonkey.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index b3a5b9c3b..044e32eb4 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml index 635ccce07..10944c3ac 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Popcorn Hour.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index 6fbc5f913..4dd7db809 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml index 633c8a401..5dd426a51 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index 44d50a033..ac4ce57a0 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index c3592c320..1f2ebc86d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index f19c028fc..5dc86c32e 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index 8256750c8..b34828366 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index aa758e213..e94b0058b 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml index 6875e65b2..653702b4a 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2014).xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index 8de5bc79f..8f78626b2 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml index e94020a34..d4277d155 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 4.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml b/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml index ef732e531..433db1958 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Vlc.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml index 0bfca9fe1..0bbb3f2f1 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml index beabc4d0f..969bcb563 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index b68dce6db..8dbbf19e9 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -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> diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index e865c4558..b59ce5f2a 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -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> diff --git a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs index 1c705803c..e48471e34 100644 --- a/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs +++ b/MediaBrowser.Dlna/Ssdp/SsdpHandler.cs @@ -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); |