support for luma nad ivluma matte mode

airbnb · Jun 4, 2024 · d43a2e2 · d43a2e2
1 parent d863d92
commit d43a2e2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java
@@ -121,12 +121,16 @@ static BaseLayer forModel(
     this.lottieDrawable = lottieDrawable;
     this.layerModel = layerModel;
     drawTraceName = layerModel.getName() + "#draw";
-    if (layerModel.getMatteType() == Layer.MatteType.INVERT) {
+    if (layerModel.getMatteType() == Layer.MatteType.INVERT || layerModel.getMatteType() == Layer.MatteType.LUMA_INVERTED) {
       mattePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
     } else {
       mattePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
     }
 
+    if (layerModel.getMatteType() == Layer.MatteType.LUMA || layerModel.getMatteType() == Layer.MatteType.LUMA_INVERTED){
+      mattePaint.setColorFilter(Utils.getLumaColorFilter());
+    }
+
     this.transform = layerModel.getTransform().createAnimation();
     transform.addListener(this);
 
@@ -449,7 +453,7 @@ private void intersectBoundsWithMatte(RectF rect, Matrix matrix) {
       return;
     }
 
-    if (layerModel.getMatteType() == Layer.MatteType.INVERT) {
+    if (layerModel.getMatteType() == Layer.MatteType.INVERT || layerModel.getMatteType() == Layer.MatteType.LUMA_INVERTED) {
       // We can't trim the bounds if the mask is inverted since it extends all the way to the
       // composition bounds.
       return;

diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
@@ -70,6 +70,8 @@ public CompositionLayer(LottieDrawable lottieDrawable, Layer layerModel, List<La
         switch (lm.getMatteType()) {
           case ADD:
           case INVERT:
+          case LUMA:
+          case LUMA_INVERTED:
             mattedLayer = layer;
             break;
         }

diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/LayerParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/LayerParser.java
@@ -151,14 +151,6 @@ public static Layer parse(JsonReader reader, LottieComposition composition) thro
             break;
           }
           matteType = Layer.MatteType.values()[matteTypeIndex];
-          switch (matteType) {
-            case LUMA:
-              composition.addWarning("Unsupported matte type: Luma");
-              break;
-            case LUMA_INVERTED:
-              composition.addWarning("Unsupported matte type: Luma Inverted");
-              break;
-          }
           composition.incrementMatteOrMaskCount(1);
           break;
         case 10:

diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java b/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
@@ -5,6 +5,8 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
@@ -67,6 +69,15 @@ protected float[] initialValue() {
 
   private static final float INV_SQRT_2 = (float) (Math.sqrt(2) / 2.0);
 
+  private static final ColorFilter lumaColorFilter = new ColorMatrixColorFilter(
+      new float[]{
+          0f, 0f, 0f, 0f, 0f,
+          0f, 0f, 0f, 0f, 0f,
+          0f, 0f, 0f, 0f, 0f,
+          0.2126f, 0.7152f, 0.0722f, 0f, 0f
+      }
+  );
+
   private Utils() {
   }
 
@@ -331,4 +342,8 @@ public static Bitmap renderPath(Path path) {
     canvas.drawPath(path, paint);
     return bitmap;
   }
+
+  public static ColorFilter getLumaColorFilter() {
+    return lumaColorFilter;
+  }
 }