Merge pull request #45 from lincollincol/ffmpeg_kit_compatibility

FFmpeg kit compatibility
lincollincol · Aug 2, 2022 · a1b5193 · a1b5193
2 parents 843fa38 + 4519645
commit a1b5193
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 32
     ndkVersion "21.1.6352462"
 
-    android.ndkVersion "21.1.6352462"
-
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionCode 1
         versionName "2.1.3"
         project.archivesBaseName = "Amplituda"
@@ -51,4 +48,4 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-}
+}
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -4,31 +4,32 @@ set(ffmpeg_DIR ${CMAKE_SOURCE_DIR}/ffmpeg)
 
 include_directories(${ffmpeg_DIR}/${ANDROID_ABI}/include)
 
-add_library(avutil SHARED IMPORTED)
-set_target_properties(avutil PROPERTIES IMPORTED_LOCATION
-        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libavutil.so)
+add_library(amplituda-avutil SHARED IMPORTED)
+set_target_properties(amplituda-avutil PROPERTIES IMPORTED_LOCATION
+        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libavutil-amplituda.so)
 
-add_library(avformat SHARED IMPORTED)
-set_target_properties(avformat PROPERTIES IMPORTED_LOCATION
-        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libavformat.so)
+add_library(amplituda-avformat SHARED IMPORTED)
+set_target_properties(amplituda-avformat PROPERTIES IMPORTED_LOCATION
+        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libavformat-amplituda.so)
 
-add_library(avcodec SHARED IMPORTED)
-set_target_properties(avcodec PROPERTIES IMPORTED_LOCATION
-        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libavcodec.so)
+add_library(amplituda-avcodec SHARED IMPORTED)
+set_target_properties(amplituda-avcodec PROPERTIES IMPORTED_LOCATION
+        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libavcodec-amplituda.so)
 
-add_library(swresample SHARED IMPORTED)
-set_target_properties(swresample PROPERTIES IMPORTED_LOCATION
-        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libswresample.so)
+add_library(amplituda-swresample SHARED IMPORTED)
+set_target_properties(amplituda-swresample PROPERTIES IMPORTED_LOCATION
+        ${ffmpeg_DIR}/${ANDROID_ABI}/lib/libswresample-amplituda.so)
 
-add_library(native-lib SHARED native-lib.cpp)
-set_target_properties(native-lib PROPERTIES LINKER_LANGUAGE CXX)
+add_library(amplituda-native-lib SHARED amplituda-native-lib.cpp)
+set_target_properties(amplituda-native-lib PROPERTIES LINKER_LANGUAGE CXX)
 
 #find_library( log-lib log )
 
-target_link_libraries(native-lib
-        avutil
-        avformat
-        avcodec
-        swresample
+target_link_libraries(
+        amplituda-native-lib
+        amplituda-avutil
+        amplituda-avformat
+        amplituda-avcodec
+        amplituda-swresample
 #        ${log-lib}
         )
diff --git a/app/src/main/cpp/native-lib.cpp → app/src/main/cpp/amplituda-native-lib.cpp b/app/src/main/cpp/native-lib.cpp → app/src/main/cpp/amplituda-native-lib.cpp
diff --git a/...in/cpp/ffmpeg/arm64-v8a/lib/libavcodec.so → ...peg/arm64-v8a/lib/libavcodec-amplituda.so b/...in/cpp/ffmpeg/arm64-v8a/lib/libavcodec.so → ...peg/arm64-v8a/lib/libavcodec-amplituda.so
diff --git a/...n/cpp/ffmpeg/arm64-v8a/lib/libavformat.so → ...eg/arm64-v8a/lib/libavformat-amplituda.so b/...n/cpp/ffmpeg/arm64-v8a/lib/libavformat.so → ...eg/arm64-v8a/lib/libavformat-amplituda.so
diff --git a/...ain/cpp/ffmpeg/arm64-v8a/lib/libavutil.so → ...mpeg/arm64-v8a/lib/libavutil-amplituda.so b/...ain/cpp/ffmpeg/arm64-v8a/lib/libavutil.so → ...mpeg/arm64-v8a/lib/libavutil-amplituda.so
diff --git a/...cpp/ffmpeg/arm64-v8a/lib/libswresample.so → .../arm64-v8a/lib/libswresample-amplituda.so b/...cpp/ffmpeg/arm64-v8a/lib/libswresample.so → .../arm64-v8a/lib/libswresample-amplituda.so
diff --git a/.../cpp/ffmpeg/armeabi-v7a/lib/libavcodec.so → ...g/armeabi-v7a/lib/libavcodec-amplituda.so b/.../cpp/ffmpeg/armeabi-v7a/lib/libavcodec.so → ...g/armeabi-v7a/lib/libavcodec-amplituda.so
diff --git a/...cpp/ffmpeg/armeabi-v7a/lib/libavformat.so → .../armeabi-v7a/lib/libavformat-amplituda.so b/...cpp/ffmpeg/armeabi-v7a/lib/libavformat.so → .../armeabi-v7a/lib/libavformat-amplituda.so
diff --git a/...n/cpp/ffmpeg/armeabi-v7a/lib/libavutil.so → ...eg/armeabi-v7a/lib/libavutil-amplituda.so b/...n/cpp/ffmpeg/armeabi-v7a/lib/libavutil.so → ...eg/armeabi-v7a/lib/libavutil-amplituda.so
diff --git a/...p/ffmpeg/armeabi-v7a/lib/libswresample.so → ...rmeabi-v7a/lib/libswresample-amplituda.so b/...p/ffmpeg/armeabi-v7a/lib/libswresample.so → ...rmeabi-v7a/lib/libswresample-amplituda.so
diff --git a/...src/main/cpp/ffmpeg/x86/lib/libavcodec.so → ...pp/ffmpeg/x86/lib/libavcodec-amplituda.so b/...src/main/cpp/ffmpeg/x86/lib/libavcodec.so → ...pp/ffmpeg/x86/lib/libavcodec-amplituda.so
diff --git a/...rc/main/cpp/ffmpeg/x86/lib/libavformat.so → ...p/ffmpeg/x86/lib/libavformat-amplituda.so b/...rc/main/cpp/ffmpeg/x86/lib/libavformat.so → ...p/ffmpeg/x86/lib/libavformat-amplituda.so
diff --git a/app/src/main/cpp/ffmpeg/x86/lib/libavutil.so → ...cpp/ffmpeg/x86/lib/libavutil-amplituda.so b/app/src/main/cpp/ffmpeg/x86/lib/libavutil.so → ...cpp/ffmpeg/x86/lib/libavutil-amplituda.so
diff --git a/.../main/cpp/ffmpeg/x86/lib/libswresample.so → ...ffmpeg/x86/lib/libswresample-amplituda.so b/.../main/cpp/ffmpeg/x86/lib/libswresample.so → ...ffmpeg/x86/lib/libswresample-amplituda.so
diff --git a/.../main/cpp/ffmpeg/x86_64/lib/libavcodec.so → ...ffmpeg/x86_64/lib/libavcodec-amplituda.so b/.../main/cpp/ffmpeg/x86_64/lib/libavcodec.so → ...ffmpeg/x86_64/lib/libavcodec-amplituda.so
diff --git a/...main/cpp/ffmpeg/x86_64/lib/libavformat.so → ...fmpeg/x86_64/lib/libavformat-amplituda.so b/...main/cpp/ffmpeg/x86_64/lib/libavformat.so → ...fmpeg/x86_64/lib/libavformat-amplituda.so
diff --git a/...c/main/cpp/ffmpeg/x86_64/lib/libavutil.so → .../ffmpeg/x86_64/lib/libavutil-amplituda.so b/...c/main/cpp/ffmpeg/x86_64/lib/libavutil.so → .../ffmpeg/x86_64/lib/libavutil-amplituda.so
diff --git a/...in/cpp/ffmpeg/x86_64/lib/libswresample.so → ...peg/x86_64/lib/libswresample-amplituda.so b/...in/cpp/ffmpeg/x86_64/lib/libswresample.so → ...peg/x86_64/lib/libswresample-amplituda.so
diff --git a/app/src/main/java/linc/com/amplituda/Amplituda.java b/app/src/main/java/linc/com/amplituda/Amplituda.java
@@ -362,7 +362,7 @@ private synchronized void updateProgressOperation(
      * NDK part
      */
     static {
-        System.loadLibrary("native-lib");
+        System.loadLibrary("amplituda-native-lib");
     }
 
     native AmplitudaResultJNI amplitudesFromAudioJNI(

diff --git a/example/src/main/java/linc/com/example/MainActivity.java b/example/src/main/java/linc/com/example/MainActivity.java
@@ -25,7 +25,8 @@ protected void onCreate(Bundle savedInstanceState) {
         Amplituda amplituda = new Amplituda(this);
 
         amplituda.processAudio(
-                "/storage/emulated/0/Music/Linc - Amplituda.mp3",
+//                "/storage/emulated/0/Music/Linc - Amplituda.mp3",
+                "/storage/9016-4EF8/MUSIC/Palace - Heaven Up There.mp3",
                 Compress.withParams(Compress.AVERAGE, 1),
                 new AmplitudaProgressListener() {
                     @Override