commit 5afc3be663945335cb9c1c66dc79274d96f8955a
author Hridya Valsaraju <hridya@google.com> Thu Mar 11 16:32:32 2021 -0800
committer Wonsik Kim <wonsik@google.com> Fri Mar 12 02:11:29 2021 +0000
tree 60a1d95b190947ad82e289bceb5f5bd0601ee690
parent 96de95d9119bf8c23710d07878db30b2c036ff66

C2BufferTest: Get linear allocator as per device's capability

C2BufferTest must choose the correct linear allocator depending on the
whether the device supports ION on DMA-BUF heaps.

Test: atest C2BufferTest with and without CONFIG_ION enabled
Bug: 182117764
Change-Id: I9831487bf3eed7e6d5e512c5dd40eb0fe5efbbfb

media/codec2/tests/vndk/C2BufferTest.cpp

diff --git a/media/codec2/tests/vndk/C2BufferTest.cpp b/media/codec2/tests/vndk/C2BufferTest.cpp
index a9f8e17..0cfb465 100644
--- a/media/codec2/tests/vndk/C2BufferTest.cpp
+++ b/media/codec2/tests/vndk/C2BufferTest.cpp
@@ -16,11 +16,12 @@
 
 #include <gtest/gtest.h>
 
-#include <C2AllocatorIon.h>
 #include <C2AllocatorGralloc.h>
 #include <C2Buffer.h>
 #include <C2BufferPriv.h>
+#include <C2Config.h>
 #include <C2ParamDef.h>
+#include <C2PlatformSupport.h>
 
 #include <system/graphics.h>
 
@@ -233,10 +234,10 @@
 public:
     C2BufferTest()
         : mBlockPoolId(C2BlockPool::PLATFORM_START),
-          mLinearAllocator(std::make_shared<C2AllocatorIon>('i')),
           mSize(0u),
           mAddr(nullptr),
           mGraphicAllocator(std::make_shared<C2AllocatorGralloc>('g')) {
+        getLinearAllocator(&mLinearAllocator);
     }
 
     ~C2BufferTest() = default;
@@ -329,6 +330,11 @@
     }
 
 private:
+    void getLinearAllocator(std::shared_ptr<C2Allocator>* mLinearAllocator) {
+        std::shared_ptr<C2AllocatorStore> store = android::GetCodec2PlatformAllocatorStore();
+        ASSERT_EQ(store->fetchAllocator(C2AllocatorStore::DEFAULT_LINEAR, mLinearAllocator), C2_OK);
+    }
+
     C2BlockPool::local_id_t mBlockPoolId;
     std::shared_ptr<C2Allocator> mLinearAllocator;
     std::shared_ptr<C2LinearAllocation> mLinearAllocation;