FFmpeg jni cpp (WIP)

Shabinder · Sep 2, 2021 · df6e969 · df6e969
1 parent 40e9b0a
commit df6e969
Show file tree

Hide file tree

Showing 19 changed files with 1,079 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ Gemfile
 Gemfile.lock
 /maintenance-tasks/build/
 /android/.cxx/Debug/5k2s1t1p/x86/
+/ffmpeg/ffmpeg-kit-android-lib/.cxx/Debug/
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "spotiflyer-ios"]
 	path = spotiflyer-ios
 	url = https://github.com/Shabinder/spotiflyer-ios
-[submodule "ffmpeg-android-maker"]
-	path = ffmpeg-android-maker
+[submodule "ffmpeg/ffmpeg-android-maker"]
+	path = ffmpeg/ffmpeg-android-maker
 	url = https://github.com/Shabinder/ffmpeg-android-maker
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -57,20 +57,6 @@ android {
         targetSdk = Versions.targetSdkVersion
         versionCode = Versions.versionCode
         versionName = Versions.versionName
-
-        ndk {
-            abiFilters.addAll(setOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a"))
-        }
-    }
-    sourceSets {
-        named("main") {
-            jniLibs.srcDir("../ffmpeg-android-maker/output/lib")
-        }
-    }
-    externalNativeBuild {
-        cmake {
-            path("CMakeLists.txt")
-        }
     }
     buildTypes {
         getByName("release") {
@@ -103,16 +89,6 @@ android {
             exclude(group = "androidx.compose.ui")
         }
     }
-    packagingOptions {
-        resources {
-            excludes.apply {
-                add("META-INF/*")
-            }
-            jniLibs.pickFirsts.apply {
-                add("**/*.so")
-            }
-        }
-    }
 }
 dependencies {
     implementation(compose.material)

diff --git a/android/src/main/cpp/main.cpp b/android/src/main/cpp/main.cpp
diff --git a/android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt b/android/src/main/java/com/shabinder/spotiflyer/MainActivity.kt
@@ -54,18 +54,19 @@ import com.google.accompanist.insets.statusBarsPadding
 import com.shabinder.common.core_components.ConnectionLiveData
 import com.shabinder.common.core_components.analytics.AnalyticsManager
 import com.shabinder.common.core_components.file_manager.FileManager
+import com.shabinder.common.core_components.media_converter.AndroidMediaConverter
 import com.shabinder.common.core_components.preference_manager.PreferenceManager
 import com.shabinder.common.di.observeAsState
 import com.shabinder.common.models.*
 import com.shabinder.common.models.PlatformActions.Companion.SharedPreferencesKey
+import com.shabinder.common.models.event.coroutines.success
 import com.shabinder.common.providers.FetchPlatformQueryResult
 import com.shabinder.common.root.SpotiFlyerRoot
 import com.shabinder.common.root.callbacks.SpotiFlyerRootCallBacks
 import com.shabinder.common.translations.Strings
 import com.shabinder.common.uikit.configurations.SpotiFlyerTheme
 import com.shabinder.common.uikit.configurations.colorOffWhite
 import com.shabinder.common.uikit.screens.SpotiFlyerRootContent
-import com.shabinder.spotiflyer.ffmpeg.FFmpeg
 import com.shabinder.spotiflyer.service.ForegroundService
 import com.shabinder.spotiflyer.ui.AnalyticsDialog
 import com.shabinder.spotiflyer.ui.NetworkDialog
@@ -106,8 +107,15 @@ class MainActivity : ComponentActivity() {
         // This app draws behind the system bars, so we want to handle fitting system windows
         WindowCompat.setDecorFitsSystemWindows(window, false)
         rootComponent = spotiFlyerRoot(defaultComponentContext())
-        Log.d("FFmpeg","init")
-        FFmpeg.testInit()
+        lifecycleScope.launch {
+            Log.d("FFmpeg", "init")
+            AndroidMediaConverter().convertAudioFile("/storage/emulated/0/Music/SpotiFlyer/Playlists/Sing-along_Punjabi/Kya_Baat_Ay.mp3","/storage/emulated/0/Music/SpotiFlyer/Playlists/Sing-along_Punjabi/Kya_Baat_Ay.temp.mp3").fold({
+                Log.d("FFmpeg Success",it)
+            }){
+                it.printStackTrace()
+            }
+        }
+        /*FFmpeg.testInit()*/
         setContent {
             SpotiFlyerTheme {
                 Surface(contentColor = colorOffWhite) {
@@ -246,7 +254,11 @@ class MainActivity : ComponentActivity() {
     }
 
     @Suppress("DEPRECATION")
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         permissionGranted.value = checkPermissions()
     }
@@ -261,11 +273,13 @@ class MainActivity : ComponentActivity() {
                 override val fileManager: FileManager = this@MainActivity.fileManager
                 override val preferenceManager = this@MainActivity.preferenceManager
                 override val analyticsManager: AnalyticsManager = this@MainActivity.analyticsManager
-                override val downloadProgressFlow: MutableSharedFlow<HashMap<String, DownloadStatus>> = trackStatusFlow
+                override val downloadProgressFlow: MutableSharedFlow<HashMap<String, DownloadStatus>> =
+                    trackStatusFlow
                 override val actions = object : Actions {
 
                     override val platformActions = object : PlatformActions {
-                        override val imageCacheDir: String = applicationContext.cacheDir.absolutePath + File.separator
+                        override val imageCacheDir: String =
+                            applicationContext.cacheDir.absolutePath + File.separator
                         override val sharedPreferences = applicationContext.getSharedPreferences(
                             SharedPreferencesKey,
                             MODE_PRIVATE

diff --git a/android/src/main/java/com/shabinder/spotiflyer/ffmpeg/FFmpeg.kt b/android/src/main/java/com/shabinder/spotiflyer/ffmpeg/FFmpeg.kt
diff --git a/common/core-components/build.gradle.kts b/common/core-components/build.gradle.kts
@@ -19,7 +19,8 @@ kotlin {
             dependencies {
                 implementation(Extras.mp3agic)
                 implementation(Extras.Android.countly)
-                implementation("com.arthenica:ffmpeg-kit-audio:4.4.LTS")
+                implementation(project(":ffmpeg:ffmpeg-kit-android-lib"))
+//                implementation("com.arthenica:ffmpeg-kit-audio:4.4.LTS")
                 //api(files("$rootDir/libs/mobile-ffmpeg.aar"))
             }
         }

diff --git a/...roidMain/kotlin/com/shabinder/common/core_components/analytics/AndroidAnalyticsManager.kt b/...roidMain/kotlin/com/shabinder/common/core_components/analytics/AndroidAnalyticsManager.kt
@@ -24,7 +24,7 @@ internal class AndroidAnalyticsManager(private val mainActivity: Activity) : Ana
                 setIdMode(DeviceId.Type.OPEN_UDID)
                 setViewTracking(true)
                 enableCrashReporting()
-                setLoggingEnabled(true)
+                setLoggingEnabled(false)
                 setRecordAllThreadsWithCrash()
                 setRequiresConsent(true)
                 setShouldIgnoreAppCrawlers(true)

diff --git a/...ndroidMain/kotlin/com/shabinder/common/core_components/file_manager/AndroidFileManager.kt b/...ndroidMain/kotlin/com/shabinder/common/core_components/file_manager/AndroidFileManager.kt
@@ -152,7 +152,7 @@ class AndroidFileManager(
             SuspendableEvent.success(trackDetails.outputFilePath)
         } catch (e: Throwable) {
             e.printStackTrace()
-            if (songFile.exists()) songFile.delete()
+            //if (songFile.exists()) songFile.delete()
             logger.e { "${songFile.absolutePath} could not be created" }
             SuspendableEvent.error(e)
         }

diff --git a/...Main/kotlin/com/shabinder/common/core_components/media_converter/AndroidMediaConverter.kt b/...Main/kotlin/com/shabinder/common/core_components/media_converter/AndroidMediaConverter.kt
@@ -1,17 +1,9 @@
 package com.shabinder.common.core_components.media_converter
 
-import android.util.Log
-import com.arthenica.ffmpegkit.FFmpegKit
-import com.arthenica.ffmpegkit.ReturnCode
+import com.shabinder.spotiflyer.ffmpeg.AndroidFFmpeg.runTranscode
 import com.shabinder.common.models.AudioQuality
-import com.shabinder.common.models.SpotiFlyerException
 import org.koin.dsl.bind
 import org.koin.dsl.module
-import com.arthenica.ffmpegkit.FFprobeKit
-
-import com.arthenica.ffmpegkit.MediaInformationSession
-import kotlin.math.ceil
-import kotlin.math.roundToInt
 
 
 class AndroidMediaConverter : MediaConverter() {
@@ -21,7 +13,10 @@ class AndroidMediaConverter : MediaConverter() {
         audioQuality: AudioQuality,
         progressCallbacks: (Long) -> Unit,
     ) = executeSafelyInPool {
-        val kbpsArg = if (audioQuality == AudioQuality.UNKNOWN) {
+        // 192 is Default
+        val audioBitrate = if (audioQuality == AudioQuality.UNKNOWN) 192 else audioQuality.kbps.toIntOrNull() ?: 192
+        runTranscode(inputFilePath,outputFilePath,audioBitrate).toString()
+        /*val kbpsArg = if (audioQuality == AudioQuality.UNKNOWN) {
             val mediaInformation = FFprobeKit.getMediaInformation(inputFilePath)
             val bitrate = ((mediaInformation.mediaInformation.bitrate).toFloat()/1000).roundToInt()
             Log.d("MEDIA-INPUT Bit", bitrate.toString())
@@ -41,7 +36,7 @@ class AndroidMediaConverter : MediaConverter() {
                 throw SpotiFlyerException.MP3ConversionFailed("FFmpeg Conversion Canceled for $inputFilePath")
             }
             else -> throw SpotiFlyerException.MP3ConversionFailed("FFmpeg Conversion Failed for $inputFilePath")
-        }
+        }*/
     }
 }
 

diff --git a/ffmpeg-android-maker b/ffmpeg-android-maker
diff --git a/android/CMakeLists.txt → ffmpeg/ffmpeg-kit-android-lib/CMakeLists.txt b/android/CMakeLists.txt → ffmpeg/ffmpeg-kit-android-lib/CMakeLists.txt
@@ -9,7 +9,7 @@ set(
         # List variable name
         ffmpeg_libs_names
         # Values in the list
-        avutil avformat avcodec avresample swresample
+        avutil avformat avcodec swresample avdevice avfilter swscale
 )
 
 foreach (ffmpeg_lib_name ${ffmpeg_libs_names})
@@ -28,22 +28,29 @@ endforeach ()
 
 add_library(
         # Name for a library to build
-        spotiflyer-converter
+        spotiflyer-ffmpeg
         # Type of a library
         SHARED
         # All cpp files to compile
-        src/main/cpp/main.cpp
-        #        src/main/cpp/media_file_builder.cpp
-        #        src/main/cpp/media_file_builder_jni.cpp
-        #        src/main/cpp/frame_loader_context.cpp
-        #        src/main/cpp/frame_loader_context_jni.cpp
-        #        src/main/cpp/frame_extractor.cpp
-        #        src/main/cpp/utils.cpp
+        # mobile-ffmpeg
+       src/main/cpp/doc_examples_transcode_aac.c
+
+        # ffmpeg-kit
+#        src/main/cpp/ffmpegkit.c
+#        src/main/cpp/ffprobekit.c
+#        src/main/cpp/ffmpegkit_exception.c
+#        src/main/cpp/fftools_cmdutils.c
+#        src/main/cpp/fftools_ffmpeg.c
+#        src/main/cpp/fftools_ffprobe.c
+#        src/main/cpp/fftools_ffmpeg_opt.c
+#        src/main/cpp/fftools_ffmpeg_hw.c
+#        src/main/cpp/fftools_ffmpeg_filter.c
+#        src/main/cpp/saf_wrapper.c
 )
 
 target_link_libraries(
         # Library to link
-        spotiflyer-converter
+        spotiflyer-ffmpeg
         # List of libraries to link against:
         # Library for writing messages in LogCat
         log

diff --git a/ffmpeg/ffmpeg-kit-android-lib/build.gradle.kts b/ffmpeg/ffmpeg-kit-android-lib/build.gradle.kts
@@ -0,0 +1,63 @@
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+}
+
+android {
+    //ndkVersion "22.0.7026061"
+    compileSdk = Versions.compileSdkVersion
+    buildToolsVersion = "30.0.3"
+
+    defaultConfig {
+        consumerProguardFile("proguard-rules.pro")
+
+        minSdk = Versions.minSdkVersion
+        targetSdk = Versions.targetSdkVersion
+
+        /*versionCode = Versions.versionCode
+        versionName = Versions.versionName*/
+
+        ndk {
+            abiFilters.addAll(setOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a"))
+        }
+    }
+
+    sourceSets {
+        named("main") {
+            jniLibs.srcDir("../ffmpeg-android-maker/output/lib")
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path("CMakeLists.txt")
+        }
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    packagingOptions {
+        resources {
+            excludes.apply {
+                add("META-INF/*")
+            }
+            jniLibs.pickFirsts.apply {
+                add("**/*.so")
+            }
+        }
+    }
+}
+
+dependencies { /**/ }
diff --git a/ffmpeg/ffmpeg-kit-android-lib/proguard-rules.pro b/ffmpeg/ffmpeg-kit-android-lib/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+-keep class com.arthenica.ffmpegkit.FFmpegKitConfig {
+    native <methods>;
+    void log(long, int, byte[]);
+    void statistics(long, int, float, float, long , int, double, double);
+    void closeParcelFileDescriptor(int);
+}
+
+-keep class com.arthenica.ffmpegkit.AbiDetect {
+    native <methods>;
+}
diff --git a/ffmpeg/ffmpeg-kit-android-lib/src/main/AndroidManifest.xml b/ffmpeg/ffmpeg-kit-android-lib/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.shabinder.spotiflyer.ffmpeg">
+
+</manifest>
diff --git a/ffmpeg/ffmpeg-kit-android-lib/src/main/cpp/.gitignore b/ffmpeg/ffmpeg-kit-android-lib/src/main/cpp/.gitignore
@@ -0,0 +1,2 @@
+/android_lts_support.o
+/libandroidltssupport.a
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/android_lts_support.o
		/libandroidltssupport.a