commit c35577ee86001c1bc9253da590f948871006ffdb
author Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Mon Sep 11 08:47:33 2023 +0530
committer Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Thu Nov 02 05:25:59 2023 +0000
tree 404d7a818e9f264401c1408dd1deabb8d2767531
parent 0092cae047fa307eeed414624aca20a8adf06465

MetadataRetriever: Use RGBA_8888 as default color format based on a flag

When the flag mediametadataretriever_default_rgba8888 is set, use
RGBA_8888 as the color format in getFrameAtTime call.

Add the unit test to check the intended behaviour.

Test: adb shell setprop persist.device_config.aconfig_flags.\
media_solutions.com.android.media.playback.flags.\
mediametadataretriever_default_rgba8888 true
Test: adb shell device_config put media_solutions \
com.android.media.playback.flags.mediametadataretriever_default_rgba8888 \
true
Test: atest com.android.mediaframeworktest.unit.MediaMetadataRetrieverTest
Bug: 298965955

Change-Id: I8452e75e07bcfcd2483ad2da971806147f5a9067

media/jni/Android.bp

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index ed1072c..6031ef7 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -81,6 +81,7 @@
         "libhidlallocatorutils",
         "libhidlbase",
         "libsonivox",
+        "server_configurable_flags",
         "android.hardware.cas@1.0",
         "android.hardware.cas.native@1.0",
         "android.hardware.drm@1.3",
@@ -99,6 +100,7 @@
     static_libs: [
         "libgrallocusage",
         "libmedia_midiiowrapper",
+        "android.media.playback.flags-aconfig-cc",
     ],
 
     include_dirs: [

media/jni/android_media_MediaMetadataRetriever.cpp

diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp
index 1458758..2a10fa7 100644
--- a/media/jni/android_media_MediaMetadataRetriever.cpp
+++ b/media/jni/android_media_MediaMetadataRetriever.cpp
@@ -35,7 +35,9 @@
 #include "android_media_MediaDataSource.h"
 #include "android_media_Streams.h"
 #include "android_util_Binder.h"
+#include <com_android_media_playback_flags.h>
 
+namespace playback_flags = com::android::media::playback::flags;
 using namespace android;
 
 struct fields_t {
@@ -374,9 +376,12 @@
         jniThrowException(env, "java/lang/IllegalStateException", "No retriever available");
         return NULL;
     }
-    // For getFrameAtTime family of calls, default to ANDROID_BITMAP_FORMAT_RGB_565
-    // to keep the behavior consistent with older releases
-    AndroidBitmapFormat colorFormat = getColorFormat(env, params, ANDROID_BITMAP_FORMAT_RGB_565);
+
+    AndroidBitmapFormat defaultColorFormat =
+            playback_flags::mediametadataretriever_default_rgba8888()
+            ? ANDROID_BITMAP_FORMAT_RGBA_8888
+            : ANDROID_BITMAP_FORMAT_RGB_565;
+    AndroidBitmapFormat colorFormat = getColorFormat(env, params, defaultColorFormat);
 
     // Call native method to retrieve a video frame
     VideoFrame *videoFrame = NULL;

media/jni/playback_flags.aconfig

diff --git a/media/jni/playback_flags.aconfig b/media/jni/playback_flags.aconfig
new file mode 100644
index 0000000..2bb0ec5
--- /dev/null
+++ b/media/jni/playback_flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.media.playback.flags"
+
+flag {
+  name: "mediametadataretriever_default_rgba8888"
+  namespace: "media_solutions"
+  description: "Change MediaMetadataRetriever to use RGBA8888 for bitmap handling by default."
+  bug: "298965955"
+}