diff --git a/build_ffmpeg.sh b/build_ffmpeg.sh index 7ff3784..2599616 100755 --- a/build_ffmpeg.sh +++ b/build_ffmpeg.sh @@ -18,11 +18,13 @@ FFMPEG_PATH=. NDK_PATH=/Users/xch/Library/Android/sdk/ndk/21.0.5935234 HOST_PLATFORM="darwin-x86_64" +TOOLCHAIN_PREFIX="${NDK_PATH}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/bin" ENABLED_ENCODERS=(h264 png) ENABLED_DECODERS=(h264 png) ENABLED_MUXERS=(h264 mp4 3gp webm matroska avi image2) ENABLED_DEMUXERS=(webm matroska concat) +ENABLED_PROTOCOLS=(file) COMMON_OPTIONS=" --target-os=android @@ -30,7 +32,6 @@ COMMON_OPTIONS=" --enable-shared --disable-doc --disable-programs - --disable-everything --disable-avdevice --disable-postproc --disable-symver @@ -40,7 +41,7 @@ COMMON_OPTIONS=" --enable-avresample --enable-swresample " -TOOLCHAIN_PREFIX="${NDK_PATH}/toolchains/llvm/prebuilt/${HOST_PLATFORM}/bin" + for encoder in "${ENABLED_ENCODERS[@]}" do COMMON_OPTIONS="${COMMON_OPTIONS} --enable-encoder=${encoder}" @@ -57,8 +58,13 @@ for demuxer in "${ENABLED_DEMUXERS[@]}" do COMMON_OPTIONS="${COMMON_OPTIONS} --enable-demuxer=${demuxer}" done -cd "${FFMPEG_PATH}" - (git -C ffmpeg pull || git clone git://source.ffmpeg.org/ffmpeg ffmpeg) +for protocol in "${ENABLED_PROTOCOLS[@]}" +do + COMMON_OPTIONS="${COMMON_OPTIONS} --enable-protocol=${protocol}" +done + +cd "${FFMPEG_EXT_PATH}" +(git -C ffmpeg pull || git clone git://source.ffmpeg.org/ffmpeg ffmpeg) cd ffmpeg git checkout release/4.2 diff --git a/library/libs/arm64-v8a/libavcodec.so b/library/libs/arm64-v8a/libavcodec.so index c1c41c3..96c5706 100755 Binary files a/library/libs/arm64-v8a/libavcodec.so and b/library/libs/arm64-v8a/libavcodec.so differ diff --git a/library/libs/arm64-v8a/libavfilter.so b/library/libs/arm64-v8a/libavfilter.so index 636bade..f4b8ae4 100755 Binary files a/library/libs/arm64-v8a/libavfilter.so and b/library/libs/arm64-v8a/libavfilter.so differ diff --git a/library/libs/arm64-v8a/libavformat.so b/library/libs/arm64-v8a/libavformat.so index 2143b7d..3fe585e 100755 Binary files a/library/libs/arm64-v8a/libavformat.so and b/library/libs/arm64-v8a/libavformat.so differ diff --git a/library/libs/arm64-v8a/libavresample.so b/library/libs/arm64-v8a/libavresample.so index bde541c..6e764a2 100755 Binary files a/library/libs/arm64-v8a/libavresample.so and b/library/libs/arm64-v8a/libavresample.so differ diff --git a/library/libs/arm64-v8a/libavutil.so b/library/libs/arm64-v8a/libavutil.so index fff377a..bf8b1a0 100755 Binary files a/library/libs/arm64-v8a/libavutil.so and b/library/libs/arm64-v8a/libavutil.so differ diff --git a/library/libs/arm64-v8a/libswresample.so b/library/libs/arm64-v8a/libswresample.so index b876797..eebf1c4 100755 Binary files a/library/libs/arm64-v8a/libswresample.so and b/library/libs/arm64-v8a/libswresample.so differ diff --git a/library/libs/arm64-v8a/libswscale.so b/library/libs/arm64-v8a/libswscale.so index 8a9520e..f1609d0 100755 Binary files a/library/libs/arm64-v8a/libswscale.so and b/library/libs/arm64-v8a/libswscale.so differ diff --git a/library/libs/armeabi-v7a/libavcodec.so b/library/libs/armeabi-v7a/libavcodec.so index 0676edc..d6b9bfd 100755 Binary files a/library/libs/armeabi-v7a/libavcodec.so and b/library/libs/armeabi-v7a/libavcodec.so differ diff --git a/library/libs/armeabi-v7a/libavfilter.so b/library/libs/armeabi-v7a/libavfilter.so index 47bdc80..e3acf1c 100755 Binary files a/library/libs/armeabi-v7a/libavfilter.so and b/library/libs/armeabi-v7a/libavfilter.so differ diff --git a/library/libs/armeabi-v7a/libavformat.so b/library/libs/armeabi-v7a/libavformat.so index 533cc01..e725906 100755 Binary files a/library/libs/armeabi-v7a/libavformat.so and b/library/libs/armeabi-v7a/libavformat.so differ diff --git a/library/libs/armeabi-v7a/libavresample.so b/library/libs/armeabi-v7a/libavresample.so index 3bb5dc0..7eecc28 100755 Binary files a/library/libs/armeabi-v7a/libavresample.so and b/library/libs/armeabi-v7a/libavresample.so differ diff --git a/library/libs/armeabi-v7a/libavutil.so b/library/libs/armeabi-v7a/libavutil.so index f69cfb5..3b970e2 100755 Binary files a/library/libs/armeabi-v7a/libavutil.so and b/library/libs/armeabi-v7a/libavutil.so differ diff --git a/library/libs/armeabi-v7a/libswresample.so b/library/libs/armeabi-v7a/libswresample.so index 40a7b79..1560c0c 100755 Binary files a/library/libs/armeabi-v7a/libswresample.so and b/library/libs/armeabi-v7a/libswresample.so differ diff --git a/library/libs/armeabi-v7a/libswscale.so b/library/libs/armeabi-v7a/libswscale.so index 5266eaf..b8adf60 100755 Binary files a/library/libs/armeabi-v7a/libswscale.so and b/library/libs/armeabi-v7a/libswscale.so differ diff --git a/library/libs/x86/libavcodec.so b/library/libs/x86/libavcodec.so index a48c285..492cda4 100755 Binary files a/library/libs/x86/libavcodec.so and b/library/libs/x86/libavcodec.so differ diff --git a/library/libs/x86/libavfilter.so b/library/libs/x86/libavfilter.so index 1fcc6ad..fd8983c 100755 Binary files a/library/libs/x86/libavfilter.so and b/library/libs/x86/libavfilter.so differ diff --git a/library/libs/x86/libavformat.so b/library/libs/x86/libavformat.so index 0d33564..5657b70 100755 Binary files a/library/libs/x86/libavformat.so and b/library/libs/x86/libavformat.so differ diff --git a/library/libs/x86/libavresample.so b/library/libs/x86/libavresample.so index 7faa04b..b8a41b1 100755 Binary files a/library/libs/x86/libavresample.so and b/library/libs/x86/libavresample.so differ diff --git a/library/libs/x86/libavutil.so b/library/libs/x86/libavutil.so index a1d46bd..43b4cda 100755 Binary files a/library/libs/x86/libavutil.so and b/library/libs/x86/libavutil.so differ diff --git a/library/libs/x86/libswresample.so b/library/libs/x86/libswresample.so index a1ecf7b..55399e9 100755 Binary files a/library/libs/x86/libswresample.so and b/library/libs/x86/libswresample.so differ diff --git a/library/libs/x86/libswscale.so b/library/libs/x86/libswscale.so index acd8c03..0d4b6e9 100755 Binary files a/library/libs/x86/libswscale.so and b/library/libs/x86/libswscale.so differ