File tree 4 files changed +3
-11
lines changed
src/main/java/com/github/hiteshsondhi88/libffmpeg 4 files changed +3
-11
lines changed Original file line number Diff line number Diff line change 3
3
import android .text .TextUtils ;
4
4
5
5
enum CpuArch {
6
- x86 ("1b3daf0402c38ec0019ec436d71a1389514711bd" ),
7
- ARMv7 ("e27cf3c432b121896fc8af2d147eff88d3074dd5" ),
8
- ARMv7_NEON ("9463c40e898c53dcac59b8ba39cfd590e2f1b1bf" ),
6
+ x86 ("0dd4dbad305ff197a1ea9e6158bd2081d229e70e" ),
7
+ ARMv7 ("871888959ba2f063e18f56272d0d98ae01938ceb" ),
9
8
NONE (null );
10
9
11
10
private String sha1 ;
Original file line number Diff line number Diff line change @@ -17,9 +17,6 @@ static CpuArch getCpuArch() {
17
17
// check if device is arm v7
18
18
if (cpuNativeArchHelper .isARM_v7_CPU (archInfo )) {
19
19
// check if device is neon
20
- if (cpuNativeArchHelper .isNeonSupported (archInfo )) {
21
- return CpuArch .ARMv7_NEON ;
22
- }
23
20
return CpuArch .ARMv7 ;
24
21
}
25
22
// check if device is arm64 which is supported by ARMV7
@@ -41,7 +38,7 @@ static String getx86_64CpuAbi() {
41
38
static String getArm64CpuAbi () {
42
39
return "arm64-v8a" ;
43
40
}
44
-
41
+
45
42
static String getArmeabiv7CpuAbi () {
46
43
return "armeabi-v7a" ;
47
44
}
Original file line number Diff line number Diff line change @@ -45,10 +45,6 @@ public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseH
45
45
Log .i ("Loading FFmpeg for armv7 CPU" );
46
46
cpuArchNameFromAssets = "armeabi-v7a" ;
47
47
break ;
48
- case ARMv7_NEON :
49
- Log .i ("Loading FFmpeg for armv7-neon CPU" );
50
- cpuArchNameFromAssets = "armeabi-v7a-neon" ;
51
- break ;
52
48
case NONE :
53
49
throw new FFmpegNotSupportedException ("Device not supported" );
54
50
}
You can’t perform that action at this time.
0 commit comments