react-native-video-trim 6.2.0 → 6.2.2

package/ios/VideoTrim.swift

@@ -8,6 +8,7 @@ let FILE_PREFIX = "trimmedVideo"
 public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDelegate {
   // MARK: instance private props
   private var isShowing = false
+  private var isTrimming = false
   private var vc: VideoTrimmerViewController?
   private var outputFile: URL?
   private var editorConfig: NSDictionary?
@@ -260,6 +261,9 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
   }
   
   private func trim(viewController: VideoTrimmerViewController, inputFile: URL, videoDuration: Double, startTime: Double, endTime: Double, isVideoType: Bool) {
+    guard !isTrimming else { return }
+    isTrimming = true
+
     vc?.pausePlayer()
     
     let timestamp = Int(Date().timeIntervalSince1970)
@@ -297,7 +301,9 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
               self.emitEventToJS("onCancelTrimming", eventData: nil)
             }
             
-            progressAlert.dismiss(animated: true)
+            progressAlert.dismiss(animated: true) {
+              self.isTrimming = false
+            }
           })
           
           // Create Cancel button with action handlder
@@ -318,7 +324,9 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
             self.emitEventToJS("onCancelTrimming", eventData: nil)
           }
           
-          progressAlert.dismiss(animated: true)
+          progressAlert.dismiss(animated: true) {
+            self.isTrimming = false
+          }
         }
         
       }
@@ -358,14 +366,11 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
     
     ffmpegSession = FFmpegKit.execute(withArgumentsAsync: cmds, withCompleteCallback: { session in
       
-      // always hide progressAlert
-      DispatchQueue.main.async {
-        progressAlert.dismiss(animated: true)
-      }
-      
       let state = session?.getState()
       let returnCode = session?.getReturnCode()
       
+      var shouldCloseEditor = false
+      
       if ReturnCode.isSuccess(returnCode) {
         let eventPayload: [String: Any] = ["outputPath": self.outputFile!.absoluteString, "startTime": (startTime * 1000).rounded(), "endTime": (endTime * 1000).rounded(), "duration": (videoDuration * 1000).rounded()]
         self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
@@ -396,20 +401,24 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
             }
           }
         } else if self.openDocumentsOnFinish {
-          self.saveFileToFilesApp(fileURL: self.outputFile!)
-          
-          // must return otherwise editor will close
+          DispatchQueue.main.async {
+            progressAlert.dismiss(animated: true) {
+              self.isTrimming = false
+              self.saveFileToFilesApp(fileURL: self.outputFile!)
+            }
+          }
           return
         } else if self.openShareSheetOnFinish {
-          self.shareFile(fileURL: self.outputFile!)
-          
-          // must return otherwise editor will close
+          DispatchQueue.main.async {
+            progressAlert.dismiss(animated: true) {
+              self.isTrimming = false
+              self.shareFile(fileURL: self.outputFile!)
+            }
+          }
           return
         }
         
-        if self.closeWhenFinish {
-          self.closeEditor(delay: 500)
-        }
+        shouldCloseEditor = self.closeWhenFinish
         
       } else if ReturnCode.isCancel(returnCode) {
         // CANCEL
@@ -417,8 +426,15 @@ public class VideoTrim: RCTEventEmitter, AssetLoaderDelegate, UIDocumentPickerDe
       } else {
         // FAILURE
         self.onError(message: "Command failed with state \(String(describing: FFmpegKitConfig.sessionState(toString: state ?? .failed))) and rc \(String(describing: returnCode)).\(String(describing: session?.getFailStackTrace()))", code: .trimmingFailed)
-        if self.closeWhenFinish {
-          self.closeEditor(delay: 500)
+        shouldCloseEditor = self.closeWhenFinish
+      }
+      
+      DispatchQueue.main.async {
+        progressAlert.dismiss(animated: true) {
+          self.isTrimming = false
+          if shouldCloseEditor {
+            self.closeEditor()
+          }
         }
       }
       
@@ -809,15 +825,18 @@ extension VideoTrim {
   @objc(closeEditor:)
   public func closeEditor(delay: Int = 0) {
     guard let vc = vc else { return }
-    // some how in case we trim a very short video the view controller is still visible after first .dismiss call
-    // even the file is successfully saved
-    // that's why we need a small delay here to ensure vc will be dismissed
-    DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(delay)) {
+    let dismissBlock = {
       vc.dismiss(animated: true, completion: {
         self.emitEventToJS("onHide", eventData: nil)
         self.isShowing = false
       })
     }
+
+    if delay > 0 {
+      DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(delay), execute: dismissBlock)
+    } else {
+      DispatchQueue.main.async(execute: dismissBlock)
+    }
   }
   
   // Old Arch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "description": "Video trimmer for your React Native app",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

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

@@ -1,5 +0,0 @@
-package com.videotrim.interfaces;
-
-public interface IVideoTrimmerView {
-  void onDestroy();
-}

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

@@ -1,19 +0,0 @@
-package com.videotrim.interfaces;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.videotrim.enums.ErrorCode;
-
-import java.util.Map;
-
-public interface VideoTrimListener {
-  void onLoad(int duration);
-  void onTrimmingProgress(int percentage);
-  void onFinishTrim(String url, long startMs, long endMs, int videoDuration);
-  void onCancelTrim();
-  void onError(String errorMessage, ErrorCode errorCode);
-  void onCancel();
-  void onSave();
-  void onLog(WritableMap log);
-  void onStatistics(WritableMap statistics);
-}

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

@@ -1,92 +0,0 @@
-package com.videotrim.utils;
-
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.util.Log;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-
-public class MediaMetadataUtil {
-
-  private static final String TAG = "MediaMetadataUtil";
-
-  // Function to return MediaMetadataRetriever or null
-  public static MediaMetadataRetriever getMediaMetadataRetriever(String source) {
-    MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-    try {
-      if (source.startsWith("http://") || source.startsWith("https://")) {
-        retriever.setDataSource(source, new HashMap<>());
-      } else {
-        String filePath = source;
-
-        // if "source" is not a valid file path, try to parse it as a URI
-        if (!StorageUtil.isFileExists(filePath)) {
-          Log.e(TAG, "File does not exist, trying to parse as URI: " + source);
-
-          Uri uri = Uri.parse(source);
-          filePath = uri.getPath();
-
-          if (!StorageUtil.isFileExists(filePath)) {
-            Log.e(TAG, "File does not exist at path: " + filePath);
-            return null;
-          }
-        }
-
-        retriever.setDataSource(filePath);
-      }
-      return retriever;
-    } catch (Exception e) {
-      Log.e(TAG, "Error setting data source", e);
-      try {
-        retriever.release();
-      } catch (Exception ee) {
-        Log.e(TAG, "Error releasing retriever", ee);
-      }
-      return null;
-    }
-  }
-
-  public static void checkFileValidity(String urlString, FileValidityCallback callback) {
-    new Thread(() -> {
-      boolean isValid = false;
-      String fileType = "unknown";
-      long duration;
-      MediaMetadataRetriever retriever = getMediaMetadataRetriever(urlString);
-      if (retriever == null) {
-        callback.onResult(false, fileType, -1L);
-        return;
-      }
-
-      // Retrieve the duration
-      String durationStr = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
-      duration = durationStr == null ? -1L : Long.parseLong(durationStr);
-
-      // Determine the type
-      String hasVideo = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO);
-      if (hasVideo != null && hasVideo.equals("yes")) {
-        fileType = "video";
-        isValid = true;
-      } else {
-        String hasAudio = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_AUDIO);
-        if (hasAudio != null && hasAudio.equals("yes")) {
-          fileType = "audio";
-          isValid = true;
-        }
-      }
-
-      try {
-        retriever.release();
-      } catch (IOException e) {
-        Log.e(TAG, "Error releasing retriever", e);
-      }
-      callback.onResult(isValid, fileType, isValid ? duration : -1L);
-    }).start();
-  }
-
-  public interface FileValidityCallback {
-    void onResult(boolean isValid, String fileType, Long duration);
-  }
-}
-

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

@@ -1,147 +0,0 @@
-package com.videotrim.utils;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.media.MediaScannerConnection;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.text.TextUtils;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class StorageUtil {
-  public static String getOutputPath(Context context, String mOutputExt) {
-    long timestamp = System.currentTimeMillis() / 1000;
-    File file = new File(context.getFilesDir(), VideoTrimmerUtil.FILE_PREFIX + "_" + timestamp + "." + mOutputExt);
-    return file.getAbsolutePath();
-  }
-
-  public static boolean isFileExists(String filePath) {
-    if (TextUtils.isEmpty(filePath)) return false;
-    File file = new File(filePath);
-    return file.exists();
-  }
-
-  public static String[] listFiles(Context context) {
-    File filesDir = context.getFilesDir();
-    File[] files = filesDir.listFiles((dir, name) -> name.startsWith(VideoTrimmerUtil.FILE_PREFIX));
-
-    List<String> fileUrls = new ArrayList<>();
-    if (files != null) {
-      for (File file : files) {
-        fileUrls.add(file.getAbsolutePath());
-      }
-    }
-
-    return fileUrls.toArray(new String[0]);
-  }
-
-  public static boolean deleteFile(String path) {
-    if (TextUtils.isEmpty(path)) return true;
-    return deleteFile(new File(path));
-  }
-
-  public static boolean deleteFile(File file) {
-    if (file == null || !file.exists()) return true;
-
-    if (file.isFile()) {
-      return file.delete();
-    }
-
-    if (!file.isDirectory()) {
-      return false;
-    }
-
-    for (File f : file.listFiles()) {
-      if (f.isFile()) {
-        f.delete();
-      } else if (f.isDirectory()) {
-        deleteFile(f);
-      }
-    }
-    return file.delete();
-  }
-
-  public static void saveVideoToGallery(ReactApplicationContext context, String videoFilePath) throws IOException {
-    File videoFile = new File(videoFilePath);
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      // For Android 10 and higher (API >= 29)
-      saveVideoUsingMediaStore(context, videoFile);
-    } else {
-      // For Android 9 and below (API < 29)
-      try {
-        saveVideoUsingTraditionalStorage(context, videoFile);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  // Save video using MediaStore for API level >= 29
-  private static void saveVideoUsingMediaStore(Context context, File videoFile) {
-    ContentValues values = new ContentValues();
-    values.put(MediaStore.Video.Media.TITLE, "My Video Title");
-    values.put(MediaStore.Video.Media.MIME_TYPE, "video/mp4");
-    values.put(MediaStore.Video.Media.RELATIVE_PATH, Environment.DIRECTORY_DCIM);
-    Uri uri = context.getContentResolver().insert(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values);
-
-    if (uri != null) {
-      try {
-        OutputStream outputStream = context.getContentResolver().openOutputStream(uri);
-        copyFile(videoFile, outputStream);
-        MediaScannerConnection.scanFile(context, new String[]{uri.toString()}, new String[]{"video/*"}, null);
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  // Save video using traditional storage for API level < 29
-  private static void saveVideoUsingTraditionalStorage(Context context, File videoFile) throws IOException {
-    File galleryDirectory = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
-    File destinationFile = new File(galleryDirectory, videoFile.getName());
-    copyFile(videoFile, destinationFile);
-    MediaScannerConnection.scanFile(context, new String[]{destinationFile.getAbsolutePath()}, new String[]{"video/*"}, null);
-  }
-
-  private static void copyFile(File sourceFile, OutputStream outputStream) throws IOException {
-    InputStream inputStream = new FileInputStream(sourceFile);
-    copyFile(inputStream, outputStream);
-  }
-
-  private static void copyFile(File sourceFile, File destFile) throws IOException {
-    InputStream inputStream = new FileInputStream(sourceFile);
-    OutputStream outputStream = new FileOutputStream(destFile);
-    copyFile(inputStream, outputStream);
-  }
-
-  private static void copyFile(InputStream inputStream, OutputStream outputStream) throws IOException {
-    try {
-      byte[] buffer = new byte[1024];
-      int length;
-      while ((length = inputStream.read(buffer)) > 0) {
-        outputStream.write(buffer, 0, length);
-      }
-
-    } finally {
-      if (inputStream != null) {
-        inputStream.close();
-      }
-      if (outputStream != null) {
-        outputStream.close();
-      }
-    }
-  }
-}

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

@@ -1,171 +0,0 @@
-package com.videotrim.utils;
-
-import android.annotation.SuppressLint;
-import android.graphics.Bitmap;
-import android.media.MediaMetadataRetriever;
-import android.util.Log;
-
-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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
-import iknow.android.utils.DeviceUtil;
-import iknow.android.utils.UnitConverter;
-import iknow.android.utils.callback.SingleCallback;
-import iknow.android.utils.thread.BackgroundExecutor;
-
-
-public class VideoTrimmerUtil {
-
-  private static final String TAG = VideoTrimmerUtil.class.getSimpleName();
-  public static final String FILE_PREFIX = "trimmedVideo";
-  public static final long MIN_SHOOT_DURATION = 1000L;// min 3 seconds for trimming
-  public static final int VIDEO_MAX_TIME = 10;// max 10 seconds for trimming
-  public static final long MAX_SHOOT_DURATION = VIDEO_MAX_TIME * 1000L;
-//  public static long maxShootDuration = 10 * 1000L;
-  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
-  public static final int THUMB_WIDTH = UnitConverter.dpToPx(25); // x2 for better resolution
-  private static final int THUMB_RESOLUTION_RES = 2; // double thumb resolution for better quality
-
-  public static FFmpegSession trim(String inputFile, String outputFile, int videoDuration, long startMs, long endMs, boolean enableRotation, double rotationAngle, final VideoTrimListener callback) {
-    // Get the current date and time
-    Date currentDate = new Date();
-
-    // Create a SimpleDateFormat object with the desired format
-    @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-
-    // Set the timezone to UTC
-    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    // Format the current date and time
-    String formattedDateTime = dateFormat.format(currentDate);
-
-    // create list to store commands
-    List<String> cmds = new ArrayList<>();
-    cmds.add("-ss");
-    cmds.add(startMs + "ms");
-    cmds.add("-to");
-    cmds.add(endMs + "ms");
-
-    if (enableRotation) {
-      // add "-display_rotation" and rotation angle to the command, contact, not creating new
-      cmds.add("-display_rotation");
-      cmds.add(String.valueOf(rotationAngle));
-    }
-
-    cmds.add("-i");
-    cmds.add(inputFile);
-    cmds.add("-c");
-    cmds.add("copy");
-    cmds.add("-metadata");
-    cmds.add("creation_time=" + formattedDateTime);
-    cmds.add(outputFile);
-
-    String[] command = cmds.toArray(new String[0]);
-    String cmdStr = "Command: " + String.join(" ", command);
-
-    Log.d(TAG, cmdStr);
-
-    WritableMap m = Arguments.createMap();
-    m.putString("message", cmdStr);
-
-    callback.onLog(m);
-
-    return FFmpegKit.executeWithArgumentsAsync(command, session -> {
-      SessionState state = session.getState();
-      ReturnCode returnCode = session.getReturnCode();
-      if (ReturnCode.isSuccess(session.getReturnCode())) {
-        // SUCCESS
-        callback.onFinishTrim(outputFile, startMs, endMs, videoDuration);
-      } 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, ErrorCode.TRIMMING_FAILED);
-      }
-    }, log -> {
-      Log.d(TAG, "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) {
-        int completePercentage =
-          (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);
-    });
-  }
-
-  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 {
-          // 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;
-            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);
-            } catch (final Throwable t) {
-              t.printStackTrace();
-            }
-            callback.onSingleCallback(bitmap, (int) interval);
-          }
-        } catch (final Throwable e) {
-          Thread.getDefaultUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
-        }
-      }
-    });
-  }
-}
-