Update Combine Video Query to support different size and fps videos.

Author: Rajan-p-simform

SSffmpegVideoOperation/src/main/java/com/simform/videooperations/FFmpegQueryExtension.kt

@@ -134,27 +134,49 @@ public class FFmpegQueryExtension {
     }
 
     fun combineVideos(paths: ArrayList<Paths>, width: Int?, height: Int?, output: String): Array<String> {
-        val inputs: ArrayList<String> = ArrayList()
-        var query: String? = ""
-        var queryAudio: String? = ""
-        for (i in 0 until paths.size) {
-            //for input
+        val inputs = ArrayList<String>()
+        var query = ""
+        var queryAudio = ""
+        val videoInputs = mutableListOf<String>()
+        val audioInputs = mutableListOf<String>()
+        var hasMissingAudio = false
+
+        for (i in paths.indices) {
+            // Add input
             inputs.add("-i")
             inputs.add(paths[i].filePath)
 
-            //for video setting with width and height
-            query = query?.trim()
-            query += "[" + i + ":v]scale=${width}x${height},setdar=$width/$height[" + i + "v];"
+            // Video scaling + fps normalization
+            query += "[$i:v]scale=${width}x${height},setdar=${width}/${height},fps=${FFmpegQueryExtension().FRAME_RATE}[$i" + "v];"
+            videoInputs.add("[$i" + "v]")
 
-            //for video and audio combine {without audio this query not supported so applied this function}
-            queryAudio = queryAudio?.trim()
-            queryAudio += if (paths[i].isImageFile) {
-                "[" + i + "v][" + paths.size + ":a]"
+            // Audio stream
+            val audioLabel = "[$i" + "a]"
+            if (paths[i].hasAudio) {
+                queryAudio += "[$i:a]aresample=async=1,asetpts=N/SR/TB$audioLabel;"
             } else {
-                "[" + i + "v][" + i + ":a]"
+                queryAudio += "[${paths.size}:a]aresample=async=1,asetpts=N/SR/TB$audioLabel;"
+                hasMissingAudio = true
             }
+            audioInputs.add(audioLabel)
         }
-        return getResult(inputs, query, queryAudio, paths, output)
+
+        // Add anullsrc only if any input lacks audio
+        if (hasMissingAudio) {
+            inputs.add("-f")
+            inputs.add("lavfi")
+            inputs.add("-t")
+            inputs.add("0.1")
+            inputs.add("-i")
+            inputs.add("anullsrc")
+        }
+
+        // Build concat input block: [0v][0a][1v][1a]...
+        val concatInputs = paths.indices.joinToString("") { i ->
+            "${videoInputs[i]}${audioInputs[i]}"
+        }
+
+        return getResult(inputs, query, queryAudio + concatInputs, paths, output)
     }
 
     private fun getResult(inputs: java.util.ArrayList<String>, query: String?, queryAudio: String?, paths: ArrayList<Paths>, output: String): Array<String> {

SSffmpegVideoOperation/src/main/java/com/simform/videooperations/Paths.kt

@@ -7,4 +7,5 @@ package com.simform.videooperations
 class Paths {
     var filePath : String = ""
     var isImageFile : Boolean = false
+    var hasAudio: Boolean = false
 }

app/src/main/java/com/simform/videoimageeditor/videoProcessActivity/CombineVideosActivity.kt

@@ -116,6 +116,7 @@ class CombineVideosActivity : BaseActivity(R.layout.activity_combine_videos, R.s
                     }
 
                 paths.isImageFile = false
+                paths.hasAudio = hasAudio(paths.filePath)
                 pathsList.add(paths)
             }
 
@@ -145,4 +146,18 @@ class CombineVideosActivity : BaseActivity(R.layout.activity_combine_videos, R.s
             })
         }
     }
+
+    private fun hasAudio(filePath: String): Boolean {
+        val retriever = MediaMetadataRetriever()
+        return try {
+            retriever.setDataSource(filePath)
+            val hasAudio = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO)
+            hasAudio == "yes"
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
+        } finally {
+            retriever.release()
+        }
+    }
 }