Skip to content

Commit

Permalink
v1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@wseemann
wseemann committed Jun 3, 2016
1 parent 7f616ec commit dcb407d
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 35 deletions.
12 changes: 12 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -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
12 changes: 10 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------
Expand Down Expand Up @@ -151,7 +159,7 @@ Sample code:

FFmpeg
-----------
This software uses code of <a href=http://ffmpeg.org>FFmpeg</a> licensed under the <a href=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>LGPLv2.1</a> and its source can be downloaded <a href=https://github.com/wseemann/FFmpegMediaPlayer/blob/master/fmp-library/ffmpeg-2.1-android-2013-11-13.tar.gz>here</a>.
This software uses code from <a href=http://ffmpeg.org>FFmpeg</a> licensed under the <a href=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>LGPLv2.1</a> and its source can be downloaded <a href=https://github.com/wseemann/FFmpegMediaPlayer/blob/master/fmp-library/ffmpeg-2.1-android-2013-11-13.tar.gz>here</a>. It also uses code from <a href=https://www.libsdl.org>SDL</a> licensed under the <a href=http://www.gzip.org/zlib/zlib_license.html>zlib license</a>.

License
------------
Expand Down
2 changes: 1 addition & 1 deletion gradle/fmp-library/fmp-demo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {

defaultConfig {
applicationId "wseemann.media.fmpdemo"
minSdkVersion 9
minSdkVersion 12
targetSdkVersion 23
versionCode 1
versionName "1.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/fmp-library/fmp-demo/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:versionName="1.0">

<uses-sdk
android:minSdkVersion="9"
android:minSdkVersion="12"
android:targetSdkVersion="21" />

<uses-permission android:name="android.permission.BROADCAST_STICKY" />
Expand Down
26 changes: 13 additions & 13 deletions gradle/fmp-library/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
signing.keyId=94F92DAB
signing.password=Xxxxxxxx55
signing.secretKeyRingFile=/Users/wseemann/.gnupg/secring.gpg
17 changes: 12 additions & 5 deletions gradle/fmp-library/library/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}

Expand Down
8 changes: 1 addition & 7 deletions gradle/fmp-library/library/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="wseemann.media.ffmpegmediaplayer"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="19" />
package="wseemann.media.ffmpegmediaplayer">

</manifest>
6 changes: 3 additions & 3 deletions gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions gradle/fmp-library/library/src/main/ffmpeg/build_ffmpeg_with_ssl.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down

2 comments on commit dcb407d

@idsulik
Copy link

@idsulik idsulik commented on dcb407d Jun 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wseemann Thank you for this awesome lib, but why android:minSdkVersion="12" ?

@wseemann
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The app uses OpenSLES for audio playback and NativeWindow for video playback, both require API 12+

Please sign in to comment.