From d1366a480115708b6ed6ca9671711ab79b619b47 Mon Sep 17 00:00:00 2001
From: Herman Chen <herman.chen@rock-chips.com>
Date: Wed, 12 May 2021 20:41:10 +0800
Subject: [PATCH] [mpp_mem_pool]: Move mpp_mem_pool to osal

Change-Id: I124f38bc58f791993515544af2c59169ee2c2402
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
---
 mpp/base/CMakeLists.txt                     | 1 -
 mpp/base/test/CMakeLists.txt                | 3 ---
 osal/CMakeLists.txt                         | 1 +
 {mpp/base => osal}/inc/mpp_mem_pool.h       | 0
 {mpp/base => osal}/mpp_mem_pool.cpp         | 0
 osal/test/CMakeLists.txt                    | 3 +++
 {mpp/base => osal}/test/mpp_mem_pool_test.c | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename {mpp/base => osal}/inc/mpp_mem_pool.h (100%)
 rename {mpp/base => osal}/mpp_mem_pool.cpp (100%)
 rename {mpp/base => osal}/test/mpp_mem_pool_test.c (100%)

diff --git a/mpp/base/CMakeLists.txt b/mpp/base/CMakeLists.txt
index f0fcf166..3c503256 100644
--- a/mpp/base/CMakeLists.txt
+++ b/mpp/base/CMakeLists.txt
@@ -18,7 +18,6 @@ add_library(mpp_base STATIC
     mpp_task.cpp
     mpp_meta.cpp
     mpp_trie.cpp
-    mpp_mem_pool.cpp
     mpp_bitwrite.c
     mpp_bitread.c
     mpp_bitput.c
diff --git a/mpp/base/test/CMakeLists.txt b/mpp/base/test/CMakeLists.txt
index 72049884..fa1061ee 100644
--- a/mpp/base/test/CMakeLists.txt
+++ b/mpp/base/test/CMakeLists.txt
@@ -28,9 +28,6 @@ add_mpp_base_test(mpp_buffer)
 # mpp_packet unit test
 add_mpp_base_test(mpp_packet)
 
-# mpp_mem_pool unit test
-add_mpp_base_test(mpp_mem_pool)
-
 # mpp_bitwriter unit test
 add_mpp_base_test(mpp_bit)
 
diff --git a/osal/CMakeLists.txt b/osal/CMakeLists.txt
index 4d2dc36c..f4d48eca 100644
--- a/osal/CMakeLists.txt
+++ b/osal/CMakeLists.txt
@@ -36,6 +36,7 @@ add_library(osal STATIC
     mpp_platform.cpp
     mpp_runtime.cpp
     mpp_allocator.cpp
+    mpp_mem_pool.cpp
     mpp_eventfd.cpp
     mpp_thread.cpp
     mpp_common.cpp
diff --git a/mpp/base/inc/mpp_mem_pool.h b/osal/inc/mpp_mem_pool.h
similarity index 100%
rename from mpp/base/inc/mpp_mem_pool.h
rename to osal/inc/mpp_mem_pool.h
diff --git a/mpp/base/mpp_mem_pool.cpp b/osal/mpp_mem_pool.cpp
similarity index 100%
rename from mpp/base/mpp_mem_pool.cpp
rename to osal/mpp_mem_pool.cpp
diff --git a/osal/test/CMakeLists.txt b/osal/test/CMakeLists.txt
index e58bece3..cf397303 100644
--- a/osal/test/CMakeLists.txt
+++ b/osal/test/CMakeLists.txt
@@ -28,6 +28,9 @@ add_mpp_osal_test(mpp_env)
 # malloc system unit test
 add_mpp_osal_test(mpp_mem)
 
+# mpp_mem_pool unit test
+add_mpp_osal_test(mpp_mem_pool)
+
 # time system unit test
 add_mpp_osal_test(mpp_time)
 
diff --git a/mpp/base/test/mpp_mem_pool_test.c b/osal/test/mpp_mem_pool_test.c
similarity index 100%
rename from mpp/base/test/mpp_mem_pool_test.c
rename to osal/test/mpp_mem_pool_test.c