diff --git a/.gitignore b/.gitignore
index e43b0f98..a7134ef3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,13 @@
.DS_Store
+
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
diff --git a/README.md b/README.md
index d1e4f586..c5126414 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,15 @@ Additional support for:
Using FMP in your application (Android Studio)
------------
-[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaPlayer/releases/download/v1.0.1/prebuilt-aars.zip)
+Add the following maven dependency to your project's `build.gradle` file:
+
+ dependencies {
+ compile 'com.github.wseemann:FFmpegMediaPlayer:1.0.2'
+ }
+
+or, if your application supports individual architectures extract the appropriate AAR file into you projects "libs" folder:
+
+[Prebuilt AARs] (https://github.com/wseemann/FFmpegMediaPlayer/releases/download/v1.0.2/prebuilt-aars.zip)
Demo Application
------------
@@ -151,7 +159,7 @@ Sample code:
FFmpeg
-----------
-This software uses code of FFmpeg licensed under the LGPLv2.1 and its source can be downloaded here.
+This software uses code from FFmpeg licensed under the LGPLv2.1 and its source can be downloaded here. It also uses code from SDL licensed under the zlib license.
License
------------
diff --git a/gradle/fmp-library/fmp-demo/build.gradle b/gradle/fmp-library/fmp-demo/build.gradle
index 9680618f..30f3edb5 100644
--- a/gradle/fmp-library/fmp-demo/build.gradle
+++ b/gradle/fmp-library/fmp-demo/build.gradle
@@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "wseemann.media.fmpdemo"
- minSdkVersion 9
+ minSdkVersion 12
targetSdkVersion 23
versionCode 1
versionName "1.0"
diff --git a/gradle/fmp-library/fmp-demo/src/main/AndroidManifest.xml b/gradle/fmp-library/fmp-demo/src/main/AndroidManifest.xml
index 059d310f..e4b1290e 100644
--- a/gradle/fmp-library/fmp-demo/src/main/AndroidManifest.xml
+++ b/gradle/fmp-library/fmp-demo/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
android:versionName="1.0">
diff --git a/gradle/fmp-library/gradle.properties b/gradle/fmp-library/gradle.properties
index bcead381..dc818bdf 100644
--- a/gradle/fmp-library/gradle.properties
+++ b/gradle/fmp-library/gradle.properties
@@ -17,30 +17,30 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-POM_NAME=FFmpegMediaMetadataRetriever
-POM_ARTIFACT_ID=FFmpegMediaMetadataRetriever
+POM_NAME=FFmpegMediaPlayer
+POM_ARTIFACT_ID=FFmpegMediaPlayer
POM_PACKAGING=aar
-VERSION_NAME=1.0.0
-VERSION_CODE=1
+VERSION_NAME=1.0.2
+VERSION_CODE=3
GROUP=com.github.wseemann
POM_DESCRIPTION=Foo library
-POM_URL=https://github.com/wseemann/FFmpegMediaMetadataRetriever
-POM_SCM_URL=https://github.com/wseemann/FFmpegMediaMetadataRetriever
-POM_SCM_CONNECTION=scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever
-POM_SCM_DEV_CONNECTION=scm:hg:https://github.com/wseemann/FFmpegMediaMetadataRetriever
+POM_URL=https://github.com/wseemann/FFmpegMediaPlayer
+POM_SCM_URL=https://github.com/wseemann/FFmpegMediaPlayer
+POM_SCM_CONNECTION=scm:hg:https://github.com/wseemann/FFmpegMediaPlayer
+POM_SCM_DEV_CONNECTION=scm:hg:https://github.com/wseemann/FFmpegMediaPlayer
POM_LICENCE_NAME=Apache License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=wseemann
POM_DEVELOPER_NAME=wseemann
-USERNAME=xxx
-PASSWORD=xxx
+USERNAME=wseemann
+PASSWORD=xxxxxxxx#6
SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots
RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2
-signing.keyId=xxx
-signing.password=xxx
-signing.secretKeyRingFile=/Users/xxx/.gnupg/secring.gpg
\ No newline at end of file
+signing.keyId=94F92DAB
+signing.password=Xxxxxxxx55
+signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
\ No newline at end of file
diff --git a/gradle/fmp-library/library/build.gradle b/gradle/fmp-library/library/build.gradle
index 6e0ff97a..ea9c8ee9 100644
--- a/gradle/fmp-library/library/build.gradle
+++ b/gradle/fmp-library/library/build.gradle
@@ -4,31 +4,37 @@ android {
android.packageBuildConfig = false
compileSdkVersion 23
- buildToolsVersion "21.1.2"
+ buildToolsVersion "23.0.2"
def mkfile = "NDK_APPLICATION_MK=Application.mk"
def aarname = "all-fmp"
+ def platform = "TARGET_PLATFORM=android-21"
//def mkfile = "NDK_APPLICATION_MK=ARMApplication.mk"
//def aarname = "arm-fmp"
+ //def platform = "TARGET_PLATFORM=android-12"
//def mkfile = "NDK_APPLICATION_MK=ARMv7Application.mk"
//def aarname = "armv7-fmp"
+ //def platform = "TARGET_PLATFORM=android-12"
//def mkfile = "NDK_APPLICATION_MK=x86Application.mk"
//def aarname = "x86-fmp"
+ //def platform = "TARGET_PLATFORM=android-12"
//def mkfile = "NDK_APPLICATION_MK=MIPSApplication.mk"
//def aarname = "mips-fmp"
+ //def platform = "TARGET_PLATFORM=android-12"
//def mkfile = "NDK_APPLICATION_MK=x86_64Application.mk"
//def aarname = "x86_64-fmmr"
+ //def platform = "TARGET_PLATFORM=android-21"
defaultConfig {
- minSdkVersion 9
+ minSdkVersion 12
targetSdkVersion 23
- versionCode 1
- versionName "1.0.0"
+ versionCode 3
+ versionName "1.0.2"
}
buildTypes {
release {
@@ -49,10 +55,11 @@ android {
task buildNative(type: Exec, description: 'Compile JNI source via NDK') {
def ndkDir = android.ndkDirectory
commandLine "$ndkDir/ndk-build",
+ mkfile,
'-C', file('src/main/jni').absolutePath, // Change src/main/jni the relative path to your jni source
'-j', Runtime.runtime.availableProcessors(),
'all',
- 'TARGET_PLATFORM=android-21'
+ platform
'NDK_DEBUG=1'
}
diff --git a/gradle/fmp-library/library/src/main/AndroidManifest.xml b/gradle/fmp-library/library/src/main/AndroidManifest.xml
index e3eb918d..7bdde82b 100644
--- a/gradle/fmp-library/library/src/main/AndroidManifest.xml
+++ b/gradle/fmp-library/library/src/main/AndroidManifest.xml
@@ -1,10 +1,4 @@
-
-
+ package="wseemann.media.ffmpegmediaplayer">
\ No newline at end of file
diff --git a/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg.sh b/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg.sh
index 85602e06..82ca24e2 100755
--- a/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg.sh
+++ b/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg.sh
@@ -15,7 +15,7 @@ set -e
export TARGET=$1
ARM_PLATFORM=$NDK/platforms/android-9/arch-arm/
-ARM_PREBUILT=$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/darwin-x86_64
+ARM_PREBUILT=$NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64
ARM64_PLATFORM=$NDK/platforms/android-21/arch-arm64/
ARM64_PREBUILT=$NDK/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64
@@ -27,11 +27,11 @@ X86_64_PLATFORM=$NDK/platforms/android-21/arch-x86_64/
X86_64_PREBUILT=$NDK/toolchains/x86_64-4.9/prebuilt/darwin-x86_64
MIPS_PLATFORM=$NDK/platforms/android-9/arch-mips/
-MIPS_PREBUILT=$NDK/toolchains/mipsel-linux-android-4.8/prebuilt/darwin-x86_64
+MIPS_PREBUILT=$NDK/toolchains/mipsel-linux-android-4.9/prebuilt/darwin-x86_64
BUILD_DIR=`pwd`/ffmpeg-android
-FFMPEG_VERSION="2.8.1"
+FFMPEG_VERSION="3.0.1"
if [ ! -e "ffmpeg-${FFMPEG_VERSION}.tar.bz2" ]; then
echo "Downloading ffmpeg-${FFMPEG_VERSION}.tar.bz2"
diff --git a/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg_with_ssl.sh b/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg_with_ssl.sh
index 41e5e164..440b81ad 100755
--- a/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg_with_ssl.sh
+++ b/gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg_with_ssl.sh
@@ -37,7 +37,7 @@ if [ $TARGET == 'arm' ]; then
fi
ARM_PLATFORM=$NDK/platforms/android-9/arch-arm/
-ARM_PREBUILT=$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/darwin-x86_64
+ARM_PREBUILT=$NDK/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64
ARM64_PLATFORM=$NDK/platforms/android-21/arch-arm64/
ARM64_PREBUILT=$NDK/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64
@@ -49,11 +49,11 @@ X86_64_PLATFORM=$NDK/platforms/android-21/arch-x86_64/
X86_64_PREBUILT=$NDK/toolchains/x86_64-4.9/prebuilt/darwin-x86_64
MIPS_PLATFORM=$NDK/platforms/android-9/arch-mips/
-MIPS_PREBUILT=$NDK/toolchains/mipsel-linux-android-4.8/prebuilt/darwin-x86_64
+MIPS_PREBUILT=$NDK/toolchains/mipsel-linux-android-4.9/prebuilt/darwin-x86_64
BUILD_DIR=`pwd`/ffmpeg-android
-FFMPEG_VERSION="2.8.1"
+FFMPEG_VERSION="3.0.1"
if [ ! -e "ffmpeg-${FFMPEG_VERSION}.tar.bz2" ]; then
echo "Downloading ffmpeg-${FFMPEG_VERSION}.tar.bz2"