MainActivity: remove filters lowering quality

Telegram or any subsequent media consumer should lower the quality
itself, here we just do useless damage.

app/build.gradle

@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "io.lowrespalmtree.harvestdawn"
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 4
         versionName "1.3"
     }
@@ -26,18 +25,20 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    buildToolsVersion '29.0.2'
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.0"
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.8.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
 
-    implementation 'com.arthenica:mobile-ffmpeg-min-gpl:4.3.2'
+    implementation 'com.arthenica:ffmpeg-kit-full:5.1'
 }

app/src/main/AndroidManifest.xml

@@ -17,7 +17,8 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/io/lowrespalmtree/harvestdawn/MainActivity.kt

@@ -21,15 +21,15 @@ import android.widget.VideoView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.FileProvider
 import androidx.core.net.toUri
-import com.arthenica.mobileffmpeg.Config.RETURN_CODE_CANCEL
+import com.arthenica.ffmpegkit.FFmpegKit
-import com.arthenica.mobileffmpeg.Config.RETURN_CODE_SUCCESS
+import com.arthenica.ffmpegkit.FFprobeKit
-import com.arthenica.mobileffmpeg.FFmpeg
+import com.arthenica.ffmpegkit.ReturnCode
-import com.arthenica.mobileffmpeg.FFprobe
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.lang.ref.WeakReference
+import kotlin.math.roundToLong
 
 class MainActivity : AppCompatActivity() {
     private val spinner: ProgressBar? get() = findViewById(R.id.progressBar)
@@ -171,25 +171,26 @@ class MainActivity : AppCompatActivity() {
         currentVideoPath = null
         currentVideoUri = null
 
-        val mediaInfo = FFprobe.getMediaInformation(inputVideoPath)
         // Detect vertical/horizontal resolution, because at the moment we downscale everything to
         // fit Telegram's media preview requirements. If FFprobe fails to returns data, we consider
         // by default the video to be vertical.
-        val isVertical = mediaInfo?.let {
+        val session = FFprobeKit.getMediaInformation(inputVideoPath)
-            it.streams.getOrNull(0)?.let { streamInformation ->
+        var isVertical = true
+        var duration: Double = 0.0
+        if (ReturnCode.isSuccess(session.returnCode)) {
+            session.mediaInformation.streams.getOrNull(0)?.let { streamInformation ->
                 if (streamInformation.height != null && streamInformation.width != null)
-                    streamInformation.height > streamInformation.width
+                    isVertical = streamInformation.height > streamInformation.width
-                else
+            }
-                    true
+            duration = session.mediaInformation.duration.toDouble()
         }
-        } ?: true
-        val duration = mediaInfo?.duration?.toLong() ?: 0L
 
         // Save the soundtrack as well cause we can't pass a resource to FFMPEG.
         // Should be done only once, then it's kept in app internal storage.
         val themeId = getThemeId()
         val soundFile = File(filesDir, "$themeId.m4a")
         if (!soundFile.exists()) {
+            Log.i(TAG, "Prepare sound file with a filesystem path.")
             resources.openRawResource(getThemeRawResource(themeId)).use { resource ->
                 FileOutputStream(soundFile).use { fos ->
                     fos.buffered().write(resource.buffered().readBytes())
@@ -224,7 +225,7 @@ class MainActivity : AppCompatActivity() {
 
     private class MixTask(
         private val activity: WeakReference<MainActivity>,
-        private val duration: Long,
+        private val duration: Double,
         private val videoIsVertical: Boolean
     ): AsyncTask<String, Void, Boolean>() {
         private lateinit var videoPath: String
@@ -238,33 +239,44 @@ class MainActivity : AppCompatActivity() {
             videoPath = params[0]!!
             val audioPath = params[1]!!
             outputPath = params[2]!!
-            val width = if (videoIsVertical) 480 else 640
+            //val width = if (videoIsVertical) 480 else 640
-            val durationOpt = if (duration > 0) "-t ${duration}ms" else ""
+            val durationOpt = if (duration > 0) {
+                "-t ${(duration * 1000).roundToLong()}ms"
+            } else {
+                ""
+            }
             val command = (
                 "-i $videoPath -i $audioPath"
                 + " -filter_complex amix=duration=longest"
                 + " -preset ultrafast"
-                + " -c:v libx264 -crf 26 -vf scale=$width:trunc(ow/a/2)*2 -pix_fmt yuv420p"
+                + " -c:v mpeg4"  // -crf 26 -vf scale=$width:trunc(ow/a/2)*2 -pix_fmt yuv420p
                 + " $durationOpt -y $outputPath"
             )
             Log.d(TAG, "Calling FFmpeg with command: $command")
-            return when (val rc = FFmpeg.execute(command)) {
+            val rc = FFmpegKit.execute(command).returnCode
-                RETURN_CODE_SUCCESS -> true.also { Log.i(TAG, "Mix succeeded.") }
+            if (ReturnCode.isSuccess(rc)) {
-                RETURN_CODE_CANCEL -> false.also { Log.i(TAG, "Mix cancelled.") }
+                Log.i(TAG, "Mix succeeded.")
-                else -> false .also { Log.e(TAG, "Mix failed! rc = $rc") }
+                return true
             }
+            if (ReturnCode.isCancel(rc))
+                Log.i(TAG, "Mix cancelled.")
+            else
+                Log.e(TAG, "Mix failed! rc = $rc")
+            return false
         }
 
         override fun onPostExecute(result: Boolean?) {
             File(videoPath).delete()
             activity.get()?.let {
-                if (result == true)
+                if (result == true) {
                     it.handleFfmpegOutput(outputPath)
-                else
+                } else {
+                    it.toast("Crasse de brin !!!")
                     it.setLoading(false)
                 }
             }
         }
+    }
 
     private fun setLoading(isLoading: Boolean) {
         if (isLoading) {

build.gradle

@@ -1,13 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.3.72"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

gradle.properties

@@ -19,3 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+org.gradle.unsafe.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 17 16:33:26 CET 2021
+#Mon Apr 03 13:32:21 CEST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME