added source / output fps

Author: kibotu

app/src/main/java/com/exozet/videoeditor/demo/MainActivity.kt

@@ -139,12 +139,20 @@ class MainActivity : AppCompatActivity() {
                 frameFolder = frameFolder,
                 outputUri = outputVideo,
                 config = EncodingConfig(
-                    sourceFrameRate = 30 // translates into every input image is a frame in new video
-                )
+                    sourceFrameRate = 120f / 63f,
+                    outputFrameRate = 30f
+                ),
+                deleteFramesOnComplete = false
             ).subscribeOn(Schedulers.computation())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({
-                    logv { "extract frames ${it.progress} ${it.message} ${(it.duration / 1000f).roundToInt()} s" }
+
+                    merge_frames_progress.show()
+                    merge_frames_progress.progress = it.progress
+
+                    logv { "extract frames $it" }
+
+                    output.text = "${(it.duration / 1000f).roundToInt()} s ${it.message?.trimMargin()}\n${output.text}"
 
                 }, {
                     logv { "creating video fails ${it.message}" }

app/src/main/res/layout/activity_main.xml

@@ -62,7 +62,7 @@
             android:layout_marginStart="64dp"
             android:layout_marginEnd="64dp"
             android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/stop_process"
+            app:layout_constraintBottom_toTopOf="@id/transcode_video"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/make_video"

videoeditor/src/main/java/com/exozet/videoeditor/EncodingConfig.kt

@@ -55,11 +55,18 @@ data class EncodingConfig(
      */
     @IntRange(from = 0, to = 63)
     val videoQuality: Int? = null,
+
     /**
-     * -r Frame rate of the video.
+     * -framerate input Frame rate of the video.
      * https://lists.ffmpeg.org/pipermail/ffmpeg-user/2013-July/016273.html
      */
-    val sourceFrameRate: Int? = null,
+    val sourceFrameRate: Float? = 30000f/1001f,
+
+    /**
+     * -r output Frame rate of the video.
+     * https://video.stackexchange.com/a/13074
+     */
+    val outputFrameRate: Float? = 30000f/1001f,
 
     /**
      * pix_fmts

videoeditor/src/main/java/com/exozet/videoeditor/FFMpegTranscoder.kt

@@ -248,13 +248,17 @@ object FFMpegTranscoder {
                 add("-y")
 
                 config.sourceFrameRate?.let {
-                    add("-r"); add("${config.sourceFrameRate}")
+                    add("-framerate"); add("${config.sourceFrameRate}")
                 }
 
                 add("-threads"); add("${Runtime.getRuntime().availableProcessors()}")
+
                 add("-i"); add("${frameFolder.path}/image_%03d.jpg")
+
+                add("-r"); add("${config.outputFrameRate}")
+
                 add("-c:v"); add("${config.encoding}")
-                add("-x264opts"); add("keyint=${config.keyInt}:min-keyint=${config.minKeyInt}:no-scenecut")
+//                add("-x264opts"); add("keyint=${config.keyInt}:min-keyint=${config.minKeyInt}:no-scenecut")
 
                 config.gopValue?.let {
                     add("-g"); add("${config.gopValue}")