react-native-compressor 0.5.9 → 0.5.14

package/android/src/main/java/com/reactnativecompressor/Audio/AudioCompressor.java

@@ -14,9 +14,7 @@ import android.os.Build;
 
 import androidx.annotation.RequiresApi;
 
-import com.zolad.videoslimmer.VideoSlimmer;
-import com.zolad.videoslimmer.listner.SlimProgressListener;
-import com.zolad.videoslimmer.muxer.CodecInputSurface;
+import numan.dev.videocompressor.codecinputsurface.CodecInputSurface;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +44,7 @@ public class AudioCompressor {
    * */
   @SuppressLint("LongLogTag")
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-  public boolean CompressAudio(final String sourcePath, String destinationPath, int nbitrate, VideoSlimmer.ProgressListener listener) {
+  public boolean CompressAudio(final String sourcePath, String destinationPath, int nbitrate) {
 
     this.path = sourcePath;
     this.outputPath = destinationPath;
@@ -350,6 +348,7 @@ public class AudioCompressor {
   }
 
 
+  @SuppressLint("WrongConstant")
   @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
   private long simpleReadAndWriteTrack(MediaExtractor extractor, MediaMuxer mediaMuxer, MediaCodec.BufferInfo info, long start, long end, File file, boolean isAudio) throws Exception {
     int trackIndex = selectTrack(extractor, isAudio);

package/android/src/main/java/com/reactnativecompressor/CompressorModule.java

@@ -1,6 +1,5 @@
 package com.reactnativecompressor;
 
-import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
@@ -10,7 +9,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -23,10 +21,8 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.reactnativecompressor.Image.ImageCompressor;
 import com.reactnativecompressor.Image.utils.ImageCompressorOptions;
 import com.reactnativecompressor.Video.VideoCompressorHelper;
-import com.zolad.videoslimmer.VideoSlimmer;
 
 import static com.reactnativecompressor.Utils.Utils.generateCacheFilePath;
-import java.io.ByteArrayOutputStream;
 import com.reactnativecompressor.Audio.AudioCompressor;
 
 @ReactModule(name = CompressorModule.NAME)
@@ -93,35 +89,7 @@ public class CompressorModule extends ReactContextBaseJavaModule {
 
       float bitrate = options.bitrate;
       Log.d("nomi onStart", destinationPath+"onProgress: "+bitrate);
-      new AudioCompressor().CompressAudio(srcPath, destinationPath, (int) bitrate*1000, new VideoSlimmer.ProgressListener() {
-
-
-        @Override
-        public void onStart() {
-          //convert start
-          Log.d("nomi onStart", "onProgress: ");
-
-        }
-
-        @Override
-        public void onFinish(boolean result) {
-          //convert finish,result(true is success,false is fail)
-          promise.resolve(destinationPath);
-          Log.d("nomi onFinish", "onProgress: ");
-        }
-
-
-        @Override
-        public void onProgress(float percent) {
-          WritableMap params = Arguments.createMap();
-          WritableMap data = Arguments.createMap();
-          params.putString("uuid", options.uuid);
-          data.putDouble("progress",  percent/100);
-          params.putMap("data", data);
-          Log.d("nomi onProgress", "onProgress: "+percent);
-          sendEvent(reactContext, "videoCompressProgress", params);
-        }
-      });
+      new AudioCompressor().CompressAudio(srcPath, destinationPath, (int) bitrate*1000);
 
     } catch (Exception ex) {
       promise.reject(ex);

package/android/src/main/java/com/reactnativecompressor/Utils/Utils.java

@@ -1,15 +1,89 @@
 package com.reactnativecompressor.Utils;
 
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import numan.dev.videocompressor.VideoCompressTask;
+import numan.dev.videocompressor.VideoCompressor;
 
 import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 
 public class Utils {
+  static int videoCompressionThreshold=10;
+  static Map<String, VideoCompressTask> compressorExports = new HashMap<>();
+
   public static String generateCacheFilePath(String extension, ReactApplicationContext reactContext){
     File outputDir = reactContext.getCacheDir();
 
     String outputUri = String.format("%s/%s." + extension, outputDir.getPath(), UUID.randomUUID().toString());
     return outputUri;
   }
+
+
+  public static void compressVideo(String srcPath, String destinationPath, int resultWidth, int resultHeight, float videoBitRate, String uuid, Promise promise, ReactApplicationContext reactContext){
+    final int[] currentVideoCompression = {0};
+    try{
+      VideoCompressTask export=VideoCompressor.convertVideo(srcPath, destinationPath, resultWidth, resultHeight, (int) videoBitRate, new VideoCompressor.ProgressListener() {
+      @Override
+      public void onStart() {
+        //convert start
+      }
+      @Override
+      public void onFinish(boolean result) {
+        //convert finish,result(true is success,false is fail)
+        promise.resolve("file:/"+destinationPath);
+      }
+
+      @Override
+      public void onError(String errorMessage) {
+        promise.reject("Compression has canncelled");
+      }
+
+      @Override
+      public void onProgress(float percent) {
+        int roundProgress=Math.round(percent);
+        if(roundProgress%videoCompressionThreshold==0&&roundProgress> currentVideoCompression[0]) {
+          WritableMap params = Arguments.createMap();
+          WritableMap data = Arguments.createMap();
+          params.putString("uuid", uuid);
+          data.putDouble("progress", percent / 100);
+          params.putMap("data", data);
+          sendEvent(reactContext, "videoCompressProgress", params);
+          currentVideoCompression[0] =roundProgress;
+        }
+      }
+    });
+      compressorExports.put(uuid, export);
+  } catch (Exception ex) {
+    promise.reject(ex);
+  }
+    finally {
+    currentVideoCompression[0] =0;
+  }
+  }
+
+  public static void cancelCompressionHelper(String uuid){
+    try{
+      VideoCompressTask export=compressorExports.get(uuid);
+      export.cancel(true);
+    }
+    catch (Exception ex) {
+    }
+  }
+
+  private static void sendEvent(ReactContext reactContext,
+                                String eventName,
+                                @Nullable WritableMap params) {
+    reactContext
+      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+      .emit(eventName, params);
+  }
 }

package/android/src/main/java/com/reactnativecompressor/Video/AutoVideoCompression/AutoVideoCompression.java

@@ -1,94 +1,60 @@
 package com.reactnativecompressor.Video.AutoVideoCompression;
 
-import android.media.MediaCodecInfo;
 import android.media.MediaMetadataRetriever;
-import android.media.session.MediaController;
 import android.net.Uri;
-import android.os.Build;
 
 import androidx.annotation.Nullable;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.reactnativecompressor.Video.VideoCompressorHelper;
-import com.zolad.videoslimmer.VideoSlimmer;
+import static com.reactnativecompressor.Utils.Utils.compressVideo;
 
 import java.io.File;
 
 import static com.reactnativecompressor.Utils.Utils.generateCacheFilePath;
 
 public class AutoVideoCompression {
-  static int videoCompressionThreshold=10;
-  static int currentVideoCompression=0;
-
   public static void createCompressionSettings(String fileUrl,VideoCompressorHelper options,Promise promise, ReactApplicationContext reactContext) {
     float maxSize = options.maxSize;
     float minimumFileSizeForCompress=options.minimumFileSizeForCompress;
     try{
-    Uri uri= Uri.parse(fileUrl);
-    String srcPath = uri.getPath();
-    MediaMetadataRetriever metaRetriever = new MediaMetadataRetriever();
-    metaRetriever.setDataSource(srcPath);
-    File file=new File(srcPath);
-    float sizeInBytes = file.length();
-    float sizeInMb = sizeInBytes / (1024 * 1024);
-    if(sizeInMb>minimumFileSizeForCompress)
-    {
-      String destinationPath = generateCacheFilePath("mp4", reactContext);
-      int actualHeight =Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT));
-      int actualWidth = Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH));
-      int bitrate = Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE));
-
-      float scale = actualWidth > actualHeight ? maxSize / actualWidth : maxSize / actualHeight;
-      int resultWidth = Math.round(actualWidth * scale / 2) * 2;
-      int resultHeight = Math.round(actualHeight * scale / 2) * 2;
-
-      float videoBitRate = makeVideoBitrate(
-        actualHeight, actualWidth,
-        bitrate,
-        resultHeight, resultWidth
-      );
+      Uri uri= Uri.parse(fileUrl);
+      String srcPath = uri.getPath();
+      MediaMetadataRetriever metaRetriever = new MediaMetadataRetriever();
+      metaRetriever.setDataSource(srcPath);
+      File file=new File(srcPath);
+      float sizeInBytes = file.length();
+      float sizeInMb = sizeInBytes / (1024 * 1024);
+      if(sizeInMb>minimumFileSizeForCompress)
+      {
+        String destinationPath = generateCacheFilePath("mp4", reactContext);
+        int actualHeight =Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT));
+        int actualWidth = Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH));
+        int bitrate = Integer.parseInt(metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE));
 
-      VideoSlimmer.convertVideo(srcPath, destinationPath, resultWidth, resultHeight, (int) videoBitRate, new VideoSlimmer.ProgressListener() {
-        @Override
-        public void onStart() {
-          //convert start
-        }
-        @Override
-        public void onFinish(boolean result) {
-          //convert finish,result(true is success,false is fail)
-          promise.resolve("file:/"+destinationPath);
-        }
-        @Override
-        public void onProgress(float percent) {
-          int roundProgress=Math.round(percent);
-          if(roundProgress%videoCompressionThreshold==0&&roundProgress>currentVideoCompression) {
-            WritableMap params = Arguments.createMap();
-            WritableMap data = Arguments.createMap();
-            params.putString("uuid", options.uuid);
-            data.putDouble("progress", percent / 100);
-            params.putMap("data", data);
-            sendEvent(reactContext, "videoCompressProgress", params);
-            currentVideoCompression=roundProgress;
-          }
-        }
-      });
+        float scale = actualWidth > actualHeight ? maxSize / actualWidth : maxSize / actualHeight;
+        int resultWidth = Math.round(actualWidth * scale / 2) * 2;
+        int resultHeight = Math.round(actualHeight * scale / 2) * 2;
 
+        float videoBitRate = makeVideoBitrate(
+          actualHeight, actualWidth,
+          bitrate,
+          resultHeight, resultWidth
+        );
+        compressVideo(srcPath, destinationPath, resultWidth, resultHeight,  videoBitRate,options.uuid,promise,reactContext);
       }
       else
       {
         promise.resolve(fileUrl);
       }
+
     } catch (Exception ex) {
       promise.reject(ex);
     }
-    finally {
-      currentVideoCompression=0;
-    }
   }
 
   public static int makeVideoBitrate(int originalHeight, int originalWidth, int originalBitrate, int height, int width) {

package/android/src/main/java/com/reactnativecompressor/Video/VideoCompressorHelper.java

@@ -8,7 +8,6 @@ import android.os.PowerManager;
 
 import androidx.annotation.Nullable;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -17,13 +16,12 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.reactnativecompressor.Image.utils.ImageCompressorOptions;
 import com.reactnativecompressor.Utils.FileUplaoder.FileUploader;
 import com.reactnativecompressor.Video.AutoVideoCompression.AutoVideoCompression;
-import com.zolad.videoslimmer.VideoSlimmer;
 
 import java.util.UUID;
 
+import static com.reactnativecompressor.Utils.Utils.compressVideo;
 import static com.reactnativecompressor.Utils.Utils.generateCacheFilePath;
 
 public class VideoCompressorHelper {
@@ -50,8 +48,8 @@ public class VideoCompressorHelper {
   };
 
   private static void  sendEventString(ReactContext reactContext,
-                               String eventName,
-                               @Nullable String params) {
+                                       String eventName,
+                                       @Nullable String params) {
     reactContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
       .emit(eventName, params);
@@ -118,7 +116,7 @@ public class VideoCompressorHelper {
         case "maxSize":
           options.maxSize = (float) map.getDouble(key);
           break;
-          case "uuid":
+        case "uuid":
           options.uuid = map.getString(key);
           break;
         case "minimumFileSizeForCompress":
@@ -166,44 +164,10 @@ public class VideoCompressorHelper {
         }
       }
       float videoBitRate = (options.bitrate>0)?options.bitrate: (float) (height * width * 1.5);
-
-      VideoSlimmer.convertVideo(srcPath, destinationPath, width, height, (int) videoBitRate, new VideoSlimmer.ProgressListener() {
-
-
-        @Override
-        public void onStart() {
-          //convert start
-
-        }
-
-        @Override
-        public void onFinish(boolean result) {
-          //convert finish,result(true is success,false is fail)
-          promise.resolve("file:/"+destinationPath);
-        }
-
-
-        @Override
-        public void onProgress(float percent) {
-          int roundProgress=Math.round(percent);
-          if(roundProgress%videoCompressionThreshold==0&&roundProgress>currentVideoCompression) {
-            WritableMap params = Arguments.createMap();
-            WritableMap data = Arguments.createMap();
-            params.putString("uuid", options.uuid);
-            data.putDouble("progress", percent / 100);
-            params.putMap("data", data);
-            sendEvent(reactContext, "videoCompressProgress", params);
-            currentVideoCompression=roundProgress;
-          }
-        }
-      });
-
+      compressVideo(srcPath, destinationPath, width, height,  videoBitRate,options.uuid,promise,reactContext);
     } catch (Exception ex) {
       promise.reject(ex);
     }
-    finally {
-      currentVideoCompression=0;
-    }
   }
 
 
@@ -212,4 +176,4 @@ public class VideoCompressorHelper {
   }
 
 
-  }
+}

package/android/src/main/java/com/reactnativecompressor/Video/VideoModule.java

@@ -1,12 +1,10 @@
 package com.reactnativecompressor.Video;
 
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -16,16 +14,13 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.reactnativecompressor.Image.utils.ImageCompressorOptions;
-import com.zolad.videoslimmer.VideoSlimmer;
 
-import static com.reactnativecompressor.Utils.Utils.generateCacheFilePath;
 import static com.reactnativecompressor.Video.VideoCompressorHelper.video_activateBackgroundTask_helper;
 import static com.reactnativecompressor.Video.VideoCompressorHelper.video_deactivateBackgroundTask_helper;
 import static com.reactnativecompressor.Video.VideoCompressorHelper.video_upload_helper;
-
+import static com.reactnativecompressor.Utils.Utils.cancelCompressionHelper;
 @ReactModule(name = VideoModule.NAME)
-public class VideoModule extends ReactContextBaseJavaModule {
+public class  VideoModule extends ReactContextBaseJavaModule {
   public static final String NAME = "VideoCompressor";
   private final ReactApplicationContext reactContext;
   public VideoModule(ReactApplicationContext reactContext) {
@@ -53,18 +48,25 @@ public class VideoModule extends ReactContextBaseJavaModule {
     String fileUrl,
     ReadableMap optionMap,
     Promise promise) {
-      final VideoCompressorHelper options = VideoCompressorHelper.fromMap(optionMap);
+    final VideoCompressorHelper options = VideoCompressorHelper.fromMap(optionMap);
+
+    if(options.compressionMethod==VideoCompressorHelper.CompressionMethod.auto)
+    {
+      VideoCompressorHelper.VideoCompressAuto(fileUrl,options,promise,reactContext);
+    }
+    else
+    {
+      VideoCompressorHelper.VideoCompressManual(fileUrl,options,promise,reactContext);
+    }
 
-      if(options.compressionMethod==VideoCompressorHelper.CompressionMethod.auto)
-      {
-        VideoCompressorHelper.VideoCompressAuto(fileUrl,options,promise,reactContext);
-      }
-      else
-      {
-        VideoCompressorHelper.VideoCompressManual(fileUrl,options,promise,reactContext);
-      }
 
+  }
 
+  @ReactMethod
+  public void cancelCompression(
+    String uuid) {
+    cancelCompressionHelper(uuid);
+    Log.d("cancelCompression", uuid);
   }
 
   @ReactMethod

package/ios/Compressor.m

@@ -239,5 +239,6 @@ RCT_EXTERN_METHOD(deactivateBackgroundTask: (NSDictionary *)options
                  withResolver:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-@end
+RCT_EXTERN_METHOD(cancelCompression:(NSString *)uuid)
 
+@end

package/ios/Video/VideoCompressor.swift

@@ -34,8 +34,9 @@ class VideoCompressor: RCTEventEmitter, URLSessionTaskDelegate {
   var hasListener: Bool=false
   var uploadResolvers: [String: RCTPromiseResolveBlock] = [:]
   var uploadRejectors: [String: RCTPromiseRejectBlock] = [:]
+  var compressorExports: [String: NextLevelSessionExporter] = [:]
     let videoCompressionThreshold:Int=7
-    var videoCompressionCounter:Int=0
+    
 
   override static func requiresMainQueueSetup() -> Bool {
     return false
@@ -71,7 +72,7 @@ class VideoCompressor: RCTEventEmitter, URLSessionTaskDelegate {
   @objc(compress:withOptions:withResolver:withRejecter:)
   func compress(fileUrl: String, options: [String: Any], resolve:@escaping RCTPromiseResolveBlock, reject:@escaping RCTPromiseRejectBlock) -> Void {
     compressVideo(url: URL(string: fileUrl)!, options:options,
-    onProgress: { progress in 
+    onProgress: { progress in
       print("Progress", progress)
       if(self.hasListener){
         self.sendEvent(withName: "videoCompressProgress", body: ["uuid": options["uuid"], "data": ["progress": progress]])
@@ -83,6 +84,11 @@ class VideoCompressor: RCTEventEmitter, URLSessionTaskDelegate {
     })
   }
     
+    @objc(cancelCompression:)
+    func cancelCompression(uuid: String) -> Void {
+        compressorExports[uuid]?.cancelExport()
+    }
+    
 func makeValidUri(filePath: String) -> String {
     let fileWithUrl = URL(fileURLWithPath: filePath)
     let absoluteUrl = fileWithUrl.deletingLastPathComponent()
@@ -219,7 +225,7 @@ func makeValidUri(filePath: String) -> String {
         }
         else
         {
-            manualCompressionHelper(url: url, bitRate: options["bitrate"] as! Float?) { progress in
+            manualCompressionHelper(url: url, options:options) { progress in
                 onProgress(progress)
             } onCompletion: { outputURL in
                 onCompletion(outputURL)
@@ -247,7 +253,7 @@ func makeValidUri(filePath: String) -> String {
         let maxBitrate:Int = 1669000
         let minValue:Float=min(Float(originalHeight)/Float(height),Float(originalWidth)/Float(width))
         var remeasuredBitrate:Int = Int(Float(originalBitrate) / minValue)
-        remeasuredBitrate = remeasuredBitrate*Int(compressFactor)
+        remeasuredBitrate = Int(Float(remeasuredBitrate)*compressFactor)
         let minBitrate:Int = self.getVideoBitrateWithFactor(f: minCompressFactor) / (1280 * 720 / (width * height))
         if (originalBitrate < minBitrate) {
           return remeasuredBitrate;
@@ -263,6 +269,7 @@ func makeValidUri(filePath: String) -> String {
     
     func autoCompressionHelper(url: URL, options: [String: Any], onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
         let maxSize:Float = options["maxSize"] as! Float;
+        let uuid:String = options["uuid"] as! String
     
         let asset = AVAsset(url: url)
         guard asset.tracks.count >= 1 else {
@@ -286,8 +293,8 @@ func makeValidUri(filePath: String) -> String {
             originalBitrate: Int(bitrate),
             height: Int(resultHeight), width: Int(resultWidth)
             );
-
-        exportVideoHelper(url: url, asset: asset, bitRate: videoBitRate, resultWidth: resultWidth, resultHeight: resultHeight) { progress in
+        
+        exportVideoHelper(url: url, asset: asset, bitRate: videoBitRate, resultWidth: resultWidth, resultHeight: resultHeight,uuid: uuid) { progress in
             onProgress(progress)
         } onCompletion: { outputURL in
             onCompletion(outputURL)
@@ -296,9 +303,9 @@ func makeValidUri(filePath: String) -> String {
         }
       }
 
-    func manualCompressionHelper(url: URL, bitRate: Float?, onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
-        
-        var _bitRate=bitRate;
+    func manualCompressionHelper(url: URL, options: [String: Any], onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
+        let uuid:String = options["uuid"] as! String
+        var bitRate=options["bitrate"] as! Float?;
         let asset = AVAsset(url: url)
         guard asset.tracks.count >= 1 else {
           let error = CompressionError(message: "Invalid video URL, no track found")
@@ -321,12 +328,12 @@ func makeValidUri(filePath: String) -> String {
         }
         else
         {
-            _bitRate=bitRate ?? Float(abs(track.estimatedDataRate))*0.8
+            bitRate=bitRate ?? Float(abs(track.estimatedDataRate))*0.8
         }
 
-        let videoBitRate = _bitRate ?? height*width*1.5
+        let videoBitRate = bitRate ?? height*width*1.5
 
-        exportVideoHelper(url: url, asset: asset, bitRate: Int(videoBitRate), resultWidth: width, resultHeight: height) { progress in
+        exportVideoHelper(url: url, asset: asset, bitRate: Int(videoBitRate), resultWidth: width, resultHeight: height,uuid: uuid) { progress in
             onProgress(progress)
         } onCompletion: { outputURL in
             onCompletion(outputURL)
@@ -335,7 +342,8 @@ func makeValidUri(filePath: String) -> String {
         }
       }
     
-    func exportVideoHelper(url: URL,asset: AVAsset, bitRate: Int,resultWidth:Float,resultHeight:Float, onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
+    func exportVideoHelper(url: URL,asset: AVAsset, bitRate: Int,resultWidth:Float,resultHeight:Float,uuid:String, onProgress: @escaping (Float) -> Void,  onCompletion: @escaping (URL) -> Void, onFailure: @escaping (Error) -> Void){
+        var videoCompressionCounter:Int=0
         var tmpURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
           .appendingPathComponent(ProcessInfo().globallyUniqueString)
           .appendingPathExtension("mp4")
@@ -364,31 +372,28 @@ func makeValidUri(filePath: String) -> String {
           AVSampleRateKey: NSNumber(value: Float(44100))
         ]
         
-
+        compressorExports[uuid] = exporter
         exporter.export(progressHandler: { (progress) in
             let _progress:Float=progress*100;
-            if(Int(_progress)==self.videoCompressionCounter)
+            if(Int(_progress)==videoCompressionCounter)
             {
-            self.videoCompressionCounter=Int(_progress)+self.videoCompressionThreshold
+            videoCompressionCounter=Int(_progress)+self.videoCompressionThreshold
             onProgress(progress)
             }
             
         }, completionHandler: { result in
-            self.videoCompressionCounter=0;
-          switch result {
-          case .success(let status):
-            switch status {
+            videoCompressionCounter=0;
+            switch exporter.status {
             case .completed:
               onCompletion(exporter.outputURL!)
               break
+            case .cancelled:
+                let error = CompressionError(message: "Compression has canncelled")
+                onFailure(error)
+                break
             default:
                 onCompletion(url)
               break
-            }
-            break
-          case .failure(let error):
-            onCompletion(url)
-            break
           }
         })
     }
@@ -406,4 +411,6 @@ func makeValidUri(filePath: String) -> String {
         let track = asset.tracks[videoTrackIndex];
         return track;
         }
+    
+    
     }

package/lib/commonjs/Audio/index.js

@@ -11,7 +11,9 @@ var _utils = require("../utils");
 
 const NativeAudio = _reactNative.NativeModules.Compressor;
 const Audio = {
-  compress: async (url, options = _utils.DEFAULT_COMPRESS_AUDIO_OPTIONS) => {
+  compress: async function (url) {
+    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _utils.DEFAULT_COMPRESS_AUDIO_OPTIONS;
+
     try {
       const checkUrlAndOptionsResult = await (0, _utils.checkUrlAndOptions)(url, options);
 

package/lib/commonjs/Audio/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.tsx"],"names":["NativeAudio","NativeModules","Compressor","Audio","compress","url","options","DEFAULT_COMPRESS_AUDIO_OPTIONS","checkUrlAndOptionsResult","isCorrect","message","mediaDetails","bitrate","i","AUDIO_BITRATE","length","quality","compress_audio","error"],"mappings":";;;;;;;AAAA;;AACA;;AAOA,MAAMA,WAAW,GAAGC,2BAAcC,UAAlC;AAEA,MAAMC,KAAgB,GAAG;AACvBC,EAAAA,QAAQ,EAAE,OAAOC,GAAP,EAAYC,OAAO,GAAGC,qCAAtB,KAAyD;AACjE,QAAI;AACF,YAAMC,wBAA2C,GAC/C,MAAM,+BAAmBH,GAAnB,EAAwBC,OAAxB,CADR;;AAEA,UAAI,CAACE,wBAAwB,CAACC,SAA9B,EAAyC;AACvC,cAAMD,wBAAwB,CAACE,OAA/B;AACD,OAFD,MAEO;AACL;AAEA;AACA;AACA,cAAMC,YAAiB,GAAG;AACxBC,UAAAA,OAAO,EAAE;AADe,SAA1B,CALK,CASL;;AACA,YAAIA,OAAY,GAAGL,sCAA+BK,OAAlD;;AAEA,YAAID,YAAY,IAAIA,YAAY,CAACC,OAAjC,EAA0C;AACxC;AACA,eAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGC,qBAAcC,MAAlC,EAA0CF,CAAC,EAA3C,EAA+C;AAC7C;AACA,gBAAIF,YAAY,CAACC,OAAb,GAAuBE,qBAAcD,CAAd,CAA3B,EAA6C;AAC3C,kBAAIA,CAAC,GAAG,CAAJ,GAAQC,qBAAcC,MAA1B,EAAkC;AAChC,oBAAIT,OAAO,CAACU,OAAR,KAAoB,KAAxB,EAA+BJ,OAAO,GAAGE,qBAAcD,CAAC,GAAG,CAAlB,CAAV,CAA/B,KACK,IAAIP,OAAO,CAACU,OAAR,KAAoB,QAAxB,EACHJ,OAAO,GAAGE,qBAAcD,CAAC,GAAG,CAAlB,CAAV,CADG,KAEAD,OAAO,GAAGE,qBAAcD,CAAd,CAAV;AACN,eALD,MAKO,IAAIA,CAAC,GAAG,CAAJ,GAAQC,qBAAcC,MAA1B,EAAkC;AACvC,oBAAIT,OAAO,CAACU,OAAR,KAAoB,KAAxB,EAA+BJ,OAAO,GAAGE,qBAAcD,CAAC,GAAG,CAAlB,CAAV,CAA/B,KACKD,OAAO,GAAGE,qBAAcD,CAAd,CAAV;AACN,eAHM,MAGAD,OAAO,GAAGE,qBAAcD,CAAd,CAAV;;AACP;AACD,aAb4C,CAe7C;;;AACA,gBACEF,YAAY,CAACC,OAAb,IAAwBE,qBAAcA,qBAAcC,MAAd,GAAuB,CAArC,CAD1B,EAEE;AACAH,cAAAA,OAAO,GAAGE,qBAAcA,qBAAcC,MAAd,GAAuB,CAArC,CAAV;AACA;AACD;AACF;AACF;;AAED,eAAOf,WAAW,CAACiB,cAAZ,CAA2BZ,GAA3B,EAAgC;AACrCO,UAAAA,OADqC;AAErCI,UAAAA,OAAO,EAAEV,OAAO,CAACU;AAFoB,SAAhC,CAAP;AAID;AACF,KAjDD,CAiDE,OAAOE,KAAP,EAAc;AACd,YAAMA,KAAK,CAACR,OAAZ;AACD;AACF;AAtDsB,CAAzB;eAyDeP,K","sourcesContent":["import { NativeModules } from 'react-native';\nimport {\n  AUDIO_BITRATE,\n  AudioType,\n  DEFAULT_COMPRESS_AUDIO_OPTIONS,\n  defaultResultType,\n  checkUrlAndOptions,\n} from '../utils';\nconst NativeAudio = NativeModules.Compressor;\n\nconst Audio: AudioType = {\n  compress: async (url, options = DEFAULT_COMPRESS_AUDIO_OPTIONS) => {\n    try {\n      const checkUrlAndOptionsResult: defaultResultType =\n        await checkUrlAndOptions(url, options);\n      if (!checkUrlAndOptionsResult.isCorrect) {\n        throw checkUrlAndOptionsResult.message;\n      } else {\n        // Get resulting output file path\n\n        // Get media details\n        // const mediaDetails: any = await getDetails(url).catch(() => null);\n        const mediaDetails: any = {\n          bitrate: 0,\n        };\n\n        // Initialize bitrate\n        let bitrate: any = DEFAULT_COMPRESS_AUDIO_OPTIONS.bitrate;\n\n        if (mediaDetails && mediaDetails.bitrate) {\n          // Check and return the appropriate bitrate according to quality expected\n          for (let i = 0; i < AUDIO_BITRATE.length; i++) {\n            // Check a particular bitrate to return its nearest lower according to quality\n            if (mediaDetails.bitrate > AUDIO_BITRATE[i]) {\n              if (i + 2 < AUDIO_BITRATE.length) {\n                if (options.quality === 'low') bitrate = AUDIO_BITRATE[i + 2];\n                else if (options.quality === 'medium')\n                  bitrate = AUDIO_BITRATE[i + 1];\n                else bitrate = AUDIO_BITRATE[i];\n              } else if (i + 1 < AUDIO_BITRATE.length) {\n                if (options.quality === 'low') bitrate = AUDIO_BITRATE[i + 1];\n                else bitrate = AUDIO_BITRATE[i];\n              } else bitrate = AUDIO_BITRATE[i];\n              break;\n            }\n\n            // Check if the matching bitrate is the last in the array\n            if (\n              mediaDetails.bitrate <= AUDIO_BITRATE[AUDIO_BITRATE.length - 1]\n            ) {\n              bitrate = AUDIO_BITRATE[AUDIO_BITRATE.length - 1];\n              break;\n            }\n          }\n        }\n\n        return NativeAudio.compress_audio(url, {\n          bitrate,\n          quality: options.quality,\n        });\n      }\n    } catch (error) {\n      throw error.message;\n    }\n  },\n};\n\nexport default Audio;\n"]}
+{"version":3,"sources":["index.tsx"],"names":["NativeAudio","NativeModules","Compressor","Audio","compress","url","options","DEFAULT_COMPRESS_AUDIO_OPTIONS","checkUrlAndOptionsResult","isCorrect","message","mediaDetails","bitrate","i","AUDIO_BITRATE","length","quality","compress_audio","error"],"mappings":";;;;;;;AAAA;;AACA;;AAOA,MAAMA,WAAW,GAAGC,2BAAcC,UAAlC;AAEA,MAAMC,KAAgB,GAAG;AACvBC,EAAAA,QAAQ,EAAE,gBAAOC,GAAP,EAAyD;AAAA,QAA7CC,OAA6C,uEAAnCC,qCAAmC;;AACjE,QAAI;AACF,YAAMC,wBAA2C,GAC/C,MAAM,+BAAmBH,GAAnB,EAAwBC,OAAxB,CADR;;AAEA,UAAI,CAACE,wBAAwB,CAACC,SAA9B,EAAyC;AACvC,cAAMD,wBAAwB,CAACE,OAA/B;AACD,OAFD,MAEO;AACL;AAEA;AACA;AACA,cAAMC,YAAiB,GAAG;AACxBC,UAAAA,OAAO,EAAE;AADe,SAA1B,CALK,CASL;;AACA,YAAIA,OAAY,GAAGL,sCAA+BK,OAAlD;;AAEA,YAAID,YAAY,IAAIA,YAAY,CAACC,OAAjC,EAA0C;AACxC;AACA,eAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGC,qBAAcC,MAAlC,EAA0CF,CAAC,EAA3C,EAA+C;AAC7C;AACA,gBAAIF,YAAY,CAACC,OAAb,GAAuBE,qBAAcD,CAAd,CAA3B,EAA6C;AAC3C,kBAAIA,CAAC,GAAG,CAAJ,GAAQC,qBAAcC,MAA1B,EAAkC;AAChC,oBAAIT,OAAO,CAACU,OAAR,KAAoB,KAAxB,EAA+BJ,OAAO,GAAGE,qBAAcD,CAAC,GAAG,CAAlB,CAAV,CAA/B,KACK,IAAIP,OAAO,CAACU,OAAR,KAAoB,QAAxB,EACHJ,OAAO,GAAGE,qBAAcD,CAAC,GAAG,CAAlB,CAAV,CADG,KAEAD,OAAO,GAAGE,qBAAcD,CAAd,CAAV;AACN,eALD,MAKO,IAAIA,CAAC,GAAG,CAAJ,GAAQC,qBAAcC,MAA1B,EAAkC;AACvC,oBAAIT,OAAO,CAACU,OAAR,KAAoB,KAAxB,EAA+BJ,OAAO,GAAGE,qBAAcD,CAAC,GAAG,CAAlB,CAAV,CAA/B,KACKD,OAAO,GAAGE,qBAAcD,CAAd,CAAV;AACN,eAHM,MAGAD,OAAO,GAAGE,qBAAcD,CAAd,CAAV;;AACP;AACD,aAb4C,CAe7C;;;AACA,gBACEF,YAAY,CAACC,OAAb,IAAwBE,qBAAcA,qBAAcC,MAAd,GAAuB,CAArC,CAD1B,EAEE;AACAH,cAAAA,OAAO,GAAGE,qBAAcA,qBAAcC,MAAd,GAAuB,CAArC,CAAV;AACA;AACD;AACF;AACF;;AAED,eAAOf,WAAW,CAACiB,cAAZ,CAA2BZ,GAA3B,EAAgC;AACrCO,UAAAA,OADqC;AAErCI,UAAAA,OAAO,EAAEV,OAAO,CAACU;AAFoB,SAAhC,CAAP;AAID;AACF,KAjDD,CAiDE,OAAOE,KAAP,EAAmB;AACnB,YAAMA,KAAK,CAACR,OAAZ;AACD;AACF;AAtDsB,CAAzB;eAyDeP,K","sourcesContent":["import { NativeModules } from 'react-native';\nimport {\n  AUDIO_BITRATE,\n  AudioType,\n  DEFAULT_COMPRESS_AUDIO_OPTIONS,\n  defaultResultType,\n  checkUrlAndOptions,\n} from '../utils';\nconst NativeAudio = NativeModules.Compressor;\n\nconst Audio: AudioType = {\n  compress: async (url, options = DEFAULT_COMPRESS_AUDIO_OPTIONS) => {\n    try {\n      const checkUrlAndOptionsResult: defaultResultType =\n        await checkUrlAndOptions(url, options);\n      if (!checkUrlAndOptionsResult.isCorrect) {\n        throw checkUrlAndOptionsResult.message;\n      } else {\n        // Get resulting output file path\n\n        // Get media details\n        // const mediaDetails: any = await getDetails(url).catch(() => null);\n        const mediaDetails: any = {\n          bitrate: 0,\n        };\n\n        // Initialize bitrate\n        let bitrate: any = DEFAULT_COMPRESS_AUDIO_OPTIONS.bitrate;\n\n        if (mediaDetails && mediaDetails.bitrate) {\n          // Check and return the appropriate bitrate according to quality expected\n          for (let i = 0; i < AUDIO_BITRATE.length; i++) {\n            // Check a particular bitrate to return its nearest lower according to quality\n            if (mediaDetails.bitrate > AUDIO_BITRATE[i]) {\n              if (i + 2 < AUDIO_BITRATE.length) {\n                if (options.quality === 'low') bitrate = AUDIO_BITRATE[i + 2];\n                else if (options.quality === 'medium')\n                  bitrate = AUDIO_BITRATE[i + 1];\n                else bitrate = AUDIO_BITRATE[i];\n              } else if (i + 1 < AUDIO_BITRATE.length) {\n                if (options.quality === 'low') bitrate = AUDIO_BITRATE[i + 1];\n                else bitrate = AUDIO_BITRATE[i];\n              } else bitrate = AUDIO_BITRATE[i];\n              break;\n            }\n\n            // Check if the matching bitrate is the last in the array\n            if (\n              mediaDetails.bitrate <= AUDIO_BITRATE[AUDIO_BITRATE.length - 1]\n            ) {\n              bitrate = AUDIO_BITRATE[AUDIO_BITRATE.length - 1];\n              break;\n            }\n          }\n        }\n\n        return NativeAudio.compress_audio(url, {\n          bitrate,\n          quality: options.quality,\n        });\n      }\n    } catch (error: any) {\n      throw error.message;\n    }\n  },\n};\n\nexport default Audio;\n"]}