react-native-video-trim 1.0.22 → 1.0.24

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

@@ -164,6 +164,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 +177,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);
     });

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

@@ -3,7 +3,7 @@ package com.videotrim.interfaces;
 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();

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

@@ -48,15 +48,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 +78,7 @@ public class VideoTrimmerUtil {
         callback.onError(errorMessage);
       }
     }, log -> {
-
+      System.out.println("FFmpeg process started with log " + log.getMessage());
     }, statistics -> {
       int timeInMilliseconds = (int) statistics.getTime();
       if (timeInMilliseconds > 0) {

package/ios/VideoTrim.swift

@@ -281,8 +281,6 @@ class VideoTrim: RCTEventEmitter {
         formatter.timeZone = TimeZone(identifier: "UTC")
         let dateTime = formatter.string(from: Date())
         
-        let cmd = "-ss \(startTime * 1000)ms -to \(endTime * 1000)ms -i \(inputFile) -c copy -metadata creation_time=\(dateTime) \(outputFile)";
-                
         self.emitEventToJS("onStartTrimming", eventData: nil)
         
         // Create Alert
@@ -304,14 +302,28 @@ class VideoTrim: RCTEventEmitter {
             })
         }
         
-        FFmpegKit.executeAsync(cmd, withCompleteCallback: { session in
+        let cmds = [
+            "-ss",
+            "\(startTime * 1000)ms",
+            "-to",
+            "\(endTime * 1000)ms",
+            "-i",
+            "\(inputFile)",
+            "-c",
+            "copy",
+            "-metadata",
+            "creation_time=\(dateTime)",
+            outputFile
+        ]
+        
+        FFmpegKit.execute(withArgumentsAsync: cmds, withCompleteCallback: { session in
             let _ = self.deleteFile(url: inputFile) // remove the file we just copied to document directory
             
             let state = session?.getState()
             let returnCode = session?.getReturnCode()
             
             if ReturnCode.isSuccess(returnCode) {
-                let eventPayload: [String: Any] = ["outputPath": outputFile]
+                let eventPayload: [String: Any] = ["outputPath": outputFile, "startTime": startTime, "endTime": endTime, "duration": videoDuration]
                 self.emitEventToJS("onFinishTrimming", eventData: eventPayload)
                 
                 if (self.saveToPhoto) {
@@ -356,7 +368,7 @@ class VideoTrim: RCTEventEmitter {
                 })
             }
         }, withLogCallback: { log in
-            
+            print("FFmpeg process started with log " + (log?.getMessage() ?? ""));
         }, withStatisticsCallback: { statistics in
             let timeInMilliseconds = statistics?.getTime() ?? 0;
             if timeInMilliseconds > 0 {

package/ios/VideoTrimmerViewController.swift

@@ -48,7 +48,6 @@ class VideoTrimmerViewController: UIViewController {
     var isSeekInProgress: Bool = false  // Marker
     private var chaseTime = CMTime.zero
     private var preferredFrameRate: Float = 23.98
-
     
     // MARK: - Input
     @objc private func didBeginTrimmingFromStart(_ sender: VideoTrimmer) {
@@ -133,6 +132,9 @@ class VideoTrimmerViewController: UIViewController {
             player.removeTimeObserver(token)
             timeObserverToken = nil
         }
+        // Remove observer
+        NotificationCenter.default.removeObserver(self, name: .AVPlayerItemDidPlayToEndTime, object: player.currentItem)
+        
         playerController.player = nil
         playerController.dismiss(animated: false, completion: nil)
     }
@@ -259,6 +261,15 @@ class VideoTrimmerViewController: UIViewController {
             playerController.view.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
             playerController.view.bottomAnchor.constraint(equalTo: trimmer.topAnchor, constant: -16)
         ])
+        
+        // Add observer for the end of playback
+        NotificationCenter.default.addObserver(self, selector: #selector(playerDidFinishPlaying), name: .AVPlayerItemDidPlayToEndTime, object: player.currentItem)
+    }
+    
+    @objc private func playerDidFinishPlaying(note: NSNotification) {
+        // Directly set the play icon
+        // the reason in at this time player.timeControlStatus == .playing still returns true
+        playBtn.setImage(self.playIcon, for: .normal)
     }
     
     private func setupTimeObserver() {
@@ -292,29 +303,29 @@ class VideoTrimmerViewController: UIViewController {
     public func seek(to time: CMTime) {
         seekSmoothlyToTime(newChaseTime: time)
     }
-
+    
     private func seekSmoothlyToTime(newChaseTime: CMTime) {
         if CMTimeCompare(newChaseTime, chaseTime) != 0 {
             chaseTime = newChaseTime
-
+            
             if !isSeekInProgress {
                 trySeekToChaseTime()
             }
         }
     }
-
+    
     private func trySeekToChaseTime() {
         guard player?.status == .readyToPlay else { return }
         actuallySeekToTime()
     }
-
+    
     private func actuallySeekToTime() {
         isSeekInProgress = true
         let seekTimeInProgress = chaseTime
-
+        
         player?.seek(to: seekTimeInProgress, toleranceBefore: .zero, toleranceAfter: .zero) { [weak self] _ in
             guard let `self` = self else { return }
-
+            
             if CMTimeCompare(seekTimeInProgress, self.chaseTime) == 0 {
                 self.isSeekInProgress = false
             } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-video-trim",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Video trimmer for your React Native app",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",