react-native-video-trim 1.0.23 → 2.0.0

package/README.md

@@ -226,6 +226,16 @@ useEffect(() => {
         console.log('onError', event);
         break;
       }
+      case 'onLog': {
+        // FFMPEG logs (while trimming)
+        console.log('onLog', event);
+        break;
+      }
+      case 'onStatistics': {
+        // FFMPEG stats (while trimming)
+        console.log('onStatistics', event);
+        break;
+      }
     }
   });
 
@@ -264,6 +274,18 @@ FFMPEGKIT_PACKAGE_VERSION=5.1 npx pod-install ios
 FFMPEGKIT_PACKAGE=full FFMPEGKIT_PACKAGE_VERSION=5.1 npx pod-install ios
 ```
 
+# Android: update SDK version
+You can override sdk version to use any version in your `android/build.gradle` > `buildscript` > `ext`
+```gradle
+buildscript {
+    ext {
+        VideoTrim_compileSdkVersion = 34
+        VideoTrim_minSdkVersion = 26
+        VideoTrim_targetSdkVersion = 34
+    }
+}
+```
+
 # Thanks
 - Android part is created by modified + fix bugs from: https://github.com/iknow4/Android-Video-Trimmer
 - iOS UI is created from: https://github.com/AndreasVerhoeven/VideoTrimmerControl

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.videotrim">
+
+  <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>

package/android/src/main/java/com/videotrim/VideoTrimModule.java

@@ -147,7 +147,6 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   public void onHostPause() {
     if (trimmerView != null) {
       trimmerView.onVideoPause();
-      trimmerView.setRestoreState(true);
     }
   }
 
@@ -164,6 +163,11 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   }
 
   @Override public void onTrimmingProgress(int percentage) {
+    // prevent onTrimmingProgress is called after onFinishTrim (some rare cases)
+    if (mProgressBar == null) {
+      return;
+    }
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
       mProgressBar.setProgress(percentage, true);
     } else {
@@ -172,10 +176,13 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
   }
 
 
-  @Override public void onFinishTrim(String in) {
+  @Override public void onFinishTrim(String in, long startTime, long endTime, int duration) {
     runOnUiThread(() -> {
       WritableMap map = Arguments.createMap();
       map.putString("outputPath", in);
+      map.putInt("duration", duration);
+      map.putDouble("startTime", (double) startTime);
+      map.putDouble("endTime", (double) endTime);
       sendEvent(getReactApplicationContext(), "onFinishTrimming", map);
       showEditorPromise.resolve(in);
     });
@@ -232,6 +239,14 @@ public class VideoTrimModule extends ReactContextBaseJavaModule implements Video
     alertDialog.show();
   }
 
+  @Override public void onLog(WritableMap log) {
+    sendEvent(getReactApplicationContext(), "onLog", log);
+  }
+
+  @Override public void onStatistics(WritableMap statistics) {
+    sendEvent(getReactApplicationContext(), "onStatistics", statistics);
+  }
+
   @ReactMethod
   private void hideDialog() {
     if (mProgressDialog != null) {

package/android/src/main/java/com/videotrim/interfaces/VideoTrimListener.java

@@ -1,10 +1,14 @@
 package com.videotrim.interfaces;
 
+import com.facebook.react.bridge.WritableMap;
+
 public interface VideoTrimListener {
   void onStartTrim();
   void onTrimmingProgress(int percentage);
-  void onFinishTrim(String url);
+  void onFinishTrim(String url, long startMs, long endMs, int videoDuration);
   void onError(String errorMessage);
   void onCancel();
   void onSave();
+  void onLog(WritableMap log);
+  void onStatistics(WritableMap statistics);
 }

package/android/src/main/java/com/videotrim/utils/VideoTrimmerUtil.java

@@ -7,6 +7,8 @@ import android.net.Uri;
 import com.arthenica.ffmpegkit.FFmpegKit;
 import com.arthenica.ffmpegkit.ReturnCode;
 import com.arthenica.ffmpegkit.SessionState;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.videotrim.interfaces.VideoTrimListener;
 
 import java.text.SimpleDateFormat;
@@ -48,15 +50,29 @@ public class VideoTrimmerUtil {
     // Format the current date and time
     String formattedDateTime = dateFormat.format(currentDate);
 
-    String cmd = "-ss " + startMs + "ms" + " -to " + endMs + "ms -i " + inputFile + " -c copy -metadata creation_time=" + formattedDateTime + " " + outputFile;
     callback.onStartTrim();
-    FFmpegKit.executeAsync(cmd, session -> {
+
+    String[] cmds = {
+      "-ss",
+      startMs + "ms",
+      "-to",
+      endMs + "ms",
+      "-i",
+      inputFile,
+      "-c",
+      "copy",
+      "-metadata",
+      "creation_time=" + formattedDateTime,
+      outputFile
+    };
+
+    FFmpegKit.executeWithArgumentsAsync(cmds, session -> {
       SessionState state = session.getState();
       ReturnCode returnCode = session.getReturnCode();
 
       if (ReturnCode.isSuccess(returnCode)) {
         // SUCCESS
-        callback.onFinishTrim(outputFile);
+        callback.onFinishTrim(outputFile, startMs, endMs, videoDuration);
       }
       else {
         // CANCEL + FAILURE
@@ -64,7 +80,14 @@ public class VideoTrimmerUtil {
         callback.onError(errorMessage);
       }
     }, log -> {
+      System.out.println("FFmpeg process started with log " + log.getMessage());
 
+      WritableMap map = Arguments.createMap();
+      map.putInt("level", log.getLevel().getValue());
+      map.putString("message", log.getMessage());
+      map.putDouble("sessionId", log.getSessionId());
+      map.putString("logStr", log.toString());
+      callback.onLog(map);
     }, statistics -> {
       int timeInMilliseconds = (int) statistics.getTime();
       if (timeInMilliseconds > 0) {
@@ -72,6 +95,18 @@ public class VideoTrimmerUtil {
           (timeInMilliseconds * 100) / videoDuration;
         callback.onTrimmingProgress(Math.min(Math.max(completePercentage, 0), 100));
       }
+
+      WritableMap map = Arguments.createMap();
+      map.putDouble("sessionId", statistics.getSessionId());
+      map.putInt("videoFrameNumber", statistics.getVideoFrameNumber());
+      map.putDouble("videoFps", statistics.getVideoFps());
+      map.putDouble("videoQuality", statistics.getVideoQuality());
+      map.putDouble("size", statistics.getSize());
+      map.putDouble("time", statistics.getTime());
+      map.putDouble("bitrate", statistics.getBitrate());
+      map.putDouble("speed", statistics.getSpeed());
+      map.putString("statisticsStr", statistics.toString());
+      callback.onStatistics(map);
     });
   }