react-native-compressor 1.8.21 → 1.8.23

package/README.md

@@ -1,3 +1,5 @@
+<img src="https://numan.dev/images/child-lives-matter.png" />
+
 <div align="center">
  <img height="150" src="/media/logo.png" />
 </div>

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

@@ -26,8 +26,8 @@ object AutoVideoCompression {
                 val actualWidth = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)!!.toInt()
                 val bitrate = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE)!!.toInt()
                 val scale = if (actualWidth > actualHeight) maxSize / actualWidth else maxSize / actualHeight
-                val resultWidth = Math.round(actualWidth * scale / 2) * 2
-                val resultHeight = Math.round(actualHeight * scale / 2) * 2
+                val resultWidth = Math.round(actualWidth * Math.min(scale, 1f) / 2) * 2
+                val resultHeight = Math.round(actualHeight * Math.min(scale, 1f) / 2) * 2
                 val videoBitRate = makeVideoBitrate(
                   actualHeight, actualWidth,
                   bitrate,

package/ios/Image/ImageCompressor.swift

@@ -125,16 +125,25 @@ class ImageCompressor {
         
         let url = URL(fileURLWithPath: filePath)
         let source = CGImageSourceCreateWithURL(url as CFURL, nil)!
-        var metadata = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [CFString: Any]
+        let metadata = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [CFString: Any]
         
         let dataProvider = CGDataProvider(data: data as CFData)
         let dataImageSource = CGImageSourceCreateWithDataProvider(dataProvider!, nil)!
-        let dataMetadata = CGImageSourceCopyPropertiesAtIndex(dataImageSource, 0, nil) as? [CFString: Any]
+        var dataMetadata = CGImageSourceCopyPropertiesAtIndex(dataImageSource, 0, nil) as? [CFString: Any]
         
         // Copy all keys from source metadata to destination metadata if they don't exist
-        for (key, value) in dataMetadata ?? [:] {
-            if metadata?[key] == nil {
-                metadata?[key] = value
+        for (key, value) in metadata ?? [:] {
+            if dataMetadata?[key] == nil {
+                dataMetadata?[key] = value
+            } else {
+                if let metadataObj = dataMetadata?[key] as? NSMutableDictionary,
+                    let valueObj = value as? NSDictionary {
+                    for (key, value) in valueObj {
+                        if metadataObj[key] == nil {
+                            metadataObj[key] = value
+                        }
+                    }
+                }
             }
         }
         
@@ -142,7 +151,7 @@ class ImageCompressor {
         
         let destinationData = NSMutableData()
         let destination = CGImageDestinationCreateWithData(destinationData, outputFormat, 1, nil)!
-        CGImageDestinationAddImage(destination, image.cgImage!, metadata as CFDictionary?)
+        CGImageDestinationAddImage(destination, image.cgImage!, dataMetadata as CFDictionary?)
         CGImageDestinationFinalize(destination)
         return destinationData as Data
     }

package/ios/Video/VideoMain.swift

@@ -154,7 +154,7 @@ class VideoCompressor {
         let minValue:Float=min(Float(originalHeight)/Float(height),Float(originalWidth)/Float(width))
         var remeasuredBitrate:Int = Int(Float(originalBitrate) / minValue)
         remeasuredBitrate = Int(Float(remeasuredBitrate)*compressFactor)
-        let minBitrate:Int = self.getVideoBitrateWithFactor(f: minCompressFactor) / (1280 * 720 / (width * height))
+        let minBitrate:Int = Int(Float(self.getVideoBitrateWithFactor(f: minCompressFactor)) / (1280 * 720 / Float(width * height)))
         if (originalBitrate < minBitrate) {
           return remeasuredBitrate;
         }
@@ -186,8 +186,8 @@ class VideoCompressor {
 
         let bitrate=Float(abs(track.estimatedDataRate));
         let scale:Float = actualWidth > actualHeight ? (Float(maxSize) / actualWidth) : (Float(maxSize) / actualHeight);
-        let resultWidth:Float = round(actualWidth * scale / 2) * 2;
-        let resultHeight:Float = round(actualHeight * scale / 2) * 2;
+        let resultWidth:Float = round(actualWidth * min(scale, 1) / 2) * 2;
+        let resultHeight:Float = round(actualHeight * min(scale, 1) / 2) * 2;
 
         let videoBitRate:Int = self.makeVideoBitrate(
             originalHeight: Int(actualHeight), originalWidth: Int(actualWidth),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-compressor",
-  "version": "1.8.21",
-  "description": "This library compress image, video and audio",
+  "version": "1.8.23",
+  "description": "Compress Image, Video, and Audio same like Whatsapp & Auto/Manual Compression | Background Upload | Download File | Create Video Thumbnail",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",