Explorar o código

safari image fix

Luke Pulverenti %!s(int64=10) %!d(string=hai) anos
pai
achega
b54b906c1a

+ 3 - 2
Emby.Drawing/ImageMagick/ImageMagickEncoder.cs

@@ -119,12 +119,13 @@ namespace Emby.Drawing.ImageMagick
         {
             var ext = Path.GetExtension(path);
 
-            return string.Equals(ext, ".png", StringComparison.OrdinalIgnoreCase);
+            return string.Equals(ext, ".png", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(ext, ".webp", StringComparison.OrdinalIgnoreCase);
         }
 
         public void EncodeImage(string inputPath, string outputPath, int width, int height, int quality, ImageProcessingOptions options)
         {
-            if (string.IsNullOrWhiteSpace(options.BackgroundColor) && !HasTransparency(inputPath))
+            if (string.IsNullOrWhiteSpace(options.BackgroundColor) || !HasTransparency(inputPath))
             {
                 using (var originalImage = new MagickWand(inputPath))
                 {

+ 4 - 2
MediaBrowser.Api/Images/ImageService.cs

@@ -659,8 +659,10 @@ namespace MediaBrowser.Api.Images
                 return ImageFormat.Png;
             }
 
-            if (string.Equals(Path.GetExtension(image.Path), ".jpg", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(Path.GetExtension(image.Path), ".jpeg", StringComparison.OrdinalIgnoreCase))
+            var extension = Path.GetExtension(image.Path);
+
+            if (string.Equals(extension, ".jpg", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(extension, ".jpeg", StringComparison.OrdinalIgnoreCase))
             {
                 return ImageFormat.Jpg;
             }

+ 1 - 1
MediaBrowser.Dlna/PlayTo/PlayToController.cs

@@ -771,7 +771,7 @@ namespace MediaBrowser.Dlna.PlayTo
                     if (newItem.StreamInfo.IsDirectStream && newPosition > 0)
                     {
                         // This is rather arbitrary, but give the player time to start playing
-                        await Task.Delay(2000).ConfigureAwait(false);
+                        await Task.Delay(5000).ConfigureAwait(false);
 
                         await _device.Seek(TimeSpan.FromTicks(newPosition)).ConfigureAwait(false);
                     }