From 6fa567c4bedce0aa0220015b4749c299b4adc6c1 Mon Sep 17 00:00:00 2001 From: longfeng Date: Thu, 16 Jan 2025 18:37:02 +0800 Subject: [PATCH 1/2] reducing package size Signed-off-by: longfeng --- doc/FFmpeg_n4.3.8/HPKBUILD | 21 ++++++++++++----- entry/oh-package.json5 | 2 +- library/oh-package.json5 | 2 +- library/src/main/cpp/CMakeLists.txt | 2 +- oh-package.json5 | 5 +++-- prebuild.sh | 35 ++--------------------------- 6 files changed, 23 insertions(+), 44 deletions(-) diff --git a/doc/FFmpeg_n4.3.8/HPKBUILD b/doc/FFmpeg_n4.3.8/HPKBUILD index 5ab2e25..1ac371b 100644 --- a/doc/FFmpeg_n4.3.8/HPKBUILD +++ b/doc/FFmpeg_n4.3.8/HPKBUILD @@ -21,7 +21,7 @@ pkgdesc="FFmpeg is a collection of libraries and tools to process multimedia con url="https://github.com/FFmpeg/FFmpeg/" archs=("armeabi-v7a" "arm64-v8a" "x86_64") license=("GPL-2.0" "GPL-3.0" "LGPL-3.0" "LGPL-2.1") -depends=("rtmpdump" "openssl_1_0_2u" "lame") +depends=() makedepends=() source="https://github.com/FFmpeg/${pkgname:0:6}/archive/refs/tags/$pkgver.tar.gz" @@ -62,11 +62,20 @@ prepare() { build() { cd $builddir-$ARCH-build - PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --enable-neon --enable-asm --enable-network \ - --enable-cross-compile --enable-librtmp --disable-x86asm --enable-openssl --enable-protocols --enable-libmp3lame \ - --disable-static --enable-shared --disable-doc --disable-htmlpages --target-os=linux --arch=$arch \ - --cc=${CC} --ld=${CC} --strip=${STRIP} --host-cc="${CC}" --host-ld="${CC}" --host-os=linux \ - --host-ldflags=${ldflags} --sysroot=${OHOS_SDK}/native/sysroot --extra-cflags="-I${LYCIUM_ROOT}/usr/lame/${ARCH}/include" --extra-ldflags="-L${LYCIUM_ROOT}/usr/lame/${ARCH}/lib" > $buildlog 2>&1 + PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --enable-neon --enable-asm --enable-network --disable-vulkan \ + --enable-cross-compile --disable-x86asm --enable-protocols --enable-static --enable-shared --disable-doc \ + --disable-htmlpages --target-os=linux --arch=aarch64 --cc=${CC} --cxx=${CXX} --ld=${CC} --strip=${STRIP} \ + --sysroot=${OHOS_SDK}/native/sysroot --disable-programs --disable-avdevice --disable-postproc --disable-network \ + --disable-dwt --disable-lsp --disable-lzo --disable-faan --disable-pixelutils --disable-bsfs --disable-encoders \ + --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-protocols \ + --disable-devices --disable-asm --disable-doc --disable-debug --disable-iconv --disable-stripping --disable-vaapi \ + --disable-vdpau --disable-xlib --disable-cuvid --disable-cuda --disable-libxcb --disable-libxcb_shm \ + --disable-libxcb_shape --disable-libxcb_xfixes --disable-sdl2 --disable-bzlib --disable-lzma --disable-filters \ + --enable-zlib --enable-filter=scale,format,trim,null,amix,anull,abuffer,abuffersink,aformat,aresample,overlay,volume,movie \ + --enable-protocol=file --enable-bsf=h264_mp4toannexb --enable-demuxer=concat,mp3,aac,ape,flac,ogg,wav,mov,mpegts,amr,pcm_s16le,image2 \ + --enable-muxer=mp4,h264,mp3,wav,amr,image2 --enable-parser=h263,mpeg4video,vp8,vp9,mp3,h264 --enable-parser=mpegaudio,aac,aac_latm \ + --enable-decoder=h263,h264,mpeg2video,mpeg4,vp8,vp9 --enable-decoder=mp3,mp3float,aac,aac_latm,ape,flac,vorbis,opus,png,pcm_s16le \ + --enable-encoder=aac,aac_latm,opus,png --enable-encoder=mpeg4,h263,mp3,pcm_s16le --target-os=linux --arch=$arch > $buildlog 2>&1 $MAKE >> $buildlog 2>&1 ret=$? cd $OLDPWD diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 90e2e63..b3d3fd8 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "一个读取、写入操作音视频文件编辑的工具。", "repository": {}, - "version": "2.0.5-rc.1", + "version": "2.0.5", "dependencies": { "@ohos/mp4parser": "2.0.5-rc.1" } diff --git a/library/oh-package.json5 b/library/oh-package.json5 index bdd3344..b29e420 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -12,7 +12,7 @@ "description": "一个读取、写入操作音视频文件编辑的工具。支持视频裁剪、视频合成、音频裁剪、音频合成、视频取帧。", "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/mp4parser", - "version": "2.0.5-rc.1", + "version": "2.0.5", "tags": [ "mp4parser", "Media" diff --git a/library/src/main/cpp/CMakeLists.txt b/library/src/main/cpp/CMakeLists.txt index b7666b7..e98a257 100644 --- a/library/src/main/cpp/CMakeLists.txt +++ b/library/src/main/cpp/CMakeLists.txt @@ -37,4 +37,4 @@ target_link_libraries(mp4parser_napi avformat) target_link_libraries(mp4parser_napi avutil) target_link_libraries(mp4parser_napi swresample) target_link_libraries(mp4parser_napi swscale) -target_link_libraries(mp4parser_napi avdevice) \ No newline at end of file +#target_link_libraries(mp4parser_napi avdevice) \ No newline at end of file diff --git a/oh-package.json5 b/oh-package.json5 index 3d773bd..d054793 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -1,4 +1,5 @@ { + "modelVersion": "5.0.1", "license": "Apache License 2.0", "devDependencies": { "@ohos/hypium": "1.0.6" @@ -11,6 +12,6 @@ "name": "mp4parser", "description": "一个读取、写入操作音视频文件编辑的工具。", "repository": {}, - "version": "2.0.5-rc.1", + "version": "2.0.5", "dependencies": {} -} +} \ No newline at end of file diff --git a/prebuild.sh b/prebuild.sh index 0e9a7ac..9c612b1 100644 --- a/prebuild.sh +++ b/prebuild.sh @@ -23,14 +23,11 @@ LYCIUM_TOOLS_DIR=$LYCIUM_ROOT_DIR/lycium LYCIUM_THIRDPARTY_DIR=$LYCIUM_ROOT_DIR/thirdparty DEPENDS_DIR=$ROOT_DIR/doc # 依赖库编译脚本在仓库中的位置 FFMPEG_NAME=FFmpeg_n4.3.8 # 依赖库名 -RTMPDUMP_NAME=rtmpdump # FFmpeg的依赖库名，需和依赖库一起安装 -OPESSL_NAME=openssl_1_0_2u # FFmpeg的依赖库名，需和依赖库一起安装 -LAME_NAME=lame # FFmpeg的依赖库名，需和依赖库一起安装 CI_OUTPUT_DIR=$ROOT_DIR/../out/tpc/ # hap/har安装目录 -LIBS_NAME=("FFmpeg_n4.3.8" "rtmpdump" "openssl_1_0_2u" "lame") -PACKAGE_NAME=("FFmpeg-n4.3.8.tar.gz" "rtmpdump-2.3.tgz" "openssl-OpenSSL_1_0_2u.tar.gz" "lame-3.100.tar.gz") +LIBS_NAME=("FFmpeg_n4.3.8") +PACKAGE_NAME=("FFmpeg-n4.3.8.tar.gz") function prepare_lycium_tools() { @@ -100,9 +97,6 @@ function copy_depends() function prepare_depends() { copy_depends $DEPENDS_DIR $FFMPEG_NAME - copy_depends $DEPENDS_DIR $RTMPDUMP_NAME - copy_depends $DEPENDS_DIR $OPESSL_NAME - copy_depends $DEPENDS_DIR $LAME_NAME } function check_sdk() @@ -135,9 +129,6 @@ function check_copy_shasum() function install_shasum() { check_copy_shasum $FFMPEG_NAME ${PACKAGE_NAME[0]} $FFMPEG_NAME - check_copy_shasum $SOUNDTOUCH_NAME ${PACKAGE_NAME[1]} $RTMPDUMP_NAME - check_copy_shasum $OPESSL_NAME ${PACKAGE_NAME[2]} $OPESSL_NAME - check_copy_shasum $LAME_NAME ${PACKAGE_NAME[3]} $LAME_NAME } function start_build() { @@ -164,32 +155,10 @@ function install_depends() echo "FFmpeg build failed!" return 1 fi - cp -arf $LYCIUM_TOOLS_DIR/usr/$OPESSL_NAME $install_dir/openssl_1_0_2u - if [ $? -ne 0 ] - then - echo "FFmpeg depends openssl build failed!" - return 1 - fi - cp -arf $LYCIUM_TOOLS_DIR/usr/$RTMPDUMP_NAME $install_dir/rtmpdump - if [ $? -ne 0 ] - then - echo "FFmpeg depends rtmpdump build failed!" - return 1 - fi - - cp -arf $LYCIUM_TOOLS_DIR/usr/$LAME_NAME $install_dir/lame - if [ $? -ne 0 ] - then - echo "FFmpeg depends lame build failed!" - return 1 - fi if [ -d $CI_OUTPUT_DIR ] then cp -arf $LYCIUM_TOOLS_DIR/usr/$FFMPEG_NAME $CI_OUTPUT_DIR - cp -arf $LYCIUM_TOOLS_DIR/usr/$OPESSL_NAME $CI_OUTPUT_DIR - cp -arf $LYCIUM_TOOLS_DIR/usr/$RTMPDUMP_NAME $CI_OUTPUT_DIR - cp -arf $LYCIUM_TOOLS_DIR/usr/$LAME_NAME $CI_OUTPUT_DIR fi return 0 -- Gitee From 12f83a4e3bf548f0716a8e50435ffafd7502cf1f Mon Sep 17 00:00:00 2001 From: longfeng Date: Fri, 17 Jan 2025 11:25:34 +0800 Subject: [PATCH 2/2] Add 2.0.5-rc.2 version description Signed-off-by: longfeng --- CHANGELOG.md | 4 ++++ build-profile.json5 | 6 ++++-- entry/oh-package.json5 | 2 +- library/build-profile.json5 | 2 -- library/oh-package.json5 | 2 +- oh-package.json5 | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 833d40e..9bd2537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.5-rc.2 + +- reducing package size-Crop ffmpeg + ## 2.0.5-rc.1 - Update to ffmpeg version 4.3.8 diff --git a/build-profile.json5 b/build-profile.json5 index 80286f0..2a3c2ba 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,8 +4,10 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 10, - "compatibleSdkVersion": 9 + "compileSdkVersion": 12, + "compatibleSdkVersion": 12, + "targetSdkVersion": 12, + "runtimeOS": "OpenHarmony" } ] }, diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index b3d3fd8..2992842 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -6,6 +6,6 @@ "repository": {}, "version": "2.0.5", "dependencies": { - "@ohos/mp4parser": "2.0.5-rc.1" + "@ohos/mp4parser": "2.0.5-rc.2" } } diff --git a/library/build-profile.json5 b/library/build-profile.json5 index 18acd4c..5480257 100644 --- a/library/build-profile.json5 +++ b/library/build-profile.json5 @@ -8,9 +8,7 @@ "path": "./src/main/cpp/CMakeLists.txt", "arguments": " -DOHOS_STL=c++_shared -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS='-s' -DCMAKE_CXX_FLAGS='-s'", "abiFilters": [ - "armeabi-v7a", "arm64-v8a", - "x86_64" ], "cppFlags": "" } diff --git a/library/oh-package.json5 b/library/oh-package.json5 index b29e420..dc12cde 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -12,7 +12,7 @@ "description": "一个读取、写入操作音视频文件编辑的工具。支持视频裁剪、视频合成、音频裁剪、音频合成、视频取帧。", "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/mp4parser", - "version": "2.0.5", + "version": "2.0.5-rc.2", "tags": [ "mp4parser", "Media" diff --git a/oh-package.json5 b/oh-package.json5 index d054793..2b5e649 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -12,6 +12,6 @@ "name": "mp4parser", "description": "一个读取、写入操作音视频文件编辑的工具。", "repository": {}, - "version": "2.0.5", + "version": "2.0.5-rc.2", "dependencies": {} } \ No newline at end of file -- Gitee