diff --git a/README.md b/README.md index 38652385..fac97405 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Overview FFmpegMediaMetadataRetriever is a reimplementation of Android's MediaMetadataRetriever class. The FFmpegMediaMetadataRetriever class provides a unified interface for retrieving frame and meta data from an input media file and uses FFmpeg as its backend. Key Features: -* ARM, ARMv7, x86, x86_64 and MIPS support +* ARM, ARMv7, x86, x86_64, MIPS and ARM_64 support * Support for API 12+ * URL support (Unlike MediaMetadataRetriever, see: http://code.google.com/p/android/issues/detail?id=35794) @@ -39,12 +39,12 @@ Using FMMR in your application (Android Studio) Add the following maven dependency to your project's `build.gradle` file: dependencies { - compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.12' + compile 'com.github.wseemann:FFmpegMediaMetadataRetriever:1.0.13' } or, if your application supports individual architectures extract the appropriate AAR file into you projects "libs" folder: -[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.12/prebuilt-aars.zip) +[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.13/prebuilt-aars.zip) (with HTTPS support) @@ -61,7 +61,7 @@ Installation FFmpegMediaMetadataRetriever relies on FFmpeg and native code. The build process is complex and may be confusing for those unfamiliar the Android NDK. For this reason I've precompiled AARs created by the build process and checked them -in [here] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.11/prebuilt-aars.zip). +in [here] (https://github.com/wseemann/FFmpegMediaMetadataRetriever/releases/download/v1.0.13/prebuilt-aars.zip). The modules are also included with the library. If you don't want to build the modules you can simple unzip the prebuilt ones and copy them to your projects "libs" folder. (Note: copy them to YOUR projects "libs" folder, NOT the "libs" folder located in diff --git a/gradle/fmmr-library/gradle.properties b/gradle/fmmr-library/gradle.properties index c00e8d90..613c28e4 100644 --- a/gradle/fmmr-library/gradle.properties +++ b/gradle/fmmr-library/gradle.properties @@ -20,8 +20,8 @@ POM_NAME=FFmpegMediaMetadataRetriever POM_ARTIFACT_ID=FFmpegMediaMetadataRetriever POM_PACKAGING=aar -VERSION_NAME=1.0.12 -VERSION_CODE=13 +VERSION_NAME=1.0.13 +VERSION_CODE=14 GROUP=com.github.wseemann POM_DESCRIPTION=FFmpegMediaMetadataRetriever library @@ -42,5 +42,5 @@ SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2 signing.keyId=94F92DAB -signing.password=Xxxxxxx55 +signing.password=Xxxxxxxx55 signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg \ No newline at end of file diff --git a/gradle/fmmr-library/library/build.gradle b/gradle/fmmr-library/library/build.gradle index 46bf2e62..8753f1d3 100644 --- a/gradle/fmmr-library/library/build.gradle +++ b/gradle/fmmr-library/library/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.library' android { android.packageBuildConfig = false - compileSdkVersion 23 + compileSdkVersion 25 buildToolsVersion "21.1.2" def mkfile = "NDK_APPLICATION_MK=Application.mk" @@ -29,10 +29,11 @@ android { defaultConfig { minSdkVersion 12 - targetSdkVersion 23 - versionCode 13 - versionName "1.0.12" + targetSdkVersion 25 + versionCode 14 + versionName "1.0.13" } + buildTypes { release { //minifyEnabled false diff --git a/gradle/fmmr-library/library/src/main/jni/ARM_64Application.mk b/gradle/fmmr-library/library/src/main/jni/ARM_64Application.mk index f7dc2f3e..5f5cea70 100644 --- a/gradle/fmmr-library/library/src/main/jni/ARM_64Application.mk +++ b/gradle/fmmr-library/library/src/main/jni/ARM_64Application.mk @@ -1,3 +1,3 @@ # build with android-ndk-r9 -APP_ABI := arm64 +APP_ABI := arm64-v8a