diff --git a/thirdparty/uavs3d/HPKBUILD b/thirdparty/uavs3d/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..07acd99fed1044e54ff6aadd826a178331e368cf --- /dev/null +++ b/thirdparty/uavs3d/HPKBUILD @@ -0,0 +1,94 @@ +# Contributor: dingqian <1052888395@qq.com> +# Maintainer : dingqian <1052888395@qq.com> + +pkgname=uavs3d +pkgver=1fd04917cff50fac72ae23e45f82ca6fd9130bd8 +pkgrel=0 +pkgdesc="AVS3 decoder which supports AVS3-P2 baseline profile." +url="https://github.com/uavs3/uavs3d" +archs=("armeabi-v7a" "arm64-v8a") +license=("BSD-3-Clause license") +depends=() +makedepends=("wget") + +source="https://github.com/uavs3/$pkgname.git" + +autounpack=false +downloadpackage=false +buildtools="cmake" + +builddir=$pkgname-${pkgver} +host= +cloneflag=true +patchflag=true +gettestresourceflag=true + +prepare() { + if [ $cloneflag == true ] + then + mkdir $builddir + # 发布的v1.1版本中没有支持arm架构,支持arm架构版本在发布之后,在master分支上 + git clone -b master $source $builddir + if [ $? != 0 ] + then + return -1 + fi + cd $builddir + git reset --hard $pkgver + if [ $? != 0 ] + then + return -2 + fi + cd $OLDPWD + cloneflag=false + fi + if $patchflag + then + cd $builddir + # 由于三方库中cmake存在bug，以及汇编指令问题导致openharmony不支持，所以打patch + patch -p1 < `pwd`/../uavs3d_oh_pkg.patch + # patch只需要打一次,关闭打patch + patchflag=false + cd $OLDPWD + fi + if [ $gettestresourceflag == true ] + then + cd $builddir + # 测试资源下载 + wget https://raw.githubusercontent.com/uavs3/avs3stream/master/ES/City_1280x720_60_ra/test.avs3 + if [ $? != 0 ] + then + return -3 + fi + gettestresourceflag=false + cd $OLDPWD + fi + mkdir -p $builddir/$ARCH-build +} + +build() { + cd $builddir + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -DCOMPILE_10BIT=0 -DBUILD_SHARED_LIBS=1 \ + -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 + make VERBOSE=1 -j4 -C $ARCH-build LOSCFG_COMPILER_ARM_NONE_EABI=y >> `pwd`/$ARCH-build/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +package() { + cd $builddir + make -C $ARCH-build install >> `pwd`/$ARCH-build/build.log 2>&1 + cd $OLDPWD +} + +check() { + echo "The test must be on an OpenHarmony device!" + # 测试方法 + # ./uavs3dec -i test.avs3 -o output.yuv -t 8 -l 2 -s 1 +} + +cleanbuild(){ + rm -rf ${PWD}/$builddir +} + diff --git a/thirdparty/uavs3d/HPKCHECK b/thirdparty/uavs3d/HPKCHECK new file mode 100644 index 0000000000000000000000000000000000000000..5f1232a5ec90e3ecc0885e6fe38f3cd0265e1a35 --- /dev/null +++ b/thirdparty/uavs3d/HPKCHECK @@ -0,0 +1,15 @@ +# Contributor: dingqian <1052888395@qq.com> +# Maintainer: dingqian <1052888395@qq.com> + +source HPKBUILD > /dev/null 2>&1 +logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log +openharmonycheck() { + res=0 + cd $builddir/$ARCH-build + # 测试用例使用方法参照README + ./uavs3dec -i ../test.avs3 -o $CHECK_RESULT_PATH/output.yuv -t 8 -l 2 -s 1 > ${logfile} 2>&1 + res=$? + cd $OLDPWD + + return $res +} diff --git a/thirdparty/uavs3d/OAT.xml b/thirdparty/uavs3d/OAT.xml new file mode 100644 index 0000000000000000000000000000000000000000..96937ea08644b79312d0ced7c0b3eb1e845108ee --- /dev/null +++ b/thirdparty/uavs3d/OAT.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/thirdparty/uavs3d/README.OpenSource b/thirdparty/uavs3d/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..21dd23ce32c51b471ab48c10c559af35cfe8474c --- /dev/null +++ b/thirdparty/uavs3d/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "uavs3d", + "License": "BSD-3-Clause license", + "License File": "LICENSES", + "Version Number": "1fd04917cff50fac72ae23e45f82ca6fd9130bd8", + "Owner": "1052888395@qq.com", + "Upstream URL": "https://github.com/uavs3/uavs3d/archive/refs/heads/master.zip", + "Description": "AVS3 decoder which supports AVS3-P2 baseline profile." + } +] diff --git a/thirdparty/uavs3d/README_zh.md b/thirdparty/uavs3d/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..47d44ddce8d55414afcb336cbbda512bd2bb0ad2 --- /dev/null +++ b/thirdparty/uavs3d/README_zh.md @@ -0,0 +1,11 @@ +# uavs3d三方库说明 +## 功能简介 +uavs3d是一个开源和跨平台的avs3解码器 +## 使用约束 +- IDE版本：DevEco Studio 3.1 Release +- SDK版本：ohos_sdk_public 4.0.8.1 (API Version 10 Release) +- 三方库版本：1fd04917cff50fac72ae23e45f82ca6fd9130bd8 +- 当前适配的功能：uavs3d跨平台avs3解码器 + +## 集成方式 ++ [应用hap包集成](docs/hap_ingtegrate.md) diff --git a/thirdparty/uavs3d/SHA512SUM b/thirdparty/uavs3d/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..e7bbbf88a2b4e746a21a6c340d1b4cd4c50a2916 --- /dev/null +++ b/thirdparty/uavs3d/SHA512SUM @@ -0,0 +1 @@ +8a2c0e521b1a49b3f7e860b066a35eb02b37b21958a1b50dcc78c363e18716dc253f12b348c1c1e739cbfa53caa243f4e94342f8a19234269e71f48f621ebdc8 uavs3d-master.zip diff --git a/thirdparty/uavs3d/docs/hap_ingtegrate.md b/thirdparty/uavs3d/docs/hap_ingtegrate.md new file mode 100644 index 0000000000000000000000000000000000000000..21597b8464557a310ec8d9a4d19e07bfe301fe0e --- /dev/null +++ b/thirdparty/uavs3d/docs/hap_ingtegrate.md @@ -0,0 +1,81 @@ +# uavs3d集成到应用hap + +本库是在RK3568开发板上基于OpenHarmony3.2 Release版本的镜像验证的，如果是从未使用过RK3568，可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 + +## 开发环境 + +- ubuntu20.04 +- [OpenHarmony3.2Release镜像](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2-Release%2Fdayu200_standard_arm32.tar.gz) +- [ohos_sdk_public 4.0.8.1 (API Version 10 Release)](https://gitee.com/link?target=http%3A%2F%2Fdownload.ci.openharmony.cn%2Fversion%2FMaster_Version%2FOpenHarmony_4.0.8.1%2F20230608_091058%2Fversion-Master_Version-OpenHarmony_4.0.8.1-20230608_091058-ohos-sdk-public.tar.gz) +- [DevEco Studio 3.1 Release](https://gitee.com/link?target=https%3A%2F%2Fcontentcenter-vali-drcn.dbankcdn.cn%2Fpvt_2%2FDeveloperAlliance_package_901_9%2F81%2Fv3%2FtgRUB84wR72nTfE8Ir_xMw%2Fdevecostudio-windows-3.1.0.501.zip%3FHW-CC-KV%3DV1%26HW-CC-Date%3D20230621T074329Z%26HW-CC-Expire%3D315360000%26HW-CC-Sign%3D22F6787DF6093ECB4D4E08F9379B114280E1F65DA710599E48EA38CB24F3DBF2) +- [准备三方库构建环境](../../../lycium/README.md#1编译环境准备) +- [准备三方库测试环境](../../../lycium/README.md#3ci环境准备) +## 编译三方库 +- 下载本仓库 + ``` + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` +- 三方库目录结构 + ``` + tpc_c_cplusplus/thirdparty/uavs3d # 三方库uavs3d的目录结构如下 + ├── docs # 三方库相关文档的文件夹 + ├── HPKCHECK # 编译文件 + ├── OAT.xml + ├── ohos_uavs3d.patch # patch文件 + ├── README.OpenSource # 说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md + ├── SHA512SUM + ``` + +- 将uavs3d拷贝至lycium/main目录下(没有main目录就手动创建一下) + ``` + cd tpc_c_cplusplus + cp thirdparty/uavs3d lycium/main -rf + ``` +- 在lycium目录下编译三方库 + uavs3d库不需要依赖其它库，所以在build时只需要编译uavs3d库即可 + 编译环境的搭建参考[准备三方库构建环境](../../../lycium/README.md#ci编译环境准备) + ``` + cd lycium + ./build.sh uavs3d + ``` +- 三方库头文件及生成的库 + 在lycium目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库 + ``` + uavs3d/arm64-v8a uavs3d/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录，将编译生成的库和依赖库拷贝到该目录下，如下图所示 +   + ![thirdparty_install_dir](pic/uavs3d_install_dir.png) + +- 在最外层（cpp目录下）CMakeLists.txt中添加如下语句 + ```shell + #将三方库加入工程中 + target_link_libraries(entry PRIVATE -LCMAKECURRENTSOURCEDIR/../../../libs/{OHOS_ARCH}/libuavs3d.so) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE CMAKECURRENTSOURCEDIR/thirdparty/uavs3d/{OHOS_ARCH}/include) + + ``` + +![uavs3d_usage](pic/uavs3d_usage.png) + +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试，[准备三方库测试环境](../../../lycium/README.md#ci环境准备) + +- 将编译生成的可执行文件及生成的动态库准备好 + +- 将准备好的文件推送到开发板，进入到构建的目录添加执行文件权限和lib库环境执行ctest + ![uavs3d_test](pic/uavs3d_test.png) + + +StalenessCheckTest测试选项需要依赖python环境,导致测试错误 +## 参考资料 +- [润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld) +- [OpenHarmony三方库地址](https://gitee.com/openharmony-tpc) +- [OpenHarmony知识体系](https://gitee.com/openharmony-sig/knowledge) +- [通过DevEco Studio开发一个NAPI工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) diff --git a/thirdparty/uavs3d/docs/pic/uavs3d_install_dir.png b/thirdparty/uavs3d/docs/pic/uavs3d_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..709bfca468f511237bb75484407edc7087607488 Binary files /dev/null and b/thirdparty/uavs3d/docs/pic/uavs3d_install_dir.png differ diff --git a/thirdparty/uavs3d/docs/pic/uavs3d_test.png b/thirdparty/uavs3d/docs/pic/uavs3d_test.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e2a125caa4a63dc3077110ac7e761f1b69aef4 Binary files /dev/null and b/thirdparty/uavs3d/docs/pic/uavs3d_test.png differ diff --git a/thirdparty/uavs3d/docs/pic/uavs3d_usage.png b/thirdparty/uavs3d/docs/pic/uavs3d_usage.png new file mode 100644 index 0000000000000000000000000000000000000000..66b162749925a0d7244e74f8d88ff0986529ff8e Binary files /dev/null and b/thirdparty/uavs3d/docs/pic/uavs3d_usage.png differ diff --git a/thirdparty/uavs3d/uavs3d_oh_pkg.patch b/thirdparty/uavs3d/uavs3d_oh_pkg.patch new file mode 100644 index 0000000000000000000000000000000000000000..cf4d0e1ff3e58d6cd43cb17f07ee2720779fa640 --- /dev/null +++ b/thirdparty/uavs3d/uavs3d_oh_pkg.patch @@ -0,0 +1,24 @@ +--- uavs3d-master-old/source/CMakeLists.txt 2023-02-23 10:34:14.000000000 +0800 ++++ uavs3d-master/source/CMakeLists.txt 2023-07-12 11:05:11.748347339 +0800 +@@ -45,21 +45,7 @@ + + list(APPEND UAVS3D_ASM_FILES ${DIR_X86_SRC}) + list(APPEND UAVS3D_ASM_FILES ${DIR_X86_256_SRC}) +-elseif("${UAVS3D_TARGET_CPU}" MATCHES "armv7") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/armv7.c") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/alf_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/deblock_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/def_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/inter_pred_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/intra_pred_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/dct2_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/itrans_dct8_dst7_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/pixel_armv7.S") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/sao_armv7.c") +- list(APPEND UAVS3D_ASM_FILES "./decore/arm64/sao_kernel_armv7.S") + +- add_definitions(-D _armv7a) +- enable_language(ASM) + elseif("${UAVS3D_TARGET_CPU}" MATCHES "arm64") + list(APPEND UAVS3D_ASM_FILES "./decore/arm64/arm64.c") + list(APPEND UAVS3D_ASM_FILES "./decore/arm64/alf_arm64.S")