Merge pull request square#1502 from square/jw/webp

Request WebP from Thumbor when OS supports it.
srkns · Oct 9, 2016 · a1ba906 · a1ba906
2 parents 303366b + 0115eca
commit a1ba906
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/picasso-pollexor/src/main/java/com/squareup/picasso/pollexor/PollexorRequestTransformer.java b/picasso-pollexor/src/main/java/com/squareup/picasso/pollexor/PollexorRequestTransformer.java
@@ -1,11 +1,14 @@
 package com.squareup.picasso.pollexor;
 
 import android.net.Uri;
+import android.os.Build;
 import com.squareup.picasso.Request;
 import com.squareup.pollexor.Thumbor;
 import com.squareup.pollexor.ThumborUrlBuilder;
+import com.squareup.pollexor.ThumborUrlBuilder.ImageFormat;
 
 import static com.squareup.picasso.Picasso.RequestTransformer;
+import static com.squareup.pollexor.ThumborUrlBuilder.format;
 
 /**
  * A {@link RequestTransformer} that changes requests to use {@link Thumbor} for some remote
@@ -64,6 +67,11 @@ public PollexorRequestTransformer(Thumbor thumbor) {
       newRequest.clearCenterInside();
     }
 
+    // If the Android version is modern enough use WebP for downloading.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      urlBuilder.filter(format(ImageFormat.WEBP));
+    }
+
     // Update the request with the completed Thumbor URL.
     newRequest.setUri(Uri.parse(urlBuilder.toUrl()));
 

diff --git a/...-pollexor/src/test/java/com/squareup/picasso/pollexor/PollexorRequestTransformerTest.java b/...-pollexor/src/test/java/com/squareup/picasso/pollexor/PollexorRequestTransformerTest.java
@@ -3,18 +3,21 @@
 import android.net.Uri;
 import com.squareup.picasso.Request;
 import com.squareup.pollexor.Thumbor;
+import com.squareup.pollexor.ThumborUrlBuilder;
+import com.squareup.pollexor.ThumborUrlBuilder.ImageFormat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
 import static com.squareup.picasso.Picasso.RequestTransformer;
+import static com.squareup.pollexor.ThumborUrlBuilder.format;
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.robolectric.annotation.Config.NONE;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(
-    sdk = 18,
+    sdk = 17,
     manifest = NONE,
     constants = BuildConfig.class
 )
@@ -55,6 +58,21 @@ public class PollexorRequestTransformerTest {
     assertThat(output.uri.toString()).isEqualTo(expected);
   }
 
+  @Config(sdk = 18)
+  @Test public void simpleResizeOnJbMr2UsesWebP() {
+    Request input = new Request.Builder(IMAGE_URI).resize(50, 50).build();
+    Request output = transformer.transformRequest(input);
+    assertThat(output).isNotSameAs(input);
+    assertThat(output.hasSize()).isFalse();
+
+    String expected = Thumbor.create(HOST)
+        .buildImage(IMAGE)
+        .resize(50, 50)
+        .filter(format(ImageFormat.WEBP))
+        .toUrl();
+    assertThat(output.uri.toString()).isEqualTo(expected);
+  }
+
   @Test public void simpleResizeWithCenterCrop() {
     Request input = new Request.Builder(IMAGE_URI).resize(50, 50).centerCrop().build();
     Request output = transformer.transformRequest(input);