Skip to content

Commit b52b7a0

Browse files
committed
android ffmpeg--disable-iconv --disable-bzlib
1 parent 44d0c6c commit b52b7a0

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

configs/ffconfig/auto-detect-third-libs.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,14 @@ case "$MR_PLAT" in
200200
# enable iconv
201201
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-iconv"
202202
;;
203+
android)
204+
# enable mediacodec hwaccel
205+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-jni"
206+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-mediacodec"
207+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-decoder=h264_mediacodec --enable-hwaccel=h264_mediacodec"
208+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-decoder=h265_mediacodec --enable-hwaccel=h265_mediacodec"
209+
# disable iconv
210+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --disable-iconv"
211+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --disable-bzlib"
212+
;;
203213
esac

do-compile/android/ffmpeg.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ CFG_FLAGS="$CFG_FLAGS $THIRD_CFG_FLAGS"
4545

4646
# Android 15 with 16 kb page size support
4747
# https://developer.android.com/guide/practices/page-sizes#compile-r27
48-
EXTRA_LDFLAGS="-Wl,-z,max-page-size=16384"
49-
48+
# EXTRA_LDFLAGS="-Wl,-z,max-page-size=16384 -fuse-ld=lld"
49+
EXTRA_LDFLAGS=
5050
C_FLAGS="$C_FLAGS $MR_OTHER_CFLAGS"
51-
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
51+
LDFLAGS="$C_FLAGS $EXTRA_LDFLAGS"
5252

5353

5454
echo "----------------------"
@@ -78,8 +78,8 @@ else
7878
./configure \
7979
$CFG_FLAGS \
8080
--cc=${MR_TRIPLE_CC} \
81-
--ld=${MR_TRIPLE_CC} \
8281
--as=${MR_TRIPLE_CC} \
82+
--ld=${MR_TRIPLE_CC} \
8383
--ar=${MR_AR} \
8484
--nm=${MR_NM} \
8585
--strip=${MR_STRIP} \

tools/parse-arguments.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ if [[ -n "$nproc" ]];then
258258
export MR_HOST_NPROC=$nproc
259259
fi
260260

261-
# -arch $MR_ARCH
262-
cflags="-Wno-int-conversion -Wno-declaration-after-statement -Wno-unused-function"
261+
cflags="-Wno-incompatible-function-pointer-types -Wno-int-conversion -Wno-declaration-after-statement -Wno-unused-function"
263262

264263
if [[ "$MR_DEBUG" == "debug" ]];then
265264
export MR_OTHER_CFLAGS="-g -O0 -D_DEBUG $cflags"

0 commit comments

Comments
 (0)