update image encoding

1 files changed, 14 insertions, 3 deletions

diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 5562a93f0..957d73c2d 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -698,10 +698,21 @@ namespace MediaBrowser.Api.Images
 
             var userAgent = Request.UserAgent ?? string.Empty;
 
-            if (userAgent.IndexOf("dalvik", StringComparison.OrdinalIgnoreCase) != -1 &&
-                userAgent.IndexOf("android", StringComparison.OrdinalIgnoreCase) != -1)
+            if (!supportsWebP)
             {
-                supportsWebP = true;
+                if (string.Equals(Request.QueryString["accept"], "webp", StringComparison.OrdinalIgnoreCase))
+                {
+                    supportsWebP = true;
+                }
+            }
+
+            if (!supportsWebP)
+            {
+                if (userAgent.IndexOf("crosswalk", StringComparison.OrdinalIgnoreCase) != -1 &&
+                    userAgent.IndexOf("android", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    supportsWebP = true;
+                }
             }
 
             if (supportsWebP)