react-native-video-trim 2.0.0 → 2.2.0

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

@@ -1,14 +1,15 @@
 package com.videotrim.utils;
 
-import android.content.Context;
+import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
-import android.net.Uri;
 import com.arthenica.ffmpegkit.FFmpegKit;
+import com.arthenica.ffmpegkit.FFmpegSession;
 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.enums.ErrorCode;
 import com.videotrim.interfaces.VideoTrimListener;
 
 import java.text.SimpleDateFormat;
@@ -31,18 +32,19 @@ public class VideoTrimmerUtil {
   public static int MAX_COUNT_RANGE = 10;  // how many images in the highlight range of seek bar
   public static int SCREEN_WIDTH_FULL = DeviceUtil.getDeviceWidth();
   public static final int RECYCLER_VIEW_PADDING = UnitConverter.dpToPx(35);
+  public static String DEFAULT_AUDIO_EXTENSION = ".wav";
   public static int VIDEO_FRAMES_WIDTH = SCREEN_WIDTH_FULL - RECYCLER_VIEW_PADDING * 2;
 //  public static final int THUMB_WIDTH = (SCREEN_WIDTH_FULL - RECYCLER_VIEW_PADDING * 2) / VIDEO_MAX_TIME;
   public static int mThumbWidth = 0; // make it automatic
   public static final int THUMB_HEIGHT = UnitConverter.dpToPx(50); // x2 for better resolution
   private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
 
-  public static void trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
+  public static FFmpegSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, final VideoTrimListener callback) {
     // Get the current date and time
     Date currentDate = new Date();
 
     // Create a SimpleDateFormat object with the desired format
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+    @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
 
     // Set the timezone to UTC
     dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -65,19 +67,21 @@ public class VideoTrimmerUtil {
       "creation_time=" + formattedDateTime,
       outputFile
     };
+    System.out.println("Command: " + String.join(",", cmds));
 
-    FFmpegKit.executeWithArgumentsAsync(cmds, session -> {
+    return FFmpegKit.executeWithArgumentsAsync(cmds, session -> {
       SessionState state = session.getState();
       ReturnCode returnCode = session.getReturnCode();
-
-      if (ReturnCode.isSuccess(returnCode)) {
+      if (ReturnCode.isSuccess(session.getReturnCode())) {
         // SUCCESS
         callback.onFinishTrim(outputFile, startMs, endMs, videoDuration);
-      }
-      else {
-        // CANCEL + FAILURE
+      } else if (ReturnCode.isCancel(session.getReturnCode())) {
+        // CANCEL
+        callback.onCancelTrim();
+      } else {
+        // FAILURE
         String errorMessage = String.format("Command failed with state %s and rc %s.%s", state, returnCode, session.getFailStackTrace());
-        callback.onError(errorMessage);
+        callback.onError(errorMessage, ErrorCode.TRIMMING_FAILED);
       }
     }, log -> {
       System.out.println("FFmpeg process started with log " + log.getMessage());
@@ -110,18 +114,25 @@ public class VideoTrimmerUtil {
     });
   }
 
-  public static void shootVideoThumbInBackground(final Context context, final Uri videoUri, final int totalThumbsCount, final long startPosition,
+  public static void shootVideoThumbInBackground(final MediaMetadataRetriever mediaMetadataRetriever, final int totalThumbsCount, final long startPosition,
                                                  final long endPosition, final SingleCallback<Bitmap, Integer> callback) {
     BackgroundExecutor.execute(new BackgroundExecutor.Task("", 0L, "") {
       @Override public void execute() {
         try {
-          MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
-          mediaMetadataRetriever.setDataSource(context, videoUri);
           // Retrieve media data use microsecond
           long interval = (endPosition - startPosition) / (totalThumbsCount - 1);
           for (long i = 0; i < totalThumbsCount; ++i) {
             long frameTime = startPosition + interval * i;
-            Bitmap bitmap = mediaMetadataRetriever.getFrameAtTime(frameTime * 1000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC);
+
+            Bitmap bitmap;
+            try {
+              bitmap = mediaMetadataRetriever.getFrameAtTime(frameTime * 1000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC);
+            } catch (final Throwable t) {
+              // this can happen while thumbnails are being generated in background and we press Cancel
+              t.printStackTrace();
+              break;
+            }
+
             if(bitmap == null) continue;
             try {
               bitmap = Bitmap.createScaledBitmap(bitmap, mThumbWidth * THUMB_RESOLUTION_RES, THUMB_HEIGHT * THUMB_RESOLUTION_RES, false);
@@ -130,7 +141,6 @@ public class VideoTrimmerUtil {
             }
             callback.onSingleCallback(bitmap, (int) interval);
           }
-          mediaMetadataRetriever.release();
         } catch (final Throwable e) {
           Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
         }