Skip to content

Commit 82b2533

Browse files
debuglydebugly
committed
android add soudtouch
1 parent 28d6004 commit 82b2533

File tree

2 files changed

+65
-42
lines changed

2 files changed

+65
-42
lines changed

‎.github/workflows/install-dependencies.sh‎

Lines changed: 44 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,56 @@ case $LIB_NAME in
3737
;;
3838
ffmpeg7)
3939
if [[ $PLAT == all ]];then
40-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p ios
41-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p tvos
42-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p macos
43-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p android
40+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p ios
41+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p tvos
42+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p macos
43+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p android
4444
elif [[ $PLAT == apple ]];then
45-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p ios
46-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p tvos
47-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p macos
45+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p ios
46+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p tvos
47+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p macos
4848
else
49-
./main.sh install -l 'openssl3 opus dav1d dvdnav uavs3d smb2 bluray' -p $PLAT
49+
./main.sh install -l 'openssl3 opus bluray dav1d dvdnav uavs3d smb2' -p $PLAT
50+
fi
51+
52+
if [[ $PLAT == android ]];then
53+
./main.sh install -l 'soundtouch' -p android
5054
fi
5155
;;
5256
ffmpeg6)
5357
if [[ $PLAT == all ]];then
54-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p ios
55-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p tvos
56-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p macos
57-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p android
58+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p ios
59+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p tvos
60+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p macos
61+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p android
5862
elif [[ $PLAT == apple ]];then
59-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p ios
60-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p tvos
61-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p macos
63+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p ios
64+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p tvos
65+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p macos
6266
else
63-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d smb2 bluray' -p $PLAT
67+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d smb2' -p $PLAT
68+
fi
69+
70+
if [[ $PLAT == android ]];then
71+
./main.sh install -l 'soundtouch' -p android
6472
fi
6573
;;
6674
ffmpeg5)
6775
if [[ $PLAT == all ]];then
68-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p ios
69-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p tvos
70-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p macos
71-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p android
76+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p ios
77+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p tvos
78+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p macos
79+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p android
7280
elif [[ $PLAT == apple ]];then
73-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p ios
74-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p tvos
75-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p macos
81+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p ios
82+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p tvos
83+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p macos
7684
else
77-
./main.sh install -l 'openssl3 opus dav1d dvdread uavs3d bluray' -p $PLAT
85+
./main.sh install -l 'openssl3 opus bluray dav1d dvdread uavs3d' -p $PLAT
86+
fi
87+
88+
if [[ $PLAT == android ]];then
89+
./main.sh install -l 'soundtouch' -p android
7890
fi
7991
;;
8092
ffmpeg4)
@@ -90,6 +102,10 @@ case $LIB_NAME in
90102
else
91103
./main.sh install -l 'openssl3 opus bluray' -p $PLAT
92104
fi
105+
106+
if [[ $PLAT == android ]];then
107+
./main.sh install -l 'soundtouch' -p android
108+
fi
93109
;;
94110
ijkffmpeg)
95111
if [[ $PLAT == all ]];then
@@ -104,6 +120,10 @@ case $LIB_NAME in
104120
else
105121
./main.sh install -l 'openssl' -p $PLAT
106122
fi
123+
124+
if [[ $PLAT == android ]];then
125+
./main.sh install -l 'soundtouch' -p android
126+
fi
107127
;;
108128
fftutorial)
109129
if [[ $PLAT == all ]];then

‎README.md‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,14 @@ At present MRFFToolChain contained `ass、bluray、dav1d、dvdread、dvdnav、ff
3333
- dvdnav: dvdread
3434
- Ass for Appple: harfbuzz,fribidi,unibreak
3535
- Ass for Android: harfbuzz,fribidi,unibreak,fontconfig
36-
- FFmpeg for Appple: openssl3,opus,dav1d,dvdread,uavs3d,smb2
37-
- FFmpeg for Android: openssl,opus,dav1d,dvdread,uavs3d,smb2
38-
- FFmpeg7 for Appple: openssl3,opus,dav1d,dvdnav,uavs3d,smb2
36+
- FFmpeg4 for Appple: openssl3,opus,bluray
37+
- FFmpeg5 for Appple: openssl3,opus,bluray,dav1d,dvdread,uavs3d
38+
- FFmpeg6 for Appple: openssl3,opus,bluray,dav1d,dvdread,uavs3d,smb2
39+
- FFmpeg7 for Appple: openssl3,opus,bluray,dav1d,dvdnav,uavs3d,smb2
40+
- FFmpeg4 for Android: openssl3,opus,bluray,soundtouch
41+
- FFmpeg5 for Android: openssl3,opus,bluray,dav1d,dvdread,uavs3d,soundtouch
42+
- FFmpeg6 for Android: openssl3,opus,bluray,dav1d,dvdread,uavs3d,smb2,soundtouch
43+
- FFmpeg7 for Android: openssl3,opus,bluray,dav1d,dvdnav,uavs3d,smb2,soundtouch
3944

4045
Tips:
4146

@@ -58,8 +63,7 @@ These pre-compiled libraries already applied patches which in the patches direct
5863
# Examples of usage:
5964
./main.sh install -p macos -l ffmpeg
6065
./main.sh install -p ios -l 'ass ffmpeg'
61-
./main.sh install -p tvos -l all
62-
./main.sh install -p android -l all
66+
./main.sh install -p android -l openssl3
6367
```
6468

6569
## Compile by Yourself
@@ -74,14 +78,10 @@ The script parameters are flexible and can be combined as needed. Here are some
7478
```
7579
# Check the help first
7680
./main.sh init --help
77-
# Prepare source code for all libraries for the iOS platform
78-
./main.sh init -p ios -l all
79-
# Prepare source code for all libraries for the x86 architecture on iOS
80-
./main.sh init -p ios -l all -a x86_64_simulator
81-
# Prepare source code for all libraries for the macOS platform
82-
./main.sh init -p macos -l all
83-
# Prepare source code for specific libraries for the iOS platform
84-
./main.sh init -p ios -l "openssl ffmpeg"
81+
# Prepare libass source code for the iOS platform
82+
./main.sh init -p ios -l ass
83+
# Prepare ffmpeg7 source code for the x86 architecture on iOS
84+
./main.sh init -p ios -l ffmpeg7 -a x86_64_simulator
8585
# Prepare source code for specific libraries for the Android platform
8686
./main.sh init -p android -l "openssl ffmpeg"
8787
```
@@ -100,13 +100,16 @@ Once the source code repository initialization is complete, you can start the co
100100
# -a specifies the CPU architecture
101101
```
102102

103-
Examples of usage:
103+
The following code demonstrates how to compile FFmpeg 7 for the iOS platform：
104104

105105
```
106-
Compile all dependencies for the iOS platform
107-
./main.sh compile -c build -p ios -l all
108-
# Compile the libass library for the arm64 architecture on iOS
109-
./main.sh compile -c build -p ios -a arm64 -l ass
106+
# install FFmpeg7's dependencies has two choices
107+
# recommend choice (because ffmpeg7 was pre-compiled,it contained all dependencies)
108+
./main.sh install -p ios -l ffmpeg7
109+
# other choice (you must know ffmpeg7's dependent lib name)
110+
./main.sh install -p ios -l "openssl3 opus bluray dav1d dvdnav uavs3d,smb2"
111+
# Compile FFmpeg7 for the arm64 architecture on iOS
112+
./main.sh compile -p ios -a arm64 -l ffmepg7 --skip-fmwk
110113
```
111114

112115
The order of these parameters does not matter; they can be arranged in any sequence.

0 commit comments

Comments
 (0)