File tree Expand file tree Collapse file tree 4 files changed +3
-11
lines changed
src/main/java/com/github/hiteshsondhi88/libffmpeg Expand file tree Collapse file tree 4 files changed +3
-11
lines changed Original file line number Diff line number Diff line change 33import android .text .TextUtils ;
44
55enum CpuArch {
6- x86 ("1b3daf0402c38ec0019ec436d71a1389514711bd" ),
7- ARMv7 ("e27cf3c432b121896fc8af2d147eff88d3074dd5" ),
8- ARMv7_NEON ("9463c40e898c53dcac59b8ba39cfd590e2f1b1bf" ),
6+ x86 ("0dd4dbad305ff197a1ea9e6158bd2081d229e70e" ),
7+ ARMv7 ("871888959ba2f063e18f56272d0d98ae01938ceb" ),
98 NONE (null );
109
1110 private String sha1 ;
Original file line number Diff line number Diff line change @@ -17,9 +17,6 @@ static CpuArch getCpuArch() {
1717 // check if device is arm v7
1818 if (cpuNativeArchHelper .isARM_v7_CPU (archInfo )) {
1919 // check if device is neon
20- if (cpuNativeArchHelper .isNeonSupported (archInfo )) {
21- return CpuArch .ARMv7_NEON ;
22- }
2320 return CpuArch .ARMv7 ;
2421 }
2522 // check if device is arm64 which is supported by ARMV7
@@ -41,7 +38,7 @@ static String getx86_64CpuAbi() {
4138 static String getArm64CpuAbi () {
4239 return "arm64-v8a" ;
4340 }
44-
41+
4542 static String getArmeabiv7CpuAbi () {
4643 return "armeabi-v7a" ;
4744 }
Original file line number Diff line number Diff line change @@ -45,10 +45,6 @@ public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseH
4545 Log .i ("Loading FFmpeg for armv7 CPU" );
4646 cpuArchNameFromAssets = "armeabi-v7a" ;
4747 break ;
48- case ARMv7_NEON :
49- Log .i ("Loading FFmpeg for armv7-neon CPU" );
50- cpuArchNameFromAssets = "armeabi-v7a-neon" ;
51- break ;
5248 case NONE :
5349 throw new FFmpegNotSupportedException ("Device not supported" );
5450 }
You can’t perform that action at this time.
0 commit comments