Hardware Buffer対応

android_jni/README.md

@@ -39,6 +39,9 @@ $ ./dav1d_android.sh "${ANDROID_NDK_HOME}"
 $ cd ..
 ```
 
+The Android dav1d build is configured with `-Dbitdepths=8` (8-bit AV1 only). Re-run the
+script after changing this option so that all ABIs are rebuilt.
+
 If you want to use libgav1 instead:
 
 ```

android_jni/avifandroidjni/src/androidTest/java/org/aomedia/avif/android/AvifDecoderTest.java

@@ -5,6 +5,9 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
+import android.graphics.ColorSpace;
+import android.hardware.HardwareBuffer;
+import android.os.Build;
 import androidx.test.platform.app.InstrumentationRegistry;
 import java.io.IOException;
 import java.io.InputStream;
@@ -256,6 +259,74 @@ public void testDecodeRegularClass() throws IOException {
     decoder.release();
   }
 
+  @Test
+  public void testDecodeToHardwareBuffer() throws IOException {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+      return;
+    }
+    if (image.isAnimated || config != Config.ARGB_8888) {
+      return;
+    }
+    ByteBuffer buffer = image.getBuffer();
+    assertThat(buffer).isNotNull();
+    Info info = new Info();
+    assertThat(AvifDecoder.getInfo(buffer, buffer.remaining(), info)).isTrue();
+
+    HardwareBuffer hardwareBuffer =
+        AvifDecoder.decodeToHardwareBuffer(buffer, buffer.remaining(), image.threads);
+    assertThat(hardwareBuffer).isNotNull();
+    assertThat(hardwareBuffer.getWidth()).isEqualTo(info.width);
+    assertThat(hardwareBuffer.getHeight()).isEqualTo(info.height);
+    assertThat(hardwareBuffer.getFormat()).isEqualTo(HardwareBuffer.RGBA_8888);
+    hardwareBuffer.close();
+
+    for (float scaleFactor : SCALE_FACTORS) {
+      int targetWidth = (int) (info.width * scaleFactor);
+      int targetHeight = (int) (info.height * scaleFactor);
+      hardwareBuffer =
+          AvifDecoder.decodeToHardwareBuffer(
+              buffer, buffer.remaining(), targetWidth, targetHeight, image.threads);
+      assertThat(hardwareBuffer).isNotNull();
+      assertThat(hardwareBuffer.getWidth()).isEqualTo(targetWidth);
+      assertThat(hardwareBuffer.getHeight()).isEqualTo(targetHeight);
+      Bitmap hardwareBitmap =
+          Bitmap.wrapHardwareBuffer(hardwareBuffer, ColorSpace.get(ColorSpace.Named.SRGB));
+      assertThat(hardwareBitmap).isNotNull();
+      assertThat(hardwareBitmap.getWidth()).isEqualTo(targetWidth);
+      assertThat(hardwareBitmap.getHeight()).isEqualTo(targetHeight);
+      hardwareBitmap.recycle();
+      hardwareBuffer.close();
+    }
+  }
+
+  @Test
+  public void testDecodeToHardwareBufferRegularClass() throws IOException {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+      return;
+    }
+    if (config != Config.ARGB_8888) {
+      return;
+    }
+    ByteBuffer buffer = image.getBuffer();
+    assertThat(buffer).isNotNull();
+    AvifDecoder decoder = AvifDecoder.create(buffer, image.threads);
+    assertThat(decoder).isNotNull();
+    for (int i = 0; i < image.frameCount; ++i) {
+      assertThat(decoder.nextFrameIndex()).isEqualTo(i);
+      HardwareBuffer hardwareBuffer = decoder.nextFrameHardwareBuffer();
+      assertThat(hardwareBuffer).isNotNull();
+      assertThat(hardwareBuffer.getWidth()).isEqualTo(image.width);
+      assertThat(hardwareBuffer.getHeight()).isEqualTo(image.height);
+      hardwareBuffer.close();
+    }
+    if (image.isAnimated) {
+      HardwareBuffer hardwareBuffer = decoder.nthFrameHardwareBuffer(0);
+      assertThat(hardwareBuffer).isNotNull();
+      hardwareBuffer.close();
+    }
+    decoder.release();
+  }
+
   @Test
   public void testUtilityFunctions() throws IOException {
     // Test the avifResult value whose value and string representations are least likely to change.

android_jni/avifandroidjni/src/main/java/org/aomedia/avif/android/AvifDecoder.java

@@ -4,7 +4,9 @@
 package org.aomedia.avif.android;
 
 import android.graphics.Bitmap;
+import android.hardware.HardwareBuffer;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import java.nio.ByteBuffer;
 
 /**
@@ -16,8 +18,9 @@
  *
  * <p>This class can be accessed statically without instantiating an object. This is useful to
  * simply sniff and decode still AVIF images without having to maintain any decoder state. The
- * following are the methods that can be accessed this way: {@link isAvifImage}, {@link getInfo} and
- * {@link decode}. The {@link Info} inner class is used only in this case.
+ * following are the methods that can be accessed this way: {@link isAvifImage}, {@link getInfo},
+ * {@link decode} and {@link decodeToHardwareBuffer}. The {@link Info} inner class is used only in
+ * this case.
  *
  * <p>2) As an instantiated regular class.
  *
@@ -118,6 +121,44 @@ public static boolean decode(ByteBuffer encoded, int length, Bitmap bitmap) {
    */
   public static native boolean decode(ByteBuffer encoded, int length, Bitmap bitmap, int threads);
 
+  /**
+   * Decodes the AVIF image into an {@link HardwareBuffer} with RGBA_8888 pixels.
+   *
+   * <p>The returned buffer can be wrapped as a hardware {@link Bitmap} via {@link
+   * Bitmap#wrapHardwareBuffer(HardwareBuffer, android.graphics.ColorSpace)} on API 29+. Callers on
+   * older API levels must not use this method.
+   *
+   * <p>If {@code targetWidth} and {@code targetHeight} are both positive, the decoded image is
+   * scaled to those dimensions before RGB conversion. Otherwise the cropped image dimensions are
+   * used.
+   *
+   * @param encoded The encoded AVIF image. encoded.position() must be 0.
+   * @param length Length of the encoded buffer.
+   * @param targetWidth Desired output width, or 0 to use the image width.
+   * @param targetHeight Desired output height, or 0 to use the image height.
+   * @param threads Number of threads to be used for the AVIF decode.
+   * @return a HardwareBuffer on success, or null on failure.
+   */
+  @RequiresApi(29)
+  public static HardwareBuffer decodeToHardwareBuffer(
+      ByteBuffer encoded, int length, int targetWidth, int targetHeight, int threads) {
+    return decodeToHardwareBufferNative(encoded, length, targetWidth, targetHeight, threads);
+  }
+
+  /**
+   * Decodes the AVIF image into an {@link HardwareBuffer} at the cropped image dimensions.
+   *
+   * @see #decodeToHardwareBuffer(ByteBuffer, int, int, int, int)
+   */
+  @RequiresApi(29)
+  public static HardwareBuffer decodeToHardwareBuffer(
+      ByteBuffer encoded, int length, int threads) {
+    return decodeToHardwareBuffer(encoded, length, 0, 0, threads);
+  }
+
+  private static native HardwareBuffer decodeToHardwareBufferNative(
+      ByteBuffer encoded, int length, int targetWidth, int targetHeight, int threads);
+
   /** Get the width of the image. */
   public int getWidth() {
     return width;
@@ -208,6 +249,33 @@ public int nextFrame(Bitmap bitmap) {
 
   private native int nextFrame(long decoder, Bitmap bitmap);
 
+  /**
+   * Decodes the next frame of the animated AVIF into an {@link HardwareBuffer}.
+   *
+   * @param targetWidth Desired output width, or 0 to use the image width.
+   * @param targetHeight Desired output height, or 0 to use the image height.
+   * @return a HardwareBuffer on success, or null on failure.
+   * @see #decodeToHardwareBuffer(ByteBuffer, int, int, int, int)
+   */
+  @RequiresApi(29)
+  @Nullable
+  public HardwareBuffer nextFrameHardwareBuffer(int targetWidth, int targetHeight) {
+    return nextFrameHardwareBuffer(decoder, targetWidth, targetHeight);
+  }
+
+  /**
+   * Decodes the next frame of the animated AVIF into an {@link HardwareBuffer} at the cropped
+   * image dimensions.
+   */
+  @RequiresApi(29)
+  @Nullable
+  public HardwareBuffer nextFrameHardwareBuffer() {
+    return nextFrameHardwareBuffer(decoder, 0, 0);
+  }
+
+  private native HardwareBuffer nextFrameHardwareBuffer(
+      long decoder, int targetWidth, int targetHeight);
+
   /**
    * Get the 0-based index of the frame that will be returned by the next call to {@link nextFrame}.
    * If the returned value is same as {@link getFrameCount}, then the next call to {@link nextFrame}
@@ -238,6 +306,34 @@ public int nthFrame(int n, Bitmap bitmap) {
 
   private native int nthFrame(long decoder, int n, Bitmap bitmap);
 
+  /**
+   * Decodes the nth frame of the animated AVIF into an {@link HardwareBuffer}.
+   *
+   * @param n The zero-based index of the frame to be decoded.
+   * @param targetWidth Desired output width, or 0 to use the image width.
+   * @param targetHeight Desired output height, or 0 to use the image height.
+   * @return a HardwareBuffer on success, or null on failure.
+   * @see #decodeToHardwareBuffer(ByteBuffer, int, int, int, int)
+   */
+  @RequiresApi(29)
+  @Nullable
+  public HardwareBuffer nthFrameHardwareBuffer(int n, int targetWidth, int targetHeight) {
+    return nthFrameHardwareBuffer(decoder, n, targetWidth, targetHeight);
+  }
+
+  /**
+   * Decodes the nth frame of the animated AVIF into an {@link HardwareBuffer} at the cropped
+   * image dimensions.
+   */
+  @RequiresApi(29)
+  @Nullable
+  public HardwareBuffer nthFrameHardwareBuffer(int n) {
+    return nthFrameHardwareBuffer(decoder, n, 0, 0);
+  }
+
+  private native HardwareBuffer nthFrameHardwareBuffer(
+      long decoder, int n, int targetWidth, int targetHeight);
+
   /**
    * Returns a String describing an avifResult enum value.
    *

android_jni/avifandroidjni/src/main/jni/CMakeLists.txt

@@ -44,4 +44,4 @@ include_directories(${CPU_FEATURES_DIR})
 add_library(cpufeatures STATIC "${CPU_FEATURES_DIR}/cpu-features.c")
 
 target_link_options(avif_android PRIVATE "-Wl,-z,max-page-size=16384")
-target_link_libraries(avif_android jnigraphics avif log cpufeatures)
+target_link_libraries(avif_android jnigraphics nativewindow avif log cpufeatures)