diff --git a/.gitignore b/.gitignore index 5259aba..81e7eac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +FFmpegAndroid + # Created by https://www.gitignore.io ### Java ### @@ -10,7 +12,6 @@ *.jar *.war *.ear -!gradle/wrapper/gradle-wrapper.jar # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* @@ -81,7 +82,7 @@ proguard/ ### Intellij ### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm -*.iml +/*.iml ## Directory-based project format: .idea/ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 963e97c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: android -android: - update_sdk: true - components: - - platform-tools - - tools - - # The BuildTools version used by your project - - build-tools-20.0.0 - - # The SDK version used to compile your project - - android-16 - - android-L - - - sys-img-x86-android-16 - - sys-img-armeabi-v7a-android-16 - -script: - - ./runTests.sh || exit 1 diff --git a/FFmpegAndroid/.gitignore b/FFmpegAndroid/.gitignore deleted file mode 100644 index 758a614..0000000 --- a/FFmpegAndroid/.gitignore +++ /dev/null @@ -1,156 +0,0 @@ -# Created by https://www.gitignore.io - -### Java ### -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - - -### Eclipse ### -*.pydevproject -.metadata -.gradle -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - -# sbteclipse plugin -.target - -# TeXlipse plugin -.texlipse - - -### Android ### -# Built application files -*.apk -*.ap_ - -# Files for the Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm - -/*.iml - -## Directory-based project format: -.idea/ -# if you remove the above rule, at least ignore the follwing: - -# User-specific stuff: -# .idea/workspace.xml -# .idea/tasks.xml -# .idea/dictionaries - -# Sensitive or high-churn files: -# .idea/dataSources.ids -# .idea/dataSources.xml -# .idea/sqlDataSources.xml -# .idea/dynamic.xml -# .idea/uiDesigner.xml - -# Gradle: -# .idea/gradle.xml -# .idea/libraries - -# Mongo Explorer plugin: -# .idea/mongoSettings.xml - -## File-based project format: -*.ipr -*.iws - -## Plugin-specific files: - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml - - -### OSX ### -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear on external disk -.Spotlight-V100 -.Trashes - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - - -### Linux ### -*~ - -# KDE directory preferences -.directory -.gradle diff --git a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg deleted file mode 100644 index 036bf6f..0000000 Binary files a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg and /dev/null differ diff --git a/FFmpegAndroid/assets/x86/ffmpeg b/FFmpegAndroid/assets/x86/ffmpeg deleted file mode 100644 index b9fbba9..0000000 Binary files a/FFmpegAndroid/assets/x86/ffmpeg and /dev/null differ diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle deleted file mode 100644 index c6178c7..0000000 --- a/FFmpegAndroid/build.gradle +++ /dev/null @@ -1,127 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: "com.jfrog.bintray" - -// This is the library version used when deploying the artifact -version = VERSION_NAME - -android { - compileSdkVersion rootProject.ext.compileSdkVersion as Integer - buildToolsVersion rootProject.ext.buildToolsVersion as String - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion as Integer - targetSdkVersion rootProject.ext.targetSdkVersion as Integer - versionCode rootProject.ext.versionCode as Integer - versionName rootProject.ext.versionName as String - } - - sourceSets.main { - assets.srcDirs = ['assets'] - jni.srcDirs = [] //disable automatic ndk-build - jniLibs.srcDirs = ['libs'] - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - - androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0' -} - -group = GROUP - -install { - repositories.mavenInstaller { - // This generates POM.xml with proper parameters - pom { - project { - packaging POM_PACKAGING - - // Add your description here - name 'FFmpeg Android' - description = POM_DESCRIPTION - url POM_URL - - // Set your license - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - } - } - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - email 'hitesh@writingminds.com' - } - } - scm { - connection POM_SCM_URL - developerConnection POM_SCM_URL - url POM_URL - - } - } - } - } -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} -artifacts { - archives javadocJar - archives sourcesJar -} - -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) - -// https://github.com/bintray/gradle-bintray-plugin -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - - configurations = ['archives'] - pkg { - repo = "maven" - // it is the name that appears in bintray when logged - name = "ffmpeg-android" - websiteUrl = POM_URL - vcsUrl = POM_SCM_URL - licenses = ["GPL-3.0"] - publish = true - version { - gpg { - sign = true - passphrase = properties.getProperty("bintray.gpg.password") - } - mavenCentralSync { - sync = true - user = properties.getProperty("bintray.oss.user") //OSS user token - password = properties.getProperty("bintray.oss.password") //OSS user password - close = '1' - } - } - } -} diff --git a/FFmpegAndroid/gradle.properties b/FFmpegAndroid/gradle.properties deleted file mode 100644 index ad72515..0000000 --- a/FFmpegAndroid/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -POM_NAME=FFmpegAndroid Library -POM_ARTIFACT_ID=FFmpegAndroid -POM_PACKAGING=aar diff --git a/FFmpegAndroid/jni/Android.mk b/FFmpegAndroid/jni/Android.mk deleted file mode 100644 index 76018d5..0000000 --- a/FFmpegAndroid/jni/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := ARM_ARCH - -LOCAL_SRC_FILES := armArch.c - -LOCAL_CFLAGS := -DHAVE_NEON=1 -LOCAL_STATIC_LIBRARIES := cpufeatures - -LOCAL_LDLIBS := -llog - -include $(BUILD_SHARED_LIBRARY) -$(call import-module,cpufeatures) diff --git a/FFmpegAndroid/jni/Application.mk b/FFmpegAndroid/jni/Application.mk deleted file mode 100644 index 2655733..0000000 --- a/FFmpegAndroid/jni/Application.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build for arm only -APP_ABI := armeabi armeabi-v7a x86 - -APP_PLATFORM := android-14 \ No newline at end of file diff --git a/FFmpegAndroid/jni/armArch.c b/FFmpegAndroid/jni/armArch.c deleted file mode 100644 index 186b524..0000000 --- a/FFmpegAndroid/jni/armArch.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include -#include - -jstring -Java_com_github_hiteshsondhi88_libffmpeg_ArmArchHelper_cpuArchFromJNI(JNIEnv* env, jobject obj) -{ - // Maximum we need to store here is ARM v7-neon - // Which is 11 char long, so initializing a character array of length 11 - char arch_info[11] = ""; - - // checking if CPU is of ARM family or not - if (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM) { - strcpy(arch_info, "ARM"); - - // checking if CPU is ARM v7 or not - uint64_t cpuFeatures = android_getCpuFeatures(); - if ((cpuFeatures & ANDROID_CPU_ARM_FEATURE_ARMv7) != 0) { - strcat(arch_info, " v7"); - - // checking if CPU is ARM v7 Neon - if((cpuFeatures & ANDROID_CPU_ARM_FEATURE_NEON) != 0) { - strcat(arch_info, "-neon"); - } - } - } - return (*env)->NewStringUTF(env, arch_info); -} diff --git a/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so b/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so deleted file mode 100755 index 9cb83fe..0000000 Binary files a/FFmpegAndroid/libs/armeabi-v7a/libARM_ARCH.so and /dev/null differ diff --git a/FFmpegAndroid/libs/armeabi/libARM_ARCH.so b/FFmpegAndroid/libs/armeabi/libARM_ARCH.so deleted file mode 100755 index d35be9e..0000000 Binary files a/FFmpegAndroid/libs/armeabi/libARM_ARCH.so and /dev/null differ diff --git a/FFmpegAndroid/libs/x86/libARM_ARCH.so b/FFmpegAndroid/libs/x86/libARM_ARCH.so deleted file mode 100755 index 93ebad0..0000000 Binary files a/FFmpegAndroid/libs/x86/libARM_ARCH.so and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so b/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so deleted file mode 100755 index cbb9c3a..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi-v7a/libARM_ARCH.so and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/libcpufeatures.a b/FFmpegAndroid/obj/local/armeabi-v7a/libcpufeatures.a deleted file mode 100644 index 0c538b1..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi-v7a/libcpufeatures.a and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o b/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o deleted file mode 100644 index 89caf50..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o.d b/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o.d deleted file mode 100644 index 0cbcdb5..0000000 --- a/FFmpegAndroid/obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o.d +++ /dev/null @@ -1,76 +0,0 @@ -obj/local/armeabi-v7a/objs/ARM_ARCH/armArch.o: jni/armArch.c \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/jni.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/jni.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h: - -/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h: diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o b/FFmpegAndroid/obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o deleted file mode 100644 index ddcedae..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o.d b/FFmpegAndroid/obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o.d deleted file mode 100644 index e501c36..0000000 --- a/FFmpegAndroid/obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o.d +++ /dev/null @@ -1,176 +0,0 @@ -obj/local/armeabi-v7a/objs/cpufeatures/cpu-features.o: \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.c \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/dlfcn.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/unistd.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/select.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/internal_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/syslimits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/page.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/sigcontext.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/siginfo.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysconf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/capability.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pathconf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pthread.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sched.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/system_properties.h - -/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/dlfcn.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/unistd.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/select.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/internal_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/syslimits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/page.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/sigcontext.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/siginfo.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysconf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/capability.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pathconf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pthread.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sched.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/system_properties.h: diff --git a/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so b/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so deleted file mode 100755 index b39c7aa..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi/libARM_ARCH.so and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi/libcpufeatures.a b/FFmpegAndroid/obj/local/armeabi/libcpufeatures.a deleted file mode 100644 index 9b1e0b6..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi/libcpufeatures.a and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o b/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o deleted file mode 100644 index 638da47..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o.d b/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o.d deleted file mode 100644 index 77c1ea0..0000000 --- a/FFmpegAndroid/obj/local/armeabi/objs/ARM_ARCH/armArch.o.d +++ /dev/null @@ -1,76 +0,0 @@ -obj/local/armeabi/objs/ARM_ARCH/armArch.o: jni/armArch.c \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/jni.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/jni.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h: - -/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h: diff --git a/FFmpegAndroid/obj/local/armeabi/objs/cpufeatures/cpu-features.o b/FFmpegAndroid/obj/local/armeabi/objs/cpufeatures/cpu-features.o deleted file mode 100644 index 6fa9ee6..0000000 Binary files a/FFmpegAndroid/obj/local/armeabi/objs/cpufeatures/cpu-features.o and /dev/null differ diff --git a/FFmpegAndroid/obj/local/armeabi/objs/cpufeatures/cpu-features.o.d b/FFmpegAndroid/obj/local/armeabi/objs/cpufeatures/cpu-features.o.d deleted file mode 100644 index 843d853..0000000 --- a/FFmpegAndroid/obj/local/armeabi/objs/cpufeatures/cpu-features.o.d +++ /dev/null @@ -1,176 +0,0 @@ -obj/local/armeabi/objs/cpufeatures/cpu-features.o: \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.c \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/dlfcn.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno-base.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/unistd.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/select.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/internal_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/syslimits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/page.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/sigcontext.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/siginfo.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/siginfo.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysconf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/capability.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pathconf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pthread.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sched.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/system_properties.h - -/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/cdefs_elf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/android/api-level.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdint.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/_wchar_limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/dlfcn.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/errno-base.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/stddef.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/compiler.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/kernel.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysmacros.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/unistd.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/select.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/internal_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/machine/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/syslimits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/page.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/string.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/malloc.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/sigcontext.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm/siginfo.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/asm-generic/siginfo.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/sysconf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/linux/capability.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pathconf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/pthread.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sched.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdio.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/stdlib.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/alloca.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/strings.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/memory.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-arm/usr/include/sys/system_properties.h: diff --git a/FFmpegAndroid/obj/local/x86/libARM_ARCH.so b/FFmpegAndroid/obj/local/x86/libARM_ARCH.so deleted file mode 100755 index 38269b0..0000000 Binary files a/FFmpegAndroid/obj/local/x86/libARM_ARCH.so and /dev/null differ diff --git a/FFmpegAndroid/obj/local/x86/libcpufeatures.a b/FFmpegAndroid/obj/local/x86/libcpufeatures.a deleted file mode 100644 index 6d37816..0000000 Binary files a/FFmpegAndroid/obj/local/x86/libcpufeatures.a and /dev/null differ diff --git a/FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o b/FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o deleted file mode 100644 index 4cc2ab5..0000000 Binary files a/FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o and /dev/null differ diff --git a/FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o.d b/FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o.d deleted file mode 100644 index d98fb69..0000000 --- a/FFmpegAndroid/obj/local/x86/objs/ARM_ARCH/armArch.o.d +++ /dev/null @@ -1,79 +0,0 @@ -obj/local/x86/objs/ARM_ARCH/armArch.o: jni/armArch.c \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/jni.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/jni.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h: - -/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h: diff --git a/FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o b/FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o deleted file mode 100644 index 23f648a..0000000 Binary files a/FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o and /dev/null differ diff --git a/FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o.d b/FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o.d deleted file mode 100644 index 85a5c85..0000000 --- a/FFmpegAndroid/obj/local/x86/objs/cpufeatures/cpu-features.o.d +++ /dev/null @@ -1,182 +0,0 @@ -obj/local/x86/objs/cpufeatures/cpu-features.o: \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.c \ - /Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/dlfcn.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno-base.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/fcntl.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/unistd.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/select.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/internal_types.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/limits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/syslimits.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page_32.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/signal.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/sigcontext.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/siginfo.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/siginfo.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysconf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/capability.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pathconf.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pthread.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/time.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sched.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h \ - /Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/system_properties.h - -/Users/sb/Documents/android-ndk-r10/sources//android/cpufeatures/cpu-features.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/cdefs_elf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/android/api-level.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdint.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/_wchar_limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/dlfcn.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/errno-base.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/stddef.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/compiler.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/posix_types_32.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/kernel.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysmacros.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/fcntl.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/unistd.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/select.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/internal_types.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/machine/limits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/syslimits.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/page_32.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/string.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/malloc.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/signal.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/sigcontext.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm/siginfo.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/asm-generic/siginfo.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/sysconf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/linux/capability.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pathconf.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/pthread.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/time.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sched.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdio.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/stdlib.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/alloca.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/strings.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/memory.h: - -/Users/sb/Documents/android-ndk-r10/platforms/android-14/arch-x86/usr/include/sys/system_properties.h: diff --git a/FFmpegAndroid/proguard-rules.pro b/FFmpegAndroid/proguard-rules.pro deleted file mode 100644 index bb65c6f..0000000 --- a/FFmpegAndroid/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Applications/Android Studio.app/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonInstrumentationTestCase.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonInstrumentationTestCase.java deleted file mode 100644 index 3b82801..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonInstrumentationTestCase.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.test.InstrumentationTestCase; - -public class CommonInstrumentationTestCase extends InstrumentationTestCase { - - @Override - protected void setUp() throws Exception { - super.setUp(); - Log.setDEBUG(true); - } - -} diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonTestCase.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonTestCase.java deleted file mode 100644 index 02ba61e..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonTestCase.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import junit.framework.TestCase; - -public abstract class CommonTestCase extends TestCase { - - public void setUp() throws Exception { - super.setUp(); - Log.setDEBUG(true); - } - -} diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java deleted file mode 100644 index 6a04526..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.os.Build; - -import junit.framework.TestCase; - -import static org.assertj.core.api.Assertions.assertThat; - -public class CpuArchHelperTest extends TestCase { - - public void testGetCpuArch() throws Exception { - CpuArch cpuArch = CpuArchHelper.getCpuArch(); - assertNotNull(cpuArch); - 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())) { - assertEquals(cpuArch, CpuArch.ARMv7); - } else if (Build.CPU_ABI.equals(CpuArchHelper.getArm64CpuAbi())) { - assertEquals(cpuArch, CpuArch.ARMv7); - }else { - assertEquals(cpuArch, CpuArch.NONE); - } - } -} \ No newline at end of file diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java deleted file mode 100644 index 88909b6..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.content.res.AssetManager; -import android.text.TextUtils; - -import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper; - -import java.io.IOException; -import java.io.InputStream; - -import static org.assertj.core.api.Assertions.assertThat; - -public class CpuArchTest extends CommonInstrumentationTestCase { - - public void testFFmpegAssetsWithSha1Sum() { - testFFmpegAsset(CpuArch.ARMv7, "armeabi-v7a/ffmpeg"); - testFFmpegAsset(CpuArch.x86, "x86/ffmpeg"); - } - - private void testFFmpegAsset(CpuArch cpuArch, String assetsPath) { - AssetManager assetMgr = getInstrumentation().getContext().getResources().getAssets(); - InputStream is = null; - try { - is = assetMgr.open(assetsPath); - String assetSha1Sum = FileUtils.SHA1(is); - assertThat(!TextUtils.isEmpty(cpuArch.getSha1()) - && !TextUtils.isEmpty(assetSha1Sum) - && cpuArch.getSha1().equals(assetSha1Sum)).isTrue(); - } catch (IOException e) { - Log.e(e); - AssertionHelper.assertError("error validating ffmpeg asset "+assetsPath); - } finally { - Util.close(is); - } - - } - -} diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/LogTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/LogTest.java deleted file mode 100644 index 2282ef7..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/LogTest.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper; - -/** - * Trying Logging everything I can Log.java class should never throw any error - */ -public class LogTest extends CommonTestCase { - - private Object[] OBJECTS_TO_TEST = {null, "", "test string", 1, 1.00123, 2.45225747946181e-072}; - private Throwable[] EXCEPTIONS_TO_TEST = {new Exception(), new Exception("Test exception"), new Exception("")}; - - public void testD() throws Exception { - printLog(new PrintLogInterface() { - @Override - public void print(Object obj) throws Exception { - Log.d(obj); - } - - @Override - public void print(Throwable throwable) throws Exception { - Log.d(throwable); - } - }); - } - - public void testW() throws Exception { - printLog(new PrintLogInterface() { - @Override - public void print(Object obj) throws Exception { - Log.w(obj); - } - - @Override - public void print(Throwable throwable) throws Exception { - Log.w(throwable); - } - }); - } - - public void testI() throws Exception { - printLog(new PrintLogInterface() { - @Override - public void print(Object obj) throws Exception { - Log.i(obj); - } - - @Override - public void print(Throwable throwable) throws Exception { - Log.i(throwable); - } - }); - } - - public void testV() throws Exception { - printLog(new PrintLogInterface() { - @Override - public void print(Object obj) throws Exception { - Log.v(obj); - } - - @Override - public void print(Throwable throwable) throws Exception { - Log.v(throwable); - } - }); - } - - public void testE() throws Exception { - printLog(new PrintLogInterface() { - @Override - public void print(Object obj) throws Exception { - Log.e(obj); - } - - @Override - public void print(Throwable throwable) throws Exception { - Log.e(throwable); - } - }); - - for (Object obj : OBJECTS_TO_TEST) { - for (Throwable throwable : EXCEPTIONS_TO_TEST) { - try { - Log.e(obj, throwable); - } catch (Exception e) { - AssertionHelper.assertError("Logging failed for object " + obj + " and throwable " + throwable); - } - } - } - } - - private void printLog(PrintLogInterface printLogInterface) { - for (Object obj : OBJECTS_TO_TEST) { - try { - printLogInterface.print(obj); - } catch (Exception e) { - AssertionHelper.assertError("Logging failed for object "+obj); - } - } - for (Throwable throwable : EXCEPTIONS_TO_TEST) { - try { - printLogInterface.print(throwable); - } catch (Exception e) { - AssertionHelper.assertError("Logging failed for throwable "+throwable); - } - } - } - - private interface PrintLogInterface { - void print(Object obj) throws Exception; - void print(Throwable throwable) throws Exception; - } -} \ No newline at end of file diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/ShellCommandTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/ShellCommandTest.java deleted file mode 100644 index 1f673ba..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/ShellCommandTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import static org.assertj.core.api.Assertions.assertThat; - -public class ShellCommandTest extends CommonTestCase { - - public void testRun() throws Exception { - ShellCommand shellCommand = new ShellCommand(); - final Process process = shellCommand.run(new String[] {"logcat"}); - assertNotNull(process); - assertEquals(false, Util.isProcessCompleted(process)); - - Util.destroyProcess(process); - - ExecutorService executor = Executors.newSingleThreadExecutor(); - - Future future = executor.submit(new Runnable() { - @Override - public void run() { - String errorStream = Util.convertInputStreamToString(process.getErrorStream()); - String inputStream = Util.convertInputStreamToString(process.getInputStream()); - - assertEquals(null, errorStream); - assertEquals(null, inputStream); - } - }); - - try { - future.get(1, TimeUnit.SECONDS); - } catch (TimeoutException e) { - AssertionHelper.assertError("could not destroy process"); - } - - executor.shutdownNow(); - } - - public void testRunWaitFor() throws Exception { - ShellCommand shellCommand = new ShellCommand(); - CommandResult commandResult = shellCommand.runWaitFor(new String[] {"ls"}); - assertNotNull(commandResult); - assertEquals(true, commandResult.success); - assertThat(commandResult.output).isNotEmpty(); - } -} \ No newline at end of file diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/UtilTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/UtilTest.java deleted file mode 100644 index 05fbf9e..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/UtilTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.os.AsyncTask; - -import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper; -import com.github.hiteshsondhi88.libffmpeg.utils.StubInputStream; -import com.github.hiteshsondhi88.libffmpeg.utils.StubOutputStream; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -public class UtilTest extends CommonTestCase { - - public void testIsDebug() throws Exception { - // do nothing for now - } - - public void testCloseInputStream() throws Exception { - StubInputStream stubInputStream = new StubInputStream(); - // initially input stream shouldn't be closed - assertEquals(false, stubInputStream.isClosed()); - - // closing input stream - Util.close(stubInputStream); - - // Input stream should be closed now - assertEquals(true, stubInputStream.isClosed()); - } - - public void testCloseOutputStream() throws Exception { - StubOutputStream stubOutputStream = new StubOutputStream(); - // initially output stream shouldn't be closed - assertEquals(false, stubOutputStream.isClosed()); - - // closing output stream - Util.close(stubOutputStream); - - // Output stream should be closed now - assertEquals(true, stubOutputStream.isClosed()); - } - - public void testConvertInputStreamToString() throws Exception { - String exampleString1 = "Example to provide source to InputStream"; - String exampleString2 = ""; - String exampleString3 = 1+""; - InputStream stream1 = new ByteArrayInputStream(exampleString1.getBytes()); - InputStream stream2 = new ByteArrayInputStream(exampleString2.getBytes()); - InputStream stream3 = new ByteArrayInputStream(exampleString3.getBytes()); - String output1 = Util.convertInputStreamToString(stream1); - String output2 = Util.convertInputStreamToString(stream2); - String output3 = Util.convertInputStreamToString(stream3); - - assertEquals(output1, exampleString1); - assertEquals(output2, exampleString2); - assertEquals(output3, exampleString3); - } - - public void testDestroyProcessAndIsProcessCompleted() throws Exception { - final Process process = Runtime.getRuntime().exec("logcat"); - assertEquals(false, Util.isProcessCompleted(process)); - - Util.destroyProcess(process); - - ExecutorService executor = Executors.newSingleThreadExecutor(); - - Future future = executor.submit(new Runnable() { - @Override - public void run() { - String errorStream = Util.convertInputStreamToString(process.getErrorStream()); - String inputStream = Util.convertInputStreamToString(process.getInputStream()); - - assertEquals(null, errorStream); - assertEquals(null, inputStream); - } - }); - - try { - future.get(1, TimeUnit.SECONDS); - } catch (TimeoutException e) { - AssertionHelper.assertError("could not destroy process"); - } - - executor.shutdownNow(); - } - - public void testKillAsync() throws Exception { - AsyncTask asyncTask = new AsyncTask() { - @Override - protected Void doInBackground(Void... params) { - try { - Log.d("AsyncTask started and putting to sleep"); - Thread.sleep(5000); - Log.d("could not kill AsyncTask"); - AssertionHelper.assertError("could not kill AsyncTask"); - } catch (InterruptedException e) { - Log.d("AsyncTask has been terminated"); - AssertionHelper.assertError("AsyncTask has been terminated"); - } - return null; - } - }; - asyncTask.execute(); - assertEquals(true, Util.killAsync(asyncTask)); - } -} \ No newline at end of file diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/AssertionHelper.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/AssertionHelper.java deleted file mode 100644 index ba702e7..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/AssertionHelper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg.utils; - -import static junit.framework.Assert.assertTrue; - -@SuppressWarnings("unused") -public class AssertionHelper { - - public static void assertError(String message) { - assertTrue(message, false); - } - - public static void assertError() { - assertError(""); - } - - public static void assertOK(String message) { - assertTrue(message, true); - } - - public static void assertOK() { - assertOK(""); - } - -} diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/StubInputStream.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/StubInputStream.java deleted file mode 100644 index d763855..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/StubInputStream.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg.utils; - -import java.io.IOException; -import java.io.InputStream; - -public class StubInputStream extends InputStream { - - private boolean closed = false; - - @Override - public int read() throws IOException { - // Do nothing for now, just need to test if input stream is closed - return 0; - } - - @Override - public void close() throws IOException { - super.close(); - closed = true; - } - - public boolean isClosed() { - return closed; - } -} diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/StubOutputStream.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/StubOutputStream.java deleted file mode 100644 index 121e2dd..0000000 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/utils/StubOutputStream.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg.utils; - -import java.io.IOException; -import java.io.OutputStream; - -public class StubOutputStream extends OutputStream { - - private boolean closed = false; - - @Override - public void write(int oneByte) throws IOException { - // Do nothing for now, just need to test if output stream is closed - } - - @Override - public void close() throws IOException { - super.close(); - closed = true; - } - - public boolean isClosed() { - return closed; - } -} diff --git a/FFmpegAndroid/src/main/AndroidManifest.xml b/FFmpegAndroid/src/main/AndroidManifest.xml deleted file mode 100644 index 91fae4d..0000000 --- a/FFmpegAndroid/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java deleted file mode 100644 index 3936a49..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ArmArchHelper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -class ArmArchHelper { - static { - System.loadLibrary("ARM_ARCH"); - } - - native String cpuArchFromJNI(); - - boolean isARM_v7_CPU(String cpuInfoString) { - return cpuInfoString.contains("v7"); - } - - boolean isNeonSupported(String cpuInfoString) { - // check cpu arch for loading correct ffmpeg lib - return cpuInfoString.contains("-neon"); - } - -} \ No newline at end of file diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.java deleted file mode 100644 index e5625b5..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CommandResult.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -class CommandResult { - final String output; - final boolean success; - - CommandResult(boolean success, String output) { - this.success = success; - this.output = output; - } - - static CommandResult getDummyFailureResponse() { - return new CommandResult(false, ""); - } - - static CommandResult getOutputFromProcess(Process process) { - String output; - if (success(process.exitValue())) { - output = Util.convertInputStreamToString(process.getInputStream()); - } else { - output = Util.convertInputStreamToString(process.getErrorStream()); - } - return new CommandResult(success(process.exitValue()), output); - } - - static boolean success(Integer exitValue) { - return exitValue != null && exitValue == 0; - } - -} \ No newline at end of file diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java deleted file mode 100644 index 5683bf5..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.text.TextUtils; - -enum CpuArch { - x86("0dd4dbad305ff197a1ea9e6158bd2081d229e70e"), - ARMv7("871888959ba2f063e18f56272d0d98ae01938ceb"), - NONE(null); - - private String sha1; - - CpuArch(String sha1) { - this.sha1 = sha1; - } - - String getSha1(){ - return sha1; - } - - static CpuArch fromString(String sha1) { - if (!TextUtils.isEmpty(sha1)) { - for (CpuArch cpuArch : CpuArch.values()) { - if (sha1.equalsIgnoreCase(cpuArch.sha1)) { - return cpuArch; - } - } - } - return NONE; - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java deleted file mode 100644 index 83b7724..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.os.Build; - -class CpuArchHelper { - - static CpuArch getCpuArch() { - Log.d("Build.CPU_ABI : " + Build.CPU_ABI); - // check if device is x86 or x86_64 - if (Build.CPU_ABI.equals(getx86CpuAbi()) || Build.CPU_ABI.equals(getx86_64CpuAbi())) { - return CpuArch.x86; - } else { - // check if device is armeabi - if (Build.CPU_ABI.equals(getArmeabiv7CpuAbi())) { - ArmArchHelper cpuNativeArchHelper = new ArmArchHelper(); - String archInfo = cpuNativeArchHelper.cpuArchFromJNI(); - // check if device is arm v7 - if (cpuNativeArchHelper.isARM_v7_CPU(archInfo)) { - // check if device is neon - return CpuArch.ARMv7; - } - // check if device is arm64 which is supported by ARMV7 - } else if (Build.CPU_ABI.equals(getArm64CpuAbi())) { - return CpuArch.ARMv7; - } - } - return CpuArch.NONE; - } - - static String getx86CpuAbi() { - return "x86"; - } - - static String getx86_64CpuAbi() { - return "x86_64"; - } - - static String getArm64CpuAbi() { - return "arm64-v8a"; - } - - static String getArmeabiv7CpuAbi() { - return "armeabi-v7a"; - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java deleted file mode 100644 index 4f7115e..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ExecuteBinaryResponseHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -public class ExecuteBinaryResponseHandler implements FFmpegExecuteResponseHandler { - - @Override - public void onSuccess(String message) { - - } - - @Override - public void onProgress(String message) { - - } - - @Override - public void onFailure(String message) { - - } - - @Override - public void onStart() { - - } - - @Override - public void onFinish() { - - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java deleted file mode 100644 index 42bc05f..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.content.Context; -import android.text.TextUtils; - -import java.lang.reflect.Array; -import java.util.Map; - -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; - -@SuppressWarnings("unused") -public class FFmpeg implements FFmpegInterface { - - private final Context context; - private FFmpegExecuteAsyncTask ffmpegExecuteAsyncTask; - private FFmpegLoadLibraryAsyncTask ffmpegLoadLibraryAsyncTask; - - private static final long MINIMUM_TIMEOUT = 10 * 1000; - private long timeout = Long.MAX_VALUE; - - private static FFmpeg instance = null; - - private FFmpeg(Context context) { - this.context = context.getApplicationContext(); - Log.setDEBUG(Util.isDebug(this.context)); - } - - public static FFmpeg getInstance(Context context) { - if (instance == null) { - instance = new FFmpeg(context); - } - return instance; - } - - @Override - public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) throws FFmpegNotSupportedException { - String cpuArchNameFromAssets = null; - switch (CpuArchHelper.getCpuArch()) { - case x86: - Log.i("Loading FFmpeg for x86 CPU"); - cpuArchNameFromAssets = "x86"; - break; - case ARMv7: - Log.i("Loading FFmpeg for armv7 CPU"); - cpuArchNameFromAssets = "armeabi-v7a"; - break; - case NONE: - throw new FFmpegNotSupportedException("Device not supported"); - } - - if (!TextUtils.isEmpty(cpuArchNameFromAssets)) { - ffmpegLoadLibraryAsyncTask = new FFmpegLoadLibraryAsyncTask(context, cpuArchNameFromAssets, ffmpegLoadBinaryResponseHandler); - ffmpegLoadLibraryAsyncTask.execute(); - } else { - throw new FFmpegNotSupportedException("Device not supported"); - } - } - - @Override - public void execute(Map environvenmentVars, String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException { - if (ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask.isProcessCompleted()) { - throw new FFmpegCommandAlreadyRunningException("FFmpeg command is already running, you are only allowed to run single command at a time"); - } - if (cmd.length != 0) { - String[] ffmpegBinary = new String[] { FileUtils.getFFmpeg(context, environvenmentVars) }; - String[] command = concatenate(ffmpegBinary, cmd); - ffmpegExecuteAsyncTask = new FFmpegExecuteAsyncTask(command , timeout, ffmpegExecuteResponseHandler); - ffmpegExecuteAsyncTask.execute(); - } else { - throw new IllegalArgumentException("shell command cannot be empty"); - } - } - - public T[] concatenate (T[] a, T[] b) { - int aLen = a.length; - int bLen = b.length; - - @SuppressWarnings("unchecked") - T[] c = (T[]) Array.newInstance(a.getClass().getComponentType(), aLen + bLen); - System.arraycopy(a, 0, c, 0, aLen); - System.arraycopy(b, 0, c, aLen, bLen); - - return c; - } - - @Override - public void execute(String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException { - execute(null, cmd, ffmpegExecuteResponseHandler); - } - - @Override - public String getDeviceFFmpegVersion() throws FFmpegCommandAlreadyRunningException { - ShellCommand shellCommand = new ShellCommand(); - CommandResult commandResult = shellCommand.runWaitFor(new String[] { FileUtils.getFFmpeg(context), "-version" }); - if (commandResult.success) { - return commandResult.output.split(" ")[2]; - } - // if unable to find version then return "" to avoid NPE - return ""; - } - - @Override - public String getLibraryFFmpegVersion() { - return context.getString(R.string.shipped_ffmpeg_version); - } - - @Override - public boolean isFFmpegCommandRunning() { - return ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask.isProcessCompleted(); - } - - @Override - public boolean killRunningProcesses() { - return Util.killAsync(ffmpegLoadLibraryAsyncTask) || Util.killAsync(ffmpegExecuteAsyncTask); - } - - @Override - public void setTimeout(long timeout) { - if (timeout >= MINIMUM_TIMEOUT) { - this.timeout = timeout; - } - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java deleted file mode 100644 index 74b028e..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.os.AsyncTask; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.concurrent.TimeoutException; - -class FFmpegExecuteAsyncTask extends AsyncTask { - - private final String[] cmd; - private final FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler; - private final ShellCommand shellCommand; - private final long timeout; - private long startTime; - private Process process; - private String output = ""; - - FFmpegExecuteAsyncTask(String[] cmd, long timeout, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) { - this.cmd = cmd; - this.timeout = timeout; - this.ffmpegExecuteResponseHandler = ffmpegExecuteResponseHandler; - this.shellCommand = new ShellCommand(); - } - - @Override - protected void onPreExecute() { - startTime = System.currentTimeMillis(); - if (ffmpegExecuteResponseHandler != null) { - ffmpegExecuteResponseHandler.onStart(); - } - } - - @Override - protected CommandResult doInBackground(Void... params) { - try { - process = shellCommand.run(cmd); - if (process == null) { - return CommandResult.getDummyFailureResponse(); - } - Log.d("Running publishing updates method"); - checkAndUpdateProcess(); - return CommandResult.getOutputFromProcess(process); - } catch (TimeoutException e) { - Log.e("FFmpeg timed out", e); - return new CommandResult(false, e.getMessage()); - } catch (Exception e) { - Log.e("Error running FFmpeg", e); - } finally { - Util.destroyProcess(process); - } - return CommandResult.getDummyFailureResponse(); - } - - @Override - protected void onProgressUpdate(String... values) { - if (values != null && values[0] != null && ffmpegExecuteResponseHandler != null) { - ffmpegExecuteResponseHandler.onProgress(values[0]); - } - } - - @Override - protected void onPostExecute(CommandResult commandResult) { - if (ffmpegExecuteResponseHandler != null) { - output += commandResult.output; - if (commandResult.success) { - ffmpegExecuteResponseHandler.onSuccess(output); - } else { - ffmpegExecuteResponseHandler.onFailure(output); - } - ffmpegExecuteResponseHandler.onFinish(); - } - } - - private void checkAndUpdateProcess() throws TimeoutException, InterruptedException { - while (!Util.isProcessCompleted(process)) { - // checking if process is completed - if (Util.isProcessCompleted(process)) { - return; - } - - // Handling timeout - if (timeout != Long.MAX_VALUE && System.currentTimeMillis() > startTime + timeout) { - throw new TimeoutException("FFmpeg timed out"); - } - - try { - String line; - BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream())); - while ((line = reader.readLine()) != null) { - if (isCancelled()) { - return; - } - - output += line+"\n"; - publishProgress(line); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - boolean isProcessCompleted() { - return Util.isProcessCompleted(process); - } - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java deleted file mode 100644 index 0c67131..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteResponseHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -public interface FFmpegExecuteResponseHandler extends ResponseHandler { - - /** - * on Success - * @param message complete output of the FFmpeg command - */ - public void onSuccess(String message); - - /** - * on Progress - * @param message current output of FFmpeg command - */ - public void onProgress(String message); - - /** - * on Failure - * @param message complete output of the FFmpeg command - */ - public void onFailure(String message); - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java deleted file mode 100644 index 6f8b76d..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import java.util.Map; - -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; - -@SuppressWarnings("unused") -interface FFmpegInterface { - - /** - * Load binary to the device according to archituecture. This also updates FFmpeg binary if the binary on device have old version. - * @param ffmpegLoadBinaryResponseHandler {@link FFmpegLoadBinaryResponseHandler} - * @throws FFmpegNotSupportedException - */ - public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) throws FFmpegNotSupportedException; - - /** - * Executes a command - * @param environvenmentVars Environment variables - * @param cmd command to execute - * @param ffmpegExecuteResponseHandler {@link FFmpegExecuteResponseHandler} - * @throws FFmpegCommandAlreadyRunningException - */ - public void execute(Map environvenmentVars, String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException; - - /** - * Executes a command - * @param cmd command to execute - * @param ffmpegExecuteResponseHandler {@link FFmpegExecuteResponseHandler} - * @throws FFmpegCommandAlreadyRunningException - */ - public void execute(String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException; - - /** - * Tells FFmpeg version currently on device - * @return FFmpeg version currently on device - * @throws FFmpegCommandAlreadyRunningException - */ - public String getDeviceFFmpegVersion() throws FFmpegCommandAlreadyRunningException; - - /** - * Tells FFmpeg version shipped with current library - * @return FFmpeg version shipped with Library - */ - public String getLibraryFFmpegVersion(); - - /** - * Checks if FFmpeg command is Currently running - * @return true if FFmpeg command is running - */ - public boolean isFFmpegCommandRunning(); - - /** - * Kill Running FFmpeg process - * @return true if process is killed successfully - */ - public boolean killRunningProcesses(); - - /** - * Timeout for FFmpeg process, should be minimum of 10 seconds - * @param timeout in milliseconds - */ - public void setTimeout(long timeout); - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java deleted file mode 100644 index 87cfc9f..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadBinaryResponseHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -public interface FFmpegLoadBinaryResponseHandler extends ResponseHandler { - - /** - * on Fail - */ - public void onFailure(); - - /** - * on Success - */ - public void onSuccess(); - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java deleted file mode 100644 index 6783d28..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegLoadLibraryAsyncTask.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.content.Context; -import android.os.AsyncTask; - -import java.io.File; - -class FFmpegLoadLibraryAsyncTask extends AsyncTask { - - private final String cpuArchNameFromAssets; - private final FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler; - private final Context context; - - FFmpegLoadLibraryAsyncTask(Context context, String cpuArchNameFromAssets, FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) { - this.context = context; - this.cpuArchNameFromAssets = cpuArchNameFromAssets; - this.ffmpegLoadBinaryResponseHandler = ffmpegLoadBinaryResponseHandler; - } - - @Override - protected Boolean doInBackground(Void... params) { - File ffmpegFile = new File(FileUtils.getFFmpeg(context)); - if (ffmpegFile.exists() && isDeviceFFmpegVersionOld() && !ffmpegFile.delete()) { - return false; - } - if (!ffmpegFile.exists()) { - boolean isFileCopied = FileUtils.copyBinaryFromAssetsToData(context, - cpuArchNameFromAssets + File.separator + FileUtils.ffmpegFileName, - FileUtils.ffmpegFileName); - - // make file executable - if (isFileCopied) { - if(!ffmpegFile.canExecute()) { - Log.d("FFmpeg is not executable, trying to make it executable ..."); - if (ffmpegFile.setExecutable(true)) { - return true; - } - } else { - Log.d("FFmpeg is executable"); - return true; - } - } - } - return ffmpegFile.exists() && ffmpegFile.canExecute(); - } - - @Override - protected void onPostExecute(Boolean isSuccess) { - super.onPostExecute(isSuccess); - if (ffmpegLoadBinaryResponseHandler != null) { - if (isSuccess) { - ffmpegLoadBinaryResponseHandler.onSuccess(); - } else { - ffmpegLoadBinaryResponseHandler.onFailure(); - } - ffmpegLoadBinaryResponseHandler.onFinish(); - } - } - - private boolean isDeviceFFmpegVersionOld() { - return CpuArch.fromString(FileUtils.SHA1(FileUtils.getFFmpeg(context))).equals(CpuArch.NONE); - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java deleted file mode 100644 index d59cfa4..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FileUtils.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.content.Context; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Formatter; -import java.util.Map; - -class FileUtils { - - static final String ffmpegFileName = "ffmpeg"; - private static final int DEFAULT_BUFFER_SIZE = 1024 * 4; - private static final int EOF = -1; - - static boolean copyBinaryFromAssetsToData(Context context, String fileNameFromAssets, String outputFileName) { - - // create files directory under /data/data/package name - File filesDirectory = getFilesDirectory(context); - - InputStream is; - try { - is = context.getAssets().open(fileNameFromAssets); - // copy ffmpeg file from assets to files dir - final FileOutputStream os = new FileOutputStream(new File(filesDirectory, outputFileName)); - byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; - - int n; - while(EOF != (n = is.read(buffer))) { - os.write(buffer, 0, n); - } - - Util.close(os); - Util.close(is); - - return true; - } catch (IOException e) { - Log.e("issue in coping binary from assets to data. ", e); - } - return false; - } - - static File getFilesDirectory(Context context) { - // creates files directory under data/data/package name - return context.getFilesDir(); - } - - static String getFFmpeg(Context context) { - return getFilesDirectory(context).getAbsolutePath() + File.separator + FileUtils.ffmpegFileName; - } - - static String getFFmpeg(Context context, Map environmentVars) { - String ffmpegCommand = ""; - if (environmentVars != null) { - for (Map.Entry var : environmentVars.entrySet()) { - ffmpegCommand += var.getKey()+"="+var.getValue()+" "; - } - } - ffmpegCommand += getFFmpeg(context); - return ffmpegCommand; - } - - static String SHA1(String file) { - InputStream is = null; - try { - is = new BufferedInputStream(new FileInputStream(file)); - return SHA1(is); - } catch (IOException e) { - Log.e(e); - } finally { - Util.close(is); - } - return null; - } - - static String SHA1(InputStream is) { - try { - MessageDigest messageDigest = MessageDigest.getInstance("SHA1"); - final byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; - for (int read; (read = is.read(buffer)) != -1; ) { - messageDigest.update(buffer, 0, read); - } - - Formatter formatter = new Formatter(); - // Convert the byte to hex format - for (final byte b : messageDigest.digest()) { - formatter.format("%02x", b); - } - return formatter.toString(); - } catch (NoSuchAlgorithmException e) { - Log.e(e); - } catch (IOException e) { - Log.e(e); - } finally { - Util.close(is); - } - return null; - } -} \ No newline at end of file diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java deleted file mode 100644 index 1c60a34..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/LoadBinaryResponseHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -public class LoadBinaryResponseHandler implements FFmpegLoadBinaryResponseHandler { - - @Override - public void onFailure() { - - } - - @Override - public void onSuccess() { - - } - - @Override - public void onStart() { - - } - - @Override - public void onFinish() { - - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java deleted file mode 100644 index ff3429a..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Log.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -@SuppressWarnings("unused") -class Log { - - private static String TAG = FFmpeg.class.getSimpleName(); - private static boolean DEBUG = false; - - static void setDEBUG(boolean DEBUG) { - Log.DEBUG = DEBUG; - } - - static void setTAG(String tag) { - Log.TAG = tag; - } - - static void d(Object obj) { - if (DEBUG) { - android.util.Log.d(TAG, obj != null ? obj.toString() : null+""); - } - } - - static void e(Object obj) { - if (DEBUG) { - android.util.Log.e(TAG, obj != null ? obj.toString() : null+""); - } - } - - static void w(Object obj) { - if (DEBUG) { - android.util.Log.w(TAG, obj != null ? obj.toString() : null+""); - } - } - - static void i(Object obj) { - if (DEBUG) { - android.util.Log.i(TAG, obj != null ? obj.toString() : null+""); - } - } - - static void v(Object obj) { - if (DEBUG) { - android.util.Log.v(TAG, obj != null ? obj.toString() : null+""); - } - } - - static void e(Object obj, Throwable throwable) { - if (DEBUG) { - android.util.Log.e(TAG, obj != null ? obj.toString() : null+"", throwable); - } - } - - static void e(Throwable throwable) { - if (DEBUG) { - android.util.Log.e(TAG, "", throwable); - } - } - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java deleted file mode 100644 index 185bf8a..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ResponseHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -abstract interface ResponseHandler { - - /** - * on Start - */ - public void onStart(); - - /** - * on Finish - */ - public void onFinish(); - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java deleted file mode 100644 index 01e454f..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import java.io.IOException; - -class ShellCommand { - - Process run(String[] commandString) { - Process process = null; - try { - process = Runtime.getRuntime().exec(commandString); - } catch (IOException e) { - Log.e("Exception while trying to run: " + commandString, e); - } - return process; - } - - CommandResult runWaitFor(String[] s) { - Process process = run(s); - - Integer exitValue = null; - String output = null; - try { - if (process != null) { - exitValue = process.waitFor(); - - if (CommandResult.success(exitValue)) { - output = Util.convertInputStreamToString(process.getInputStream()); - } else { - output = Util.convertInputStreamToString(process.getErrorStream()); - } - } - } catch (InterruptedException e) { - Log.e("Interrupt exception", e); - } finally { - Util.destroyProcess(process); - } - - return new CommandResult(CommandResult.success(exitValue), output); - } - -} \ No newline at end of file diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java deleted file mode 100644 index 378a863..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/Util.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg; - -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.os.AsyncTask; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; - -class Util { - - static boolean isDebug(Context context) { - return (0 != (context.getApplicationContext().getApplicationInfo().flags &= ApplicationInfo.FLAG_DEBUGGABLE)); - } - - static void close(InputStream inputStream) { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - // Do nothing - } - } - } - - static void close(OutputStream outputStream) { - if (outputStream != null) { - try { - outputStream.flush(); - outputStream.close(); - } catch (IOException e) { - // Do nothing - } - } - } - - static String convertInputStreamToString(InputStream inputStream) { - try { - BufferedReader r = new BufferedReader(new InputStreamReader(inputStream)); - String str; - StringBuilder sb = new StringBuilder(); - while ((str = r.readLine()) != null) { - sb.append(str); - } - return sb.toString(); - } catch (IOException e) { - Log.e("error converting input stream to string", e); - } - return null; - } - - static void destroyProcess(Process process) { - if (process != null) - process.destroy(); - } - - static boolean killAsync(AsyncTask asyncTask) { - return asyncTask != null && !asyncTask.isCancelled() && asyncTask.cancel(true); - } - - static boolean isProcessCompleted(Process process) { - try { - if (process == null) return true; - process.exitValue(); - return true; - } catch (IllegalThreadStateException e) { - // do nothing - } - return false; - } -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java deleted file mode 100644 index 749e3a1..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegCommandAlreadyRunningException.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg.exceptions; - -public class FFmpegCommandAlreadyRunningException extends Exception { - - public FFmpegCommandAlreadyRunningException(String message) { - super(message); - } - -} diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java deleted file mode 100644 index 45d3aaf..0000000 --- a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/exceptions/FFmpegNotSupportedException.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.github.hiteshsondhi88.libffmpeg.exceptions; - -public class FFmpegNotSupportedException extends Exception { - - public FFmpegNotSupportedException(String message) { - super(message); - } - -} diff --git a/FFmpegAndroid/src/main/res/values/strings.xml b/FFmpegAndroid/src/main/res/values/strings.xml deleted file mode 100644 index 0bd14a7..0000000 --- a/FFmpegAndroid/src/main/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - n2.4.2 - \ No newline at end of file diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 deleted file mode 100644 index 94a9ed0..0000000 --- a/LICENSE.GPLv3 +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md deleted file mode 100644 index f92f842..0000000 --- a/README.md +++ /dev/null @@ -1,36 +0,0 @@ -[FFmpeg-Android-Java](http://writingminds.github.io/ffmpeg-android-java/) [![Build Status](https://travis-ci.org/hiteshsondhi88/ffmpeg-android-java.svg?branch=master)](https://travis-ci.org/hiteshsondhi88/ffmpeg-android-java) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FFmpeg--Android--Java-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/931) -============== - -[![Join the chat at https://gitter.im/hiteshsondhi88/ffmpeg-android-java](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hiteshsondhi88/ffmpeg-android-java?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -## About -[FFmpeg Android java](http://writingminds.github.io/ffmpeg-android-java/) is a java library that simplifies your task of using ffmpeg in Android project which I've compiled using [FFmpeg-Android](http://writingminds.github.io/ffmpeg-android/) - -These are two basic methods of this library: - -* `loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseHandler) throws FFmpegNotSupportedException` -* `execute(String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException` - -For examples and usage instructions head over to: -* [writingminds.github.io/ffmpeg-android-java] (http://writingminds.github.io/ffmpeg-android-java/) - -## Supported Architecture -* armv7 -* armv7-neon -* x86 - -## 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.3.2/app-debug.apk) - -## JavaDoc -* [Javadoc](http://writingminds.github.io/ffmpeg-android-java/docs/) - -## License -* Check file LICENSE.GPLv3 and Make sure to follow the licensing terms and conditions of the project and the software used to build the project. - -## HIRE US -* Get in touch with us - http://www.writingminds.com - - -[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/hiteshsondhi88/ffmpeg-android-java/trend.png)](https://bitdeli.com/free "Bitdeli Badge") diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/assets/sample_srt/sample.srt b/app/assets/sample_srt/sample.srt deleted file mode 100644 index e1ceb60..0000000 --- a/app/assets/sample_srt/sample.srt +++ /dev/null @@ -1,8 +0,0 @@ -1 -00:00:20,000 --> 00:00:24,400 -In connection with a dramatic increase -in crime in certain neighbourhoods, - -2 -00:00:24,600 --> 00:00:27,800 -The government is implementing a new policy... \ No newline at end of file diff --git a/app/assets/sample_videos/sample_1.mkv b/app/assets/sample_videos/sample_1.mkv deleted file mode 100644 index 3ae94f1..0000000 Binary files a/app/assets/sample_videos/sample_1.mkv and /dev/null differ diff --git a/app/assets/sample_videos/sample_2.mp4 b/app/assets/sample_videos/sample_2.mp4 deleted file mode 100644 index 1fc4788..0000000 Binary files a/app/assets/sample_videos/sample_2.mp4 and /dev/null differ diff --git a/app/assets/sample_videos/sample_3.avi b/app/assets/sample_videos/sample_3.avi deleted file mode 100644 index 6331d46..0000000 Binary files a/app/assets/sample_videos/sample_3.avi and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index f6d48ab..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion as Integer - buildToolsVersion rootProject.ext.buildToolsVersion as String - - defaultConfig { - applicationId "com.github.hiteshsondhi88.sampleffmpeg" - minSdkVersion rootProject.ext.minSdkVersion as Integer - targetSdkVersion rootProject.ext.targetSdkVersion as Integer - versionCode rootProject.ext.versionCode as Integer - versionName rootProject.ext.versionName as String - } - - sourceSets.main { - assets.srcDirs = ['assets'] - jniLibs.srcDirs = ['libs'] - jni.srcDirs = [] //disable automatic ndk-build - } - - packagingOptions { - exclude 'META-INF/services/javax.annotation.processing.Processor' - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile 'com.squareup.dagger:dagger-compiler:1.2.2' - compile 'com.squareup.dagger:dagger:1.2.2' - compile 'com.jakewharton:butterknife:5.1.2' - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0' - compile project(':FFmpegAndroid') -} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro deleted file mode 100644 index bb65c6f..0000000 --- a/app/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Applications/Android Studio.app/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java b/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java deleted file mode 100644 index 7b9f160..0000000 --- a/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/FFmpegInstrumentationTest.java +++ /dev/null @@ -1,218 +0,0 @@ -package com.github.hiteshsondhi88.sampleffmpeg; - -import android.os.Environment; -import android.test.ActivityInstrumentationTestCase2; -import android.util.Log; - -import java.io.File; - -import javax.inject.Inject; - -import com.github.hiteshsondhi88.libffmpeg.FFmpeg; -import com.github.hiteshsondhi88.libffmpeg.FFmpegExecuteResponseHandler; -import com.github.hiteshsondhi88.libffmpeg.FFmpegLoadBinaryResponseHandler; -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; - -import static org.assertj.core.api.Assertions.assertThat; - -public class FFmpegInstrumentationTest extends ActivityInstrumentationTestCase2 { - - private static final String TAG = FFmpegInstrumentationTest.class.getSimpleName(); - - @Inject - FFmpeg ffmpeg; - - public FFmpegInstrumentationTest() { - super(Home.class); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - assertNotNull(getActivity()); - ffmpeg = getActivity().ffmpeg; - assertNotNull(ffmpeg); - ffmpeg.loadBinary(new FFmpegLoadBinaryResponseHandler() { - - @Override - public void onStart() { - // Do nothing - } - - @Override - public void onFailure() { - assertTrue("error loading ffmpeg binary", false); - } - - @Override - public void onSuccess() { - assertTrue("success loading ffmpeg binary", true); - } - - @Override - public void onFinish() { - synchronized (FFmpegInstrumentationTest.this) { - FFmpegInstrumentationTest.this.notify(); - } - } - }); - synchronized (FFmpegInstrumentationTest.this) { - try { - wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - try { - Util.copyBinaryFromAssetsToData(getActivity(), "sample_videos/sample_1.mkv", "sample_1.mkv"); - Util.copyBinaryFromAssetsToData(getActivity(), "sample_videos/sample_2.mp4", "sample_2.mp4"); - Util.copyBinaryFromAssetsToData(getActivity(), "sample_videos/sample_3.avi", "sample_3.avi"); - Util.copyBinaryFromAssetsToData(getActivity(), "sample_srt/sample.srt", "sample.srt"); - } catch (Exception e) { - Log.e(TAG, "could not copy files", e); - assertTrue("could not copy files", false); - throw e; - } - assertNotNull(getActivity()); - assertNotNull(ffmpeg); - } - - public String testFFmpegDeviceVersion() { - String ffmpegDeviceVersion = null; - try { - ffmpegDeviceVersion = ffmpeg.getDeviceFFmpegVersion(); - } catch (FFmpegCommandAlreadyRunningException e) { - assertTrue(false); - } - Log.i(TAG, ffmpegDeviceVersion); - assertThat(ffmpegDeviceVersion).isNotEmpty(); - return ffmpegDeviceVersion; - } - - public String testFFmpegLibraryVersion() { - String ffmpegLibraryVersion = ffmpeg.getLibraryFFmpegVersion(); - Log.i(TAG, ffmpegLibraryVersion); - assertThat(ffmpegLibraryVersion).isNotEmpty(); - return ffmpegLibraryVersion; - } - - public void testFFmpegDeviceAndLibraryVersionEqual() { - assertThat(testFFmpegDeviceVersion()).isEqualTo(testFFmpegLibraryVersion()); - } - - public void testFFmpegMP4toMKVUsingx264() { - File outmkv = new File(getFFmpegFilesDir(), "output.mkv"); - - // Convert from mp4 to mkv - checkFFmpegConvertUsingx264(getMp4SampleFile(), outmkv); - } - - public void testFFmpegMKVtoAVI() { - File outavi = new File(getFFmpegFilesDir(), "output.avi"); - - // Convert from mkv to avi - checkFFmpegConvertCommon(getMkvSampleFile(), outavi); - } - - public void testFFmpegAVItoMP4Usingx264() { - File outmp4 = new File(getFFmpegFilesDir(), "output.mp4"); - - // Convert from avi to mp4 - checkFFmpegConvertUsingx264(getAviSampleFile(), outmp4); - } - - public void testLibass() { - File outass = new File(getFFmpegFilesDir(), "output.ass"); - checkFFmpegCommon("-y -i "+getSrtSampleFile()+" "+outass.getAbsolutePath(), outass); - } - - private void checkFFmpegConvertUsingx264(File inputFile, File outputFile) { - checkFFmpegCommon("-y -i "+inputFile.getAbsolutePath()+" -c:v libx264 -preset ultrafast "+outputFile.getAbsolutePath(), outputFile); - } - - private void checkFFmpegConvertCommon(File inputFile, File outputFile) { - checkFFmpegCommon("-y -i "+inputFile.getAbsolutePath()+" "+outputFile.getAbsolutePath(), outputFile); - } - - private void checkFFmpegCommon(final String cmd, final File outputFile) { - Log.d(TAG, "start : "+outputFile.getAbsolutePath()); - try { - ffmpeg.execute(cmd, new FFmpegExecuteResponseHandler() { - - @Override - public void onStart() { - - } - - @Override - public void onProgress(String message) { - Log.d(TAG, "progress : "+message); - } - - @Override - public void onFailure(String message) { - assertTrue(false); - } - - @Override - public void onSuccess(String message) { - checkFileValid(outputFile); - } - - @Override - public void onFinish() { - Log.d(TAG, "done : "+outputFile.getAbsolutePath()); - synchronized (FFmpegInstrumentationTest.this) { - FFmpegInstrumentationTest.this.notify(); - } - } - }); - } catch (Exception e) { - assertTrue(false); - } - synchronized (FFmpegInstrumentationTest.this) { - try { - wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - private void checkFileValid(File file) { - assertThat(file.exists() && file.length() > 0 && file.delete()).isTrue(); - } - - private File getMkvSampleFile() { - return getSampleFile("sample_1.mkv"); - } - - private File getMp4SampleFile() { - return getSampleFile("sample_2.mp4"); - } - - private File getAviSampleFile() { - return getSampleFile("sample_3.avi"); - } - - private File getSrtSampleFile() { - return getSampleFile("sample.srt"); - } - - private File getSampleFile(String sampleName) { - File sample = new File(getActivity().getFilesDir(), sampleName); - assertThat(sample.exists() && sample.canRead()).isTrue(); - return sample; - } - - private File getFFmpegFilesDir() { - File filesDir; - if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) - filesDir = getActivity().getExternalFilesDir(null); - else - filesDir = getActivity().getFilesDir(); - assertThat(filesDir != null && filesDir.exists() && filesDir.canWrite()).isTrue(); - return filesDir; - } - -} diff --git a/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/Util.java b/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/Util.java deleted file mode 100644 index ad32e9d..0000000 --- a/app/src/androidTest/java/com/github/hiteshsondhi88/sampleffmpeg/Util.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.github.hiteshsondhi88.sampleffmpeg; - -import android.content.Context; -import android.util.Log; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -public class Util { - - private static final String TAG = Util.class.getSimpleName(); - private static final int DEFAULT_BUFFER_SIZE = 1024 * 4; - private static final int EOF = -1; - - static boolean copyBinaryFromAssetsToData(Context context, String fileNameFromAssets, String outputFileName) { - - // create files directory under /data/data/package name - File filesDirectory = context.getFilesDir(); - - InputStream is; - try { - is = context.getAssets().open(fileNameFromAssets); - // copy ffmpeg file from assets to files dir - final FileOutputStream os = new FileOutputStream(new File(filesDirectory, outputFileName)); - byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; - - int n; - while(EOF != (n = is.read(buffer))) { - os.write(buffer, 0, n); - } - - Util.close(os); - Util.close(is); - - return true; - } catch (IOException e) { - Log.e(TAG, "issue in coping binary from assets to data. ", e); - } - return false; - } - - static void close(InputStream inputStream) { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - // Do nothing - } - } - } - - static void close(OutputStream outputStream) { - if (outputStream != null) { - try { - outputStream.flush(); - outputStream.close(); - } catch (IOException e) { - // Do nothing - } - } - } - -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml deleted file mode 100644 index 7a7ba8d..0000000 --- a/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/DaggerDependencyModule.java b/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/DaggerDependencyModule.java deleted file mode 100644 index 1807ede..0000000 --- a/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/DaggerDependencyModule.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.github.hiteshsondhi88.sampleffmpeg; - -import android.content.Context; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; -import com.github.hiteshsondhi88.libffmpeg.FFmpeg; - -@Module( - injects = Home.class -) -@SuppressWarnings("unused") -public class DaggerDependencyModule { - - private final Context context; - - DaggerDependencyModule(Context context) { - this.context = context; - } - - @Provides @Singleton - FFmpeg provideFFmpeg() { - return FFmpeg.getInstance(context.getApplicationContext()); - } - -} diff --git a/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/Home.java b/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/Home.java deleted file mode 100644 index 4568f6f..0000000 --- a/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/Home.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.github.hiteshsondhi88.sampleffmpeg; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.ProgressDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.LinearLayout; -import android.widget.TextView; -import android.widget.Toast; - -import javax.inject.Inject; - -import butterknife.ButterKnife; -import butterknife.InjectView; -import dagger.ObjectGraph; - -import com.github.hiteshsondhi88.libffmpeg.ExecuteBinaryResponseHandler; -import com.github.hiteshsondhi88.libffmpeg.FFmpeg; -import com.github.hiteshsondhi88.libffmpeg.LoadBinaryResponseHandler; -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException; -import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegNotSupportedException; - -public class Home extends Activity implements View.OnClickListener { - - private static final String TAG = Home.class.getSimpleName(); - - @Inject - FFmpeg ffmpeg; - - @InjectView(R.id.command) - EditText commandEditText; - - @InjectView(R.id.command_output) - LinearLayout outputLayout; - - @InjectView(R.id.run_command) - Button runButton; - - private ProgressDialog progressDialog; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_home); - ButterKnife.inject(this); - ObjectGraph.create(new DaggerDependencyModule(this)).inject(this); - - loadFFMpegBinary(); - initUI(); - } - - private void initUI() { - runButton.setOnClickListener(this); - - progressDialog = new ProgressDialog(this); - progressDialog.setTitle(null); - } - - private void loadFFMpegBinary() { - try { - ffmpeg.loadBinary(new LoadBinaryResponseHandler() { - @Override - public void onFailure() { - showUnsupportedExceptionDialog(); - } - }); - } catch (FFmpegNotSupportedException e) { - showUnsupportedExceptionDialog(); - } - } - - private void execFFmpegBinary(final String[] command) { - try { - ffmpeg.execute(command, new ExecuteBinaryResponseHandler() { - @Override - public void onFailure(String s) { - addTextViewToLayout("FAILED with output : "+s); - } - - @Override - public void onSuccess(String s) { - addTextViewToLayout("SUCCESS with output : "+s); - } - - @Override - public void onProgress(String s) { - Log.d(TAG, "Started command : ffmpeg "+command); - addTextViewToLayout("progress : "+s); - progressDialog.setMessage("Processing\n"+s); - } - - @Override - public void onStart() { - outputLayout.removeAllViews(); - - Log.d(TAG, "Started command : ffmpeg " + command); - progressDialog.setMessage("Processing..."); - progressDialog.show(); - } - - @Override - public void onFinish() { - Log.d(TAG, "Finished command : ffmpeg "+command); - progressDialog.dismiss(); - } - }); - } catch (FFmpegCommandAlreadyRunningException e) { - // do nothing for now - } - } - - private void addTextViewToLayout(String text) { - TextView textView = new TextView(Home.this); - textView.setText(text); - outputLayout.addView(textView); - } - - private void showUnsupportedExceptionDialog() { - new AlertDialog.Builder(Home.this) - .setIcon(android.R.drawable.ic_dialog_alert) - .setTitle(getString(R.string.device_not_supported)) - .setMessage(getString(R.string.device_not_supported_message)) - .setCancelable(false) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Home.this.finish(); - } - }) - .create() - .show(); - - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.run_command: - String cmd = commandEditText.getText().toString(); - String[] command = cmd.split(" "); - if (command.length != 0) { - execFFmpegBinary(command); - } else { - Toast.makeText(Home.this, getString(R.string.empty_command_toast), Toast.LENGTH_LONG).show(); - } - break; - } - } -} diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 96a442e..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 359047d..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 71c6d76..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 4df1894..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml deleted file mode 100644 index 7495e25..0000000 --- a/app/src/main/res/layout/activity_home.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - -