commit 4431cf68294cf504e55549672a85f328030b92c2
author Vignesh Venkatasubramanian <vigneshv@google.com> Thu Apr 20 13:17:20 2023 -0700
committer Vignesh Venkatasubramanian <vigneshvg@users.noreply.github.com> Fri Apr 21 15:02:18 2023 -0700
tree 1b60f9f78603db4b78bc00133eefed58edfb0719
parent 202ac7e82885824ccdc1d19ba4a04be69ab979ae

android_jni: Add a function to get version string

Returns the libavif version, codecs string and libyuv version (if
available).

GOOGLE_INTERNAL_CL: 525830047

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

diff --git a/android_jni/avifandroidjni/src/androidTest/java/org/aomedia/avif/android/AnimatedImageTest.java b/android_jni/avifandroidjni/src/androidTest/java/org/aomedia/avif/android/AnimatedImageTest.java
index 20e1c23..5c98eb2 100644
--- a/android_jni/avifandroidjni/src/androidTest/java/org/aomedia/avif/android/AnimatedImageTest.java
+++ b/android_jni/avifandroidjni/src/androidTest/java/org/aomedia/avif/android/AnimatedImageTest.java
@@ -131,9 +131,11 @@
   }
 
   @Test
-  public void testResultToString() throws IOException {
+  public void testUtilityFunctions() throws IOException {
     // Test the avifResult value whose value and string representations are least likely to change.
     assertThat(AvifDecoder.resultToString(AVIF_RESULT_OK)).isEqualTo("OK");
+    // Ensure that the version string starts with "libavif".
+    assertThat(AvifDecoder.versionString()).startsWith("libavif");
   }
 
   private ByteBuffer getBuffer() throws IOException {

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

diff --git a/android_jni/avifandroidjni/src/main/java/org/aomedia/avif/android/AvifDecoder.java b/android_jni/avifandroidjni/src/main/java/org/aomedia/avif/android/AvifDecoder.java
index 09caebf..773720a 100644
--- a/android_jni/avifandroidjni/src/main/java/org/aomedia/avif/android/AvifDecoder.java
+++ b/android_jni/avifandroidjni/src/main/java/org/aomedia/avif/android/AvifDecoder.java
@@ -245,6 +245,12 @@
    */
   public static native String resultToString(int result);
 
+  /**
+   * Returns a String that contains information about the libavif version, underlying codecs and
+   * libyuv version (if available).
+   */
+  public static native String versionString();
+
   private native long createDecoder(ByteBuffer encoded, int length, int threads);
 
   private native void destroyDecoder(long decoder);

android_jni/avifandroidjni/src/main/jni/libavif_jni.cc

diff --git a/android_jni/avifandroidjni/src/main/jni/libavif_jni.cc b/android_jni/avifandroidjni/src/main/jni/libavif_jni.cc
index bbbffc6..16bba1a 100644
--- a/android_jni/avifandroidjni/src/main/jni/libavif_jni.cc
+++ b/android_jni/avifandroidjni/src/main/jni/libavif_jni.cc
@@ -6,6 +6,7 @@
 #include <cpu-features.h>
 #include <jni.h>
 
+#include <cstdio>
 #include <memory>
 #include <new>
 
@@ -295,6 +296,16 @@
   return env->NewStringUTF(avifResultToString(static_cast<avifResult>(result)));
 }
 
+FUNC(jstring, versionString) {
+  char codec_versions[256];
+  avifCodecVersions(codec_versions);
+  char version_string[512];
+  snprintf(version_string, sizeof(version_string),
+           "libavif: %s. Codecs: %s. libyuv: %d.", avifVersion(),
+           codec_versions, avifLibYUVVersion());
+  return env->NewStringUTF(version_string);
+}
+
 FUNC(void, destroyDecoder, jlong jdecoder) {
   AvifDecoderWrapper* const decoder =
       reinterpret_cast<AvifDecoderWrapper*>(jdecoder);