Skip to content

Commit

Permalink
update 1.44.0
Browse files Browse the repository at this point in the history 
-| FFMPEG "Ada" updated as to 2022-01-30 (if those binaries changes mean anything)
-| libmp3lame (mp3 encoder) enabled in our config now
-| mxv muxer enabled (another video format?)
  • Loading branch information
@USBhost
USBhost committed Apr 3, 2022
1 parent c3d29e9 commit 12641ae
Show file tree
Hide file tree
Showing 14 changed files with 151 additions and 16 deletions.
15 changes: 11 additions & 4 deletions ffmpeg/JNI/config-ffmpeg.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,16 @@ INC_OPUS=../opus-1.1/include
INC_SPEEX=../speex-1.2rc1/include
INC_ZVBI=../zvbi-0.2.35/src
INC_ICONV=../modified_src/iconv
INC_MXV=../modified_src/mxv
INC_MXD=../modified_src/mxd
INC_USB=../modified_src/usb
INC_MODPLUG=../libmodplug/src
INC_LIBMXL2=../libxml2/include
INC_LIBSMB2=../libsmb2/include
INC_MXV=../modified_src/mxv
INC_LIBDAV1D=../dav1d/include
INC_LIBMP3LAME=../lame-3.100


TOOLCHAIN=$NDK/toolchains/llvm/prebuilt/$HOST_PLATFORM
if [ $ARCH == 'arm64' ]
then
Expand Down Expand Up @@ -215,6 +216,7 @@ then
EXTRA_CFLAGS+=" -fstack-protector-strong "
fi

OPTFLAGS="-O2 -fPIC"
LINK_AGAINST=21-x86_64
elif [ $ARCH == 'x86' ]
then
Expand Down Expand Up @@ -283,6 +285,7 @@ FF_FEATURE_CLASS="\
--disable-postproc \
--disable-swscale-alpha \
--enable-avfilter \
--enable-libmp3lame \
"
FF_FEATURE_DEMUXER="\
--disable-demuxer=jacosub \
Expand All @@ -304,7 +307,9 @@ FF_FEATURE_MUXER="\
--enable-muxer=srt \
--enable-muxer=mp3 \
--enable-muxer=dash \
--enable-muxer=mxv \
"

FF_FEATURE_DECODER="\
--disable-decoder=jacosub \
--disable-decoder=microdvd \
Expand All @@ -318,6 +323,7 @@ FF_FEATURE_DECODER="\
--disable-decoder=subviewer1 \
--disable-decoder=vplayer \
"

FF_FEATURE_ENCODER="\
--disable-encoders \
--enable-encoder=webvtt \
Expand All @@ -326,14 +332,15 @@ FF_FEATURE_ENCODER="\
--enable-encoder=libmp3lame \
--enable-encoder=aac \
"

FF_FEATURE_FILTER="\
--enable-filter=w3fdif \
--enable-filter=yadif \
--enable-filter=transpose \
--enable-filter=vflip \
--enable-filter=hflip \
--enable-filter=scale \
--enable-filter=rotate
--enable-filter=rotate \
--enable-filter=w3fdif \
--enable-filter=yadif \
"
FF_FEATURE_PROTOCOL="\
--disable-protocol=bluray \
Expand Down
4 changes: 2 additions & 2 deletions ffmpeg/JNI/ffmpeg/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
#define FFMPEG_CONFIGURATION "--arch=x86_64 --cpu=atom --cross-prefix=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android- --ld=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --nm= --ar= --as=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --target-os=android --enable-cross-compile --sysroot=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot --enable-asm --disable-debug --disable-doc --disable-programs --disable-shared --disable-symver --enable-optimizations --enable-pic --enable-pthreads --enable-static --disable-avdevice --disable-devices --disable-encoders --disable-filters --disable-muxers --disable-postproc --disable-swscale-alpha --enable-avfilter --disable-demuxer=ac3 --disable-demuxer=dts --disable-demuxer=eac3 --disable-demuxer=jacosub --disable-demuxer=microdvd --disable-demuxer=mlp --disable-demuxer=mpl2 --disable-demuxer=pjs --disable-demuxer=realtext --disable-demuxer=sami --disable-demuxer=srt --disable-demuxer=stl --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=truehd --disable-demuxer=vplayer --disable-demuxer=webvtt --disable-decoder=jacosub --disable-decoder=microdvd --disable-decoder=mpl2 --disable-decoder=pjs --disable-decoder=realtext --disable-decoder=sami --disable-decoder=srt --disable-decoder=stl --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=vplayer --disable-bsf=dca_core --disable-protocol=bluray --disable-protocol=data --disable-protocol=gopher --disable-protocol=md5 --disable-protocol=pipe --disable-protocol=udplite --disable-protocol=unix --enable-filter=w3fdif --enable-filter=yadif --enable-filter=transpose --enable-filter=vflip --enable-filter=hflip --enable-filter=scale --enable-filter=rotate --disable-muxers --enable-muxer=webvtt --enable-muxer=srt --enable-muxer=mp3 --enable-muxer=dash --disable-encoders --enable-encoder=webvtt --enable-encoder=srt --enable-libmp3lame --enable-encoder=libmp3lame --enable-encoder=aac --disable-mmx --disable-mmxext --disable-inline-asm --enable-libmodplug --enable-libopus --enable-libspeex --enable-libzvbi --enable-openssl --enable-zlib --enable-libxml2 --enable-libsmb2 --enable-jni --enable-usb --enable-libdav1d --cc='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target x86_64-none-linux-android21' --cxx='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -target x86_64-none-linux-android21' --extra-cflags='-mtune=atom -msse3 -mssse3 -mfpmath=sse -fstrict-aliasing -fstack-protector-strong -Wno-deprecated-declarations -Wno-unused-variable -Wno-unused-function -I../lame-3.100 -I../modified_src/iconv -I../modified_src/mxv -I../modified_src/mxd -I../modified_src/usb -idirafter../zvbi-0.2.35/src -I../openssl-1.0.2s/include -I../opus-1.1/include -I../speex-1.2rc1/include -I../libmodplug/src -I../libxml2/include -I../libsmb2/include -I../dav1d/include -DNDEBUG -DMXTECHS -DFF_API_AVPICTURE=1 -DCONFIG_MXV_FROM_MXVP=1 -DMXD_BUILTIN -ftree-vectorize -ffunction-sections -funwind-tables -fomit-frame-pointer -no-canonical-prefixes -pipe --sysroot /Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot' --extra-libs=' -L../libs/x86_64 -lmxutil -lm -lc++_shared' --extra-ldflags= --optflags="
#define FFMPEG_CONFIGURATION "--arch=x86_64 --cpu=atom --cross-prefix=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android- --ld=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --nm= --ar= --as=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --target-os=android --enable-cross-compile --sysroot=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot --enable-asm --disable-debug --disable-doc --disable-programs --disable-shared --disable-symver --enable-optimizations --enable-pic --enable-pthreads --enable-static --disable-avdevice --disable-devices --disable-encoders --disable-filters --disable-muxers --disable-postproc --disable-swscale-alpha --enable-avfilter --enable-libmp3lame --disable-demuxer=ac3 --disable-demuxer=dts --disable-demuxer=eac3 --disable-demuxer=jacosub --disable-demuxer=microdvd --disable-demuxer=mlp --disable-demuxer=mpl2 --disable-demuxer=pjs --disable-demuxer=realtext --disable-demuxer=sami --disable-demuxer=srt --disable-demuxer=stl --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=truehd --disable-demuxer=vplayer --disable-demuxer=webvtt --disable-decoder=jacosub --disable-decoder=microdvd --disable-decoder=mpl2 --disable-decoder=pjs --disable-decoder=realtext --disable-decoder=sami --disable-decoder=srt --disable-decoder=stl --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=vplayer --disable-bsf=dca_core --disable-protocol=bluray --disable-protocol=data --disable-protocol=gopher --disable-protocol=md5 --disable-protocol=pipe --disable-protocol=udplite --disable-protocol=unix --enable-filter=transpose --enable-filter=vflip --enable-filter=hflip --enable-filter=scale --enable-filter=rotate --enable-filter=w3fdif --enable-filter=yadif --disable-muxers --enable-muxer=webvtt --enable-muxer=srt --enable-muxer=mp3 --enable-muxer=dash --enable-muxer=mxv --disable-encoders --enable-encoder=webvtt --enable-encoder=srt --enable-libmp3lame --enable-encoder=libmp3lame --enable-encoder=aac --disable-mmx --disable-mmxext --disable-inline-asm --enable-libmodplug --enable-libopus --enable-libspeex --enable-libzvbi --enable-openssl --enable-zlib --enable-libxml2 --enable-libsmb2 --enable-jni --enable-usb --enable-libdav1d --cc='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target x86_64-none-linux-android21' --cxx='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -target x86_64-none-linux-android21' --extra-cflags='-mtune=atom -msse3 -mssse3 -mfpmath=sse -fstrict-aliasing -fstack-protector-strong -Wno-deprecated-declarations -Wno-unused-variable -Wno-unused-function -I../lame-3.100 -I../modified_src/iconv -I../modified_src/mxv -I../modified_src/mxd -I../modified_src/usb -idirafter../zvbi-0.2.35/src -I../openssl-1.0.2s/include -I../opus-1.1/include -I../speex-1.2rc1/include -I../libmodplug/src -I../libxml2/include -I../libsmb2/include -I../dav1d/include -DNDEBUG -DMXTECHS -DFF_API_AVPICTURE=1 -DCONFIG_MXV_FROM_MXVP=1 -DMXD_BUILTIN -ftree-vectorize -ffunction-sections -funwind-tables -fomit-frame-pointer -no-canonical-prefixes -pipe --sysroot /Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot' --extra-libs=' -L../libs/x86_64 -lmxutil -lm -lc++_shared' --extra-ldflags= --optflags='-O2 -fPIC'"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define CONFIG_THIS_YEAR 2020
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
Expand Down Expand Up @@ -2444,7 +2444,7 @@
#define CONFIG_MD5_MUXER 0
#define CONFIG_MATROSKA_MUXER 0
#define CONFIG_MATROSKA_AUDIO_MUXER 0
#define CONFIG_MXV_MUXER 0
#define CONFIG_MXV_MUXER 1
#define CONFIG_MXV_AUDIO_MUXER 0
#define CONFIG_MICRODVD_MUXER 0
#define CONFIG_MJPEG_MUXER 0
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg/JNI/ffmpeg/doc/config.texi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2429,7 +2429,7 @@
@c @set config-md5-muxer no
@c @set config-matroska-muxer no
@c @set config-matroska-audio-muxer no
@c @set config-mxv-muxer no
@set config-mxv-muxer yes
@c @set config-mxv-audio-muxer no
@c @set config-microdvd-muxer no
@c @set config-mjpeg-muxer no
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg/JNI/ffmpeg/ffbuild/config.fate
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
config:x86:x86_64:atom:android:Android (5220042 based on r346389c) clang version 8.0.7 (https%3a//android.googlesource.com/toolchain/clang b55f2d4ebfd35bf643d27dbca1bb228957008617) (https%3a//android.googlesource.com/toolchain/llvm 3c393fe7a7e13b0fba4ac75a01aa683d7a5b11cd) (based on LLVM 8.0.7svn):--arch=x86_64 --cpu=atom --cross-prefix=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android- --ld=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --nm= --ar= --as=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --target-os=android --enable-cross-compile --sysroot=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot --enable-asm --disable-debug --disable-doc --disable-programs --disable-shared --disable-symver --enable-optimizations --enable-pic --enable-pthreads --enable-static --disable-avdevice --disable-devices --disable-encoders --disable-filters --disable-muxers --disable-postproc --disable-swscale-alpha --enable-avfilter --disable-demuxer=ac3 --disable-demuxer=dts --disable-demuxer=eac3 --disable-demuxer=jacosub --disable-demuxer=microdvd --disable-demuxer=mlp --disable-demuxer=mpl2 --disable-demuxer=pjs --disable-demuxer=realtext --disable-demuxer=sami --disable-demuxer=srt --disable-demuxer=stl --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=truehd --disable-demuxer=vplayer --disable-demuxer=webvtt --disable-decoder=jacosub --disable-decoder=microdvd --disable-decoder=mpl2 --disable-decoder=pjs --disable-decoder=realtext --disable-decoder=sami --disable-decoder=srt --disable-decoder=stl --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=vplayer --disable-bsf=dca_core --disable-protocol=bluray --disable-protocol=data --disable-protocol=gopher --disable-protocol=md5 --disable-protocol=pipe --disable-protocol=udplite --disable-protocol=unix --enable-filter=w3fdif --enable-filter=yadif --enable-filter=transpose --enable-filter=vflip --enable-filter=hflip --enable-filter=scale --enable-filter=rotate --disable-muxers --enable-muxer=webvtt --enable-muxer=srt --enable-muxer=mp3 --enable-muxer=dash --disable-encoders --enable-encoder=webvtt --enable-encoder=srt --enable-libmp3lame --enable-encoder=libmp3lame --enable-encoder=aac --disable-mmx --disable-mmxext --disable-inline-asm --enable-libmodplug --enable-libopus --enable-libspeex --enable-libzvbi --enable-openssl --enable-zlib --enable-libxml2 --enable-libsmb2 --enable-jni --enable-usb --enable-libdav1d --cc='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target x86_64-none-linux-android21' --cxx='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -target x86_64-none-linux-android21' --extra-cflags='-mtune=atom -msse3 -mssse3 -mfpmath=sse -fstrict-aliasing -fstack-protector-strong -Wno-deprecated-declarations -Wno-unused-variable -Wno-unused-function -I../lame-3.100 -I../modified_src/iconv -I../modified_src/mxv -I../modified_src/mxd -I../modified_src/usb -idirafter../zvbi-0.2.35/src -I../openssl-1.0.2s/include -I../opus-1.1/include -I../speex-1.2rc1/include -I../libmodplug/src -I../libxml2/include -I../libsmb2/include -I../dav1d/include -DNDEBUG -DMXTECHS -DFF_API_AVPICTURE=1 -DCONFIG_MXV_FROM_MXVP=1 -DMXD_BUILTIN -ftree-vectorize -ffunction-sections -funwind-tables -fomit-frame-pointer -no-canonical-prefixes -pipe --sysroot /Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot' --extra-libs=' -L../libs/x86_64 -lmxutil -lm -lc++_shared' --extra-ldflags= --optflags=
config:x86:x86_64:atom:android:Android (5220042 based on r346389c) clang version 8.0.7 (https%3a//android.googlesource.com/toolchain/clang b55f2d4ebfd35bf643d27dbca1bb228957008617) (https%3a//android.googlesource.com/toolchain/llvm 3c393fe7a7e13b0fba4ac75a01aa683d7a5b11cd) (based on LLVM 8.0.7svn):--arch=x86_64 --cpu=atom --cross-prefix=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android- --ld=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --nm= --ar= --as=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android21-clang --target-os=android --enable-cross-compile --sysroot=/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot --enable-asm --disable-debug --disable-doc --disable-programs --disable-shared --disable-symver --enable-optimizations --enable-pic --enable-pthreads --enable-static --disable-avdevice --disable-devices --disable-encoders --disable-filters --disable-muxers --disable-postproc --disable-swscale-alpha --enable-avfilter --enable-libmp3lame --disable-demuxer=ac3 --disable-demuxer=dts --disable-demuxer=eac3 --disable-demuxer=jacosub --disable-demuxer=microdvd --disable-demuxer=mlp --disable-demuxer=mpl2 --disable-demuxer=pjs --disable-demuxer=realtext --disable-demuxer=sami --disable-demuxer=srt --disable-demuxer=stl --disable-demuxer=subviewer --disable-demuxer=subviewer1 --disable-demuxer=truehd --disable-demuxer=vplayer --disable-demuxer=webvtt --disable-decoder=jacosub --disable-decoder=microdvd --disable-decoder=mpl2 --disable-decoder=pjs --disable-decoder=realtext --disable-decoder=sami --disable-decoder=srt --disable-decoder=stl --disable-decoder=subviewer --disable-decoder=subviewer1 --disable-decoder=vplayer --disable-bsf=dca_core --disable-protocol=bluray --disable-protocol=data --disable-protocol=gopher --disable-protocol=md5 --disable-protocol=pipe --disable-protocol=udplite --disable-protocol=unix --enable-filter=transpose --enable-filter=vflip --enable-filter=hflip --enable-filter=scale --enable-filter=rotate --enable-filter=w3fdif --enable-filter=yadif --disable-muxers --enable-muxer=webvtt --enable-muxer=srt --enable-muxer=mp3 --enable-muxer=dash --enable-muxer=mxv --disable-encoders --enable-encoder=webvtt --enable-encoder=srt --enable-libmp3lame --enable-encoder=libmp3lame --enable-encoder=aac --disable-mmx --disable-mmxext --disable-inline-asm --enable-libmodplug --enable-libopus --enable-libspeex --enable-libzvbi --enable-openssl --enable-zlib --enable-libxml2 --enable-libsmb2 --enable-jni --enable-usb --enable-libdav1d --cc='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -target x86_64-none-linux-android21' --cxx='/Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -target x86_64-none-linux-android21' --extra-cflags='-mtune=atom -msse3 -mssse3 -mfpmath=sse -fstrict-aliasing -fstack-protector-strong -Wno-deprecated-declarations -Wno-unused-variable -Wno-unused-function -I../lame-3.100 -I../modified_src/iconv -I../modified_src/mxv -I../modified_src/mxd -I../modified_src/usb -idirafter../zvbi-0.2.35/src -I../openssl-1.0.2s/include -I../opus-1.1/include -I../speex-1.2rc1/include -I../libmodplug/src -I../libxml2/include -I../libsmb2/include -I../dav1d/include -DNDEBUG -DMXTECHS -DFF_API_AVPICTURE=1 -DCONFIG_MXV_FROM_MXVP=1 -DMXD_BUILTIN -ftree-vectorize -ffunction-sections -funwind-tables -fomit-frame-pointer -no-canonical-prefixes -pipe --sysroot /Users/jenkins/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot' --extra-libs=' -L../libs/x86_64 -lmxutil -lm -lc++_shared' --extra-ldflags= --optflags='-O2 -fPIC'
Loading

0 comments on commit 12641ae

Please sign in to comment.