commit 8d44940fbdb4712203a4fdff2ec2f1c29547743a
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 28 04:41:08 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 28 04:41:08 2021 +0000
tree b8a71c27cac14e2d967a63eca637c9a88d44cc63
parent 72ee60dc26101c41df94d2ee6754d31ff5e980cd
parent a6ccc1881c266cb9486b1dc4ae1233d6b63107ad

Merge "Codec2: Add sys-prop to allow dmabuf heap usage to be forced" am: a6ccc1881c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1544967

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If52bf31787eee09b67ea71eeea0fed5be74a3c61

media/codec2/vndk/C2Store.cpp

diff --git a/media/codec2/vndk/C2Store.cpp b/media/codec2/vndk/C2Store.cpp
index dee3bf6..74ef9ea 100644
--- a/media/codec2/vndk/C2Store.cpp
+++ b/media/codec2/vndk/C2Store.cpp
@@ -102,16 +102,30 @@
 }
 
 static bool using_ion(void) {
-    static int cached_result = -1;
-
-    if (cached_result == -1) {
+    static int cached_result = []()->int {
         struct stat buffer;
-        cached_result = (stat("/dev/ion", &buffer) == 0);
-        if (cached_result)
+        int ret = (stat("/dev/ion", &buffer) == 0);
+
+        if (property_get_int32("debug.c2.use_dmabufheaps", 0)) {
+            /*
+             * Double check that the system heap is present so we
+             * can gracefully fail back to ION if we cannot satisfy
+             * the override
+             */
+            ret = (stat("/dev/dma_heap/system", &buffer) != 0);
+            if (ret)
+                ALOGE("debug.c2.use_dmabufheaps set, but no system heap. Ignoring override!");
+            else
+                ALOGD("debug.c2.use_dmabufheaps set, forcing DMABUF Heaps");
+        }
+
+        if (ret)
             ALOGD("Using ION\n");
         else
             ALOGD("Using DMABUF Heaps\n");
-    }
+        return ret;
+    }();
+
     return (cached_result == 1);
 }