From 77d52cf02f4a6f9b76f7ec7e6863f7231c375533 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 18 Nov 2017 22:30:42 -0500 Subject: [PATCH 1/3] revert back to skiasharp 1.58.1 --- Emby.Drawing.Skia/Emby.Drawing.Skia.csproj | 4 ++-- Emby.Drawing.Skia/packages.config | 2 +- MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 4 ++-- MediaBrowser.Server.Mono/packages.config | 2 +- .../MediaBrowser.ServerApplication.csproj | 8 ++++---- MediaBrowser.ServerApplication/packages.config | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj index 6024c3d2c0..f2b32d52cb 100644 --- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj +++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj @@ -63,8 +63,8 @@ - - ..\packages\SkiaSharp.1.59.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll + + ..\packages\SkiaSharp.1.58.1\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll diff --git a/Emby.Drawing.Skia/packages.config b/Emby.Drawing.Skia/packages.config index 1aa3653cd7..2b9b0aee43 100644 --- a/Emby.Drawing.Skia/packages.config +++ b/Emby.Drawing.Skia/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index a9e5d3ca57..dfd0714471 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -61,8 +61,8 @@ ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll - - ..\packages\SkiaSharp.1.59.2\lib\net45\SkiaSharp.dll + + ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll ..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index 4f2324c21b..e7aec97b6c 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 33f858b004..f479db46fb 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -83,8 +83,8 @@ ..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll - - ..\packages\SkiaSharp.1.59.2\lib\net45\SkiaSharp.dll + + ..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll ..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll @@ -161,11 +161,11 @@ - + x64\libSkiaSharp.dll PreserveNewest - + x86\libSkiaSharp.dll PreserveNewest diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 805c7af62e..e40a3ab15c 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -3,7 +3,7 @@ - + \ No newline at end of file From 61dcc42e80dee7d9254d97d50a38360203d1da7b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 18 Nov 2017 23:55:54 -0500 Subject: [PATCH 2/3] 3.2.36.13 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SharedVersion.cs b/SharedVersion.cs index 070f8b1755..06de2108b4 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.36.12")] +[assembly: AssemblyVersion("3.2.36.13")] From 43cb11f694210de6e2666665a3d9c7f33a6eacd3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 18 Nov 2017 23:59:34 -0500 Subject: [PATCH 3/3] update shared stream support --- .../LiveTv/TunerHosts/SharedHttpStream.cs | 11 +++++++---- MediaBrowser.Model/Dlna/StreamBuilder.cs | 10 +++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs index a3bfff7c17..fc9244f6a5 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs @@ -65,10 +65,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts var requiresRemux = false; var contentType = response.ContentType ?? string.Empty; - if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 || - contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1 || - contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 || - contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1) + if (contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1) + { + extension = "mkv"; + } + else if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 || + contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 || + contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1) { requiresRemux = true; } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index b80a2baa9f..37d266ac09 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1335,19 +1335,15 @@ namespace MediaBrowser.Model.Dlna return true; } - if (!maxBitrate.HasValue) - { - _logger.Info("Cannot " + playMethod + " due to unknown supported bitrate"); - return false; - } + var requestedMaxBitrate = maxBitrate ?? 1000000; // If we don't know the bitrate, then force a transcode if requested max bitrate is under 40 mbps var itemBitrate = item.Bitrate ?? 40000000; - if (itemBitrate > maxBitrate.Value) + if (itemBitrate > requestedMaxBitrate) { - _logger.Info("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", item.Bitrate.Value.ToString(CultureInfo.InvariantCulture), maxBitrate.Value.ToString(CultureInfo.InvariantCulture)); + _logger.Info("Bitrate exceeds " + playMethod + " limit: media bitrate: {0}, max bitrate: {1}", item.Bitrate.Value.ToString(CultureInfo.InvariantCulture), requestedMaxBitrate.ToString(CultureInfo.InvariantCulture)); return false; }