commit 731e914f4945dc65e9d872f3303a6c21388fcf36
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Apr 21 17:20:39 2021 -0700
committer Lajos Molnar <lajos@google.com> Tue Jun 29 13:35:23 2021 -0700
tree ce5406cb720fdcaa51c66e92c8fcffa63e042ba0
parent b24894a1c9364bff006a34234e7ea7d1ea41e111

Codec2Buffer: Update 64bit check in asC2Buffer

In case of devices which support both 64bit and 32bit builds,
GraphicMetadataBuffer will return an error in 64bit builds only if
debug.stagefright.c2inputsurface is set to 0.

Bug: 169303746
Related-Bug: 178228919
Test: atest CtsMediaV2TestCases

Change-Id: I98a96bad02930947bee40e09ae4d42e684981421

media/codec2/sfplugin/Codec2Buffer.cpp

diff --git a/media/codec2/sfplugin/Codec2Buffer.cpp b/media/codec2/sfplugin/Codec2Buffer.cpp
index 34e6a88..691bab1 100644
--- a/media/codec2/sfplugin/Codec2Buffer.cpp
+++ b/media/codec2/sfplugin/Codec2Buffer.cpp
@@ -679,17 +679,20 @@
 std::shared_ptr<C2Buffer> GraphicMetadataBuffer::asC2Buffer() {
 #ifdef __LP64__
     static std::once_flag s_checkOnce;
-    static bool s_64bitonly {false};
+    static bool s_is64bitOk {true};
     std::call_once(s_checkOnce, [&](){
         const std::string abi32list =
         ::android::base::GetProperty("ro.product.cpu.abilist32", "");
-        if (abi32list.empty()) {
-            s_64bitonly = true;
+        if (!abi32list.empty()) {
+            int32_t inputSurfaceSetting =
+            ::android::base::GetIntProperty("debug.stagefright.c2inputsurface", int32_t(0));
+            s_is64bitOk = inputSurfaceSetting != 0;
         }
     });
 
-    if (!s_64bitonly) {
-        ALOGE("GraphicMetadataBuffer does not work in 32+64 system if compiled as 64-bit object");
+    if (!s_is64bitOk) {
+        ALOGE("GraphicMetadataBuffer does not work in 32+64 system if compiled as 64-bit object"\
+              "when debug.stagefright.c2inputsurface is set to 0");
         return nullptr;
     }
 #endif