diff --git a/thirdparty/faad2/HPKBUILD b/thirdparty/faad2/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..0b49f8b453562c06170778ec1bc579e4ed724c1d --- /dev/null +++ b/thirdparty/faad2/HPKBUILD @@ -0,0 +1,74 @@ +# Contributor: wupingyuan +# Maintainer: wupingyuan +pkgname=faad2 +pkgver=2.10.1 +pkgrel=0 +pkgdesc="" +url="" +archs=("armeabi-v7a" "arm64-v8a") +license=("GPLv2") +depends=() +makedepends=() +install= +source="https://github.com/knik0/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +downloadpackage=true +buildtools="configure" +builddir=$pkgname-$pkgver +packagename=$builddir.tar.gz +source envset.sh +host= + +prepare() { + cp -rf $builddir $pkgname-$ARCH-build + if [ $ARCH == "armeabi-v7a" ] + then + setarm32ENV + host=arm-linux + fi + if [ $ARCH == "arm64-v8a" ] + then + setarm64ENV + host=aarch64-linux + fi + cd $pkgname-$ARCH-build + ./bootstrap > `pwd`/build.log 2>&1 + cd $OLDPWD +} + +build() { + cd $pkgname-$ARCH-build + ./configure "$@" --host=$host >> `pwd`/build.log 2>&1 + make -j4 >> `pwd`/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +package() { + cd $pkgname-$ARCH-build + make install >> `pwd`/build.log 2>&1 + ret=$? + cd $OLDPWD + if [ $ARCH == "armeabi-v7a" ] + then + unsetarm32ENV + fi + if [ $ARCH == "arm64-v8a" ] + then + unsetarm64ENV + fi + unset host + return $ret +} + +check() { + echo "The test must be on an OpenHarmony device!" + # 在OpenHarmony开发板中执行用例 + # ./faad –w test.aac > out.wav +} + +cleanbuild(){ + rm -rf ${PWD}/$builddir $builddir-armeabi-v7a-build $builddir-arm64-v8a-build #${PWD}/$packagename +} \ No newline at end of file diff --git a/thirdparty/faad2/README.OpenSource b/thirdparty/faad2/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..de8f649fd4263ac1059f90280f2990f30df6b347 --- /dev/null +++ b/thirdparty/faad2/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "faad2", + "License": "GPLv2", + "License File": "COPYING", + "Version Number": "2.10.1", + "Owner": "wupingyuan@huawei.com", + "Upstream URL": "https://github.com/knik0/faad2/archive/refs/tags/2.10.1.tar.gz", + "Description": "FAAD2 is a HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder" + } +] diff --git a/thirdparty/faad2/README_zh.md b/thirdparty/faad2/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..4a7a1f7a62b0d679c37cdc46e47784d15fbd77dd --- /dev/null +++ b/thirdparty/faad2/README_zh.md @@ -0,0 +1,12 @@ +# faad2三方库说明 +## 功能简介 +faad2是一个音频解码的库。 +## 使用约束 +- IDE版本:DevEco Studio 3.1 Beta2 +- SDK版本:ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本:2.10.1 +- 当前适配的功能:支持音频的解码 +- [GPLv2](https://github.com/knik0/faad2) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/faad2/SHA512SUM b/thirdparty/faad2/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..2eadbd4ee2af1e473147c01398e6539720b113a0 --- /dev/null +++ b/thirdparty/faad2/SHA512SUM @@ -0,0 +1 @@ +8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3 faad2-2.10.1.tar.gz \ No newline at end of file diff --git a/thirdparty/faad2/docs/hap_integrate.md b/thirdparty/faad2/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..a436744ff6f8de27d0ea27a1673a42ce768d152c --- /dev/null +++ b/thirdparty/faad2/docs/hap_integrate.md @@ -0,0 +1,85 @@ +# faad2集成到应用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 3.2.11.9 (API Version 9 Release)](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2-Release%2Fohos-sdk-windows_linux-public.tar.gz) +- [DevEco Studio 3.1 Beta2](https://gitee.com/link?target=https%3A%2F%2Fcontentcenter-vali-drcn.dbankcdn.cn%2Fpvt_2%2FDeveloperAlliance_package_901_9%2Ff3%2Fv3%2FuJyuq3syQ2ak4hE1QZmAug%2Fdevecostudio-windows-3.1.0.400.zip%3FHW-CC-KV%3DV1%26HW-CC-Date%3D20230408T013335Z%26HW-CC-Expire%3D315360000%26HW-CC-Sign%3D96262721EDC9B34E6F62E66884AB7AE2A94C2A7B8C28D6F7FC891F46EB211A70) +- [准备三方库构建环境](../../../tools/README.md#编译环境准备) +- [准备三方库测试环境](../../../tools/README.md#ci环境准备) +## 编译三方库 +- 下载本仓库 + ``` + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` +- 三方库目录结构 + ``` + tpc_c_cplusplus/thirdparty/faad2 #三方库faad2的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将faad2拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/faad2 tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh faad2 + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + ``` + faad2/arm64-v8a faad2/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 + ![thirdparty_install_dir](pic/faad2_install_dir.jpg) +- 拷贝动态库到`\\entry\libs\${OHOS_ARCH}\`目录: + + 动态库需要在`\\entry\libs\${OHOS_ARCH}\`目录,才能集成到hap包中,所以需要将对应的so文件拷贝到对应CPU架构的目录: +  ![thirdparty_install_dir](pic/faad2_install_dir.jpg) + +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/faad2/${OHOS_ARCH}/lib/libfaad.a) + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/faad2/${OHOS_ARCH}/lib/libfaad_drm.a) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/faad2/${OHOS_ARCH}/include) + ``` + ![faad2_usage](pic/faad2_usage.jpg) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试,[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +- 将编译生成的faad可执行文件及音频测试文件test.aac准备好 + +- 将准备好的文件推送到开发板,在windows命令行进行如下操作 + + ``` + hdc_std shell mount -o remount,rw / #修改系统权限为可读写 + hdc_std file send faad /data #将可执行文件推入开发板data目录 + hdc_std file send libc++_shared.so /system/lib64 + hdc_std file send test.aac /data #将测试文件推入开发板data目录 + hdc_std shell #进入开 发板 + chmod 777 faad #添加权限 + ./faad -w test.aac > out.wav #执行可执行文件解码生成wav文件 + ``` + + ![faad2_test](pic/faad2_test.jpg) + +## 参考资料 +- [润和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/faad2/docs/pic/faad2_install_dir.jpg b/thirdparty/faad2/docs/pic/faad2_install_dir.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0f11017cd9f5ae879ea90a9030afc6409730fad1 Binary files /dev/null and b/thirdparty/faad2/docs/pic/faad2_install_dir.jpg differ diff --git a/thirdparty/faad2/docs/pic/faad2_test.jpg b/thirdparty/faad2/docs/pic/faad2_test.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2717ec186c7524a63e3dcd993add142dc2081dd1 Binary files /dev/null and b/thirdparty/faad2/docs/pic/faad2_test.jpg differ diff --git a/thirdparty/faad2/docs/pic/faad2_usage.jpg b/thirdparty/faad2/docs/pic/faad2_usage.jpg new file mode 100644 index 0000000000000000000000000000000000000000..91335453c905a0bcb0919e33c61fb7ef013dde2b Binary files /dev/null and b/thirdparty/faad2/docs/pic/faad2_usage.jpg differ