diff --git a/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg deleted file mode 100755 index 64f93b2..0000000 Binary files a/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg and /dev/null differ diff --git a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg old mode 100755 new mode 100644 index 5443761..036bf6f Binary files a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg and b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg differ diff --git a/FFmpegAndroid/assets/x86/ffmpeg b/FFmpegAndroid/assets/x86/ffmpeg old mode 100755 new mode 100644 index 723ab3d..b9fbba9 Binary files a/FFmpegAndroid/assets/x86/ffmpeg and b/FFmpegAndroid/assets/x86/ffmpeg differ diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java index 5a19b61..6a04526 100644 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java +++ b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java @@ -14,7 +14,7 @@ public void testGetCpuArch() throws Exception { if (Build.CPU_ABI.equals(CpuArchHelper.getx86CpuAbi()) || Build.CPU_ABI.equals(CpuArchHelper.getx86_64CpuAbi())) { assertEquals(cpuArch, CpuArch.x86); } else if (Build.CPU_ABI.equals(CpuArchHelper.getArmeabiv7CpuAbi())) { - assertThat(cpuArch == CpuArch.ARMv7 || cpuArch == CpuArch.ARMv7_NEON).isTrue(); + assertEquals(cpuArch, CpuArch.ARMv7); } else if (Build.CPU_ABI.equals(CpuArchHelper.getArm64CpuAbi())) { assertEquals(cpuArch, CpuArch.ARMv7); }else { diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java index 222d454..88909b6 100644 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java +++ b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java @@ -14,7 +14,6 @@ public class CpuArchTest extends CommonInstrumentationTestCase { public void testFFmpegAssetsWithSha1Sum() { testFFmpegAsset(CpuArch.ARMv7, "armeabi-v7a/ffmpeg"); - testFFmpegAsset(CpuArch.ARMv7_NEON, "armeabi-v7a-neon/ffmpeg"); testFFmpegAsset(CpuArch.x86, "x86/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 index 506e668..5683bf5 100644 --- 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 index ad5c6cb..83b7724 100644 --- 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 index 10effe9..42bc05f 100644 --- 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"); } diff --git a/README.md b/README.md index a2b1bab..c97abaf 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ For examples and usage instructions head over to: ## Sample ![http://i.imgur.com/cP4WhLn.gif](http://i.imgur.com/cP4WhLn.gif) -* [Download APK](https://github.com/writingminds/ffmpeg-android-java/releases/download/v0.2.3/app-debug.apk) +* [Download APK](https://github.com/writingminds/ffmpeg-android-java/releases/download/v0.3/app-debug.apk) ## JavaDoc * [Javadoc](http://writingminds.github.io/ffmpeg-android-java/docs/) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 56a6afb..eab9faa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 17 16:54:04 CDT 2015 +#Tue Apr 19 16:06:40 GMT+05:30 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip