diff --git a/mpp/hal/common/CMakeLists.txt b/mpp/hal/common/CMakeLists.txt index 6a1f4cd6..1fcda94f 100644 --- a/mpp/hal/common/CMakeLists.txt +++ b/mpp/hal/common/CMakeLists.txt @@ -8,3 +8,4 @@ add_library(hal_common STATIC set_target_properties(hal_common PROPERTIES FOLDER "mpp/hal/common") add_subdirectory(h264) +add_subdirectory(h265) diff --git a/mpp/hal/common/h265/CMakeLists.txt b/mpp/hal/common/h265/CMakeLists.txt new file mode 100644 index 00000000..6e3e6c90 --- /dev/null +++ b/mpp/hal/common/h265/CMakeLists.txt @@ -0,0 +1,21 @@ +# vim: syntax=cmake +include_directories(.) +include_directories(../../vpu/h265e/) + +# hal h265 header +set(HAL_H265E_HDR + ) + +# hal h265 encoder sourse +set(HAL_H265E_SRC + hal_h265e_api.c + ) + +add_library(hal_h265e STATIC + ${HAL_H265E_HDR} + ${HAL_H265E_SRC} + ) + +set_target_properties(hal_h265e PROPERTIES FOLDER "mpp/hal") + +target_link_libraries(hal_h265e hal_h265e_vpu mpp_base) diff --git a/mpp/hal/rkenc/h265e/hal_h265e_api.c b/mpp/hal/common/h265/hal_h265e_api.c similarity index 100% rename from mpp/hal/rkenc/h265e/hal_h265e_api.c rename to mpp/hal/common/h265/hal_h265e_api.c diff --git a/mpp/hal/rkenc/CMakeLists.txt b/mpp/hal/rkenc/CMakeLists.txt index 8ea6af44..33241a67 100644 --- a/mpp/hal/rkenc/CMakeLists.txt +++ b/mpp/hal/rkenc/CMakeLists.txt @@ -1,3 +1,3 @@ # vim: syntax=cmake add_subdirectory(h264e) -add_subdirectory(h265e) + diff --git a/mpp/hal/rkenc/h265e/CMakeLists.txt b/mpp/hal/rkenc/h265e/CMakeLists.txt deleted file mode 100644 index 6313611e..00000000 --- a/mpp/hal/rkenc/h265e/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# vim: syntax=cmake -# hal h265e reg - -set(HAL_H265E_SRC - hal_h265e_api.c - hal_h265e_vepu22.c - ) - -add_library(${HAL_H265E} STATIC - ${HAL_H265E_SRC} - ) - -set_target_properties(${HAL_H265E} PROPERTIES FOLDER "mpp/hal") -target_link_libraries(${HAL_H265E} mpp_base) diff --git a/mpp/hal/vpu/CMakeLists.txt b/mpp/hal/vpu/CMakeLists.txt index b17429f5..b53d2cc8 100644 --- a/mpp/hal/vpu/CMakeLists.txt +++ b/mpp/hal/vpu/CMakeLists.txt @@ -30,4 +30,8 @@ endif() if( HAVE_VP8E) add_subdirectory(vp8e) -endif() \ No newline at end of file +endif() + +if(HAVE_H265E) + add_subdirectory(h265e) +endif() diff --git a/mpp/hal/vpu/h265e/CMakeLists.txt b/mpp/hal/vpu/h265e/CMakeLists.txt new file mode 100644 index 00000000..0a6a899c --- /dev/null +++ b/mpp/hal/vpu/h265e/CMakeLists.txt @@ -0,0 +1,13 @@ +# vim: syntax=cmake +# hal h265e reg + +set(HAL_H265E_SRC + hal_h265e_vepu22.c + ) + +add_library(hal_h265e_vpu STATIC + ${HAL_H265E_SRC} + ) + +set_target_properties(hal_h265e_vpu PROPERTIES FOLDER "mpp/hal") +target_link_libraries(hal_h265e_vpu hal_h265e mpp_base) diff --git a/mpp/hal/rkenc/h265e/hal_h265e_base.h b/mpp/hal/vpu/h265e/hal_h265e_base.h old mode 100755 new mode 100644 similarity index 100% rename from mpp/hal/rkenc/h265e/hal_h265e_base.h rename to mpp/hal/vpu/h265e/hal_h265e_base.h diff --git a/mpp/hal/rkenc/h265e/hal_h265e_vepu22.c b/mpp/hal/vpu/h265e/hal_h265e_vepu22.c old mode 100755 new mode 100644 similarity index 100% rename from mpp/hal/rkenc/h265e/hal_h265e_vepu22.c rename to mpp/hal/vpu/h265e/hal_h265e_vepu22.c diff --git a/mpp/hal/rkenc/h265e/hal_h265e_vepu22.h b/mpp/hal/vpu/h265e/hal_h265e_vepu22.h similarity index 100% rename from mpp/hal/rkenc/h265e/hal_h265e_vepu22.h rename to mpp/hal/vpu/h265e/hal_h265e_vepu22.h diff --git a/mpp/hal/rkenc/h265e/hal_h265e_vepu22_def.h b/mpp/hal/vpu/h265e/hal_h265e_vepu22_def.h similarity index 100% rename from mpp/hal/rkenc/h265e/hal_h265e_vepu22_def.h rename to mpp/hal/vpu/h265e/hal_h265e_vepu22_def.h diff --git a/mpp/hal/rkenc/h265e/hal_h265e_vepu22_reg.h b/mpp/hal/vpu/h265e/hal_h265e_vepu22_reg.h similarity index 100% rename from mpp/hal/rkenc/h265e/hal_h265e_vepu22_reg.h rename to mpp/hal/vpu/h265e/hal_h265e_vepu22_reg.h