Removed neon FFmpeg binary to change sdk size

cropsly · Apr 19, 2016 · 62ca722 · 62ca722
1 parent fed2578
commit 62ca722
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg
diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java
@@ -3,9 +3,8 @@
 import android.text.TextUtils;
 
 enum CpuArch {
-    x86("1b3daf0402c38ec0019ec436d71a1389514711bd"),
-    ARMv7("e27cf3c432b121896fc8af2d147eff88d3074dd5"),
-    ARMv7_NEON("9463c40e898c53dcac59b8ba39cfd590e2f1b1bf"),
+    x86("0dd4dbad305ff197a1ea9e6158bd2081d229e70e"),
+    ARMv7("871888959ba2f063e18f56272d0d98ae01938ceb"),
     NONE(null);
 
     private String sha1;

diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java
@@ -17,9 +17,6 @@ static CpuArch getCpuArch() {
                 // check if device is arm v7
                 if (cpuNativeArchHelper.isARM_v7_CPU(archInfo)) {
                     // check if device is neon
-                    if (cpuNativeArchHelper.isNeonSupported(archInfo)) {
-                        return CpuArch.ARMv7_NEON;
-                    }
                     return CpuArch.ARMv7;
                 }
                 // check if device is arm64 which is supported by ARMV7
@@ -41,7 +38,7 @@ static String getx86_64CpuAbi() {
     static String getArm64CpuAbi() {
         return "arm64-v8a";
     }
-    
+
     static String getArmeabiv7CpuAbi() {
         return "armeabi-v7a";
     }

diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java
@@ -45,10 +45,6 @@ public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseH
                 Log.i("Loading FFmpeg for armv7 CPU");
                 cpuArchNameFromAssets = "armeabi-v7a";
                 break;
-            case ARMv7_NEON:
-                Log.i("Loading FFmpeg for armv7-neon CPU");
-                cpuArchNameFromAssets = "armeabi-v7a-neon";
-                break;
             case NONE:
                 throw new FFmpegNotSupportedException("Device not supported");
         }