feat(ios): add support for preview to match viewport cropping (reac…

…t-native-camera#627)
xDemon200 · Dec 13, 2017 · 39f19cd · 39f19cd
1 parent 874a29f
commit 39f19cd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/ios/RCTCameraManager.h b/ios/RCTCameraManager.h
@@ -16,7 +16,8 @@ typedef NS_ENUM(NSInteger, RCTCameraCaptureSessionPreset) {
   RCTCameraCaptureSessionPresetPhoto = 3,
   RCTCameraCaptureSessionPreset480p = 4,
   RCTCameraCaptureSessionPreset720p = 5,
-  RCTCameraCaptureSessionPreset1080p = 6
+  RCTCameraCaptureSessionPreset1080p = 6,
+  RCTCameraCaptureSessionPresetPreview = 7
 };
 
 typedef NS_ENUM(NSInteger, RCTCameraCaptureMode) {
@@ -75,6 +76,7 @@ typedef NS_ENUM(NSInteger, RCTCameraTorchMode) {
 @property (nonatomic, strong) RCTPromiseResolveBlock videoResolve;
 @property (nonatomic, strong) RCTPromiseRejectBlock videoReject;
 @property (nonatomic, strong) RCTCamera *camera;
+@property (nonatomic, assign) BOOL cropToViewport;
 
 
 - (void)changeOrientation:(NSInteger)orientation;

diff --git a/ios/RCTCameraManager.m b/ios/RCTCameraManager.m
@@ -106,7 +106,8 @@ - (NSDictionary *)constantsToExport
                @"720p": @(RCTCameraCaptureSessionPreset720p),
                @"AVCaptureSessionPreset1280x720": @(RCTCameraCaptureSessionPreset720p),
                @"1080p": @(RCTCameraCaptureSessionPreset1080p),
-               @"AVCaptureSessionPreset1920x1080": @(RCTCameraCaptureSessionPreset1080p)
+               @"AVCaptureSessionPreset1920x1080": @(RCTCameraCaptureSessionPreset1080p),
+               @"preview": @(RCTCameraCaptureSessionPresetPreview)
                },
            @"CaptureTarget": @{
                @"memory": @(RCTCameraCaptureTargetMemory),
@@ -140,6 +141,7 @@ - (NSDictionary *)constantsToExport
 RCT_EXPORT_VIEW_PROPERTY(onZoomChanged, BOOL);
 
 RCT_CUSTOM_VIEW_PROPERTY(captureQuality, NSInteger, RCTCamera) {
+  self.cropToViewport = false;
   NSInteger quality = [RCTConvert NSInteger:json];
   NSString *qualityString;
   switch (quality) {
@@ -165,6 +167,10 @@ - (NSDictionary *)constantsToExport
     case RCTCameraCaptureSessionPreset480p:
       qualityString = AVCaptureSessionPreset640x480;
       break;
+    case RCTCameraCaptureSessionPresetPreview:
+      qualityString = AVCaptureSessionPresetPhoto;
+      self.cropToViewport = true;
+      break;
   }
 
   [self setCaptureQuality:qualityString];
@@ -653,6 +659,15 @@ - (void)captureStill:(NSInteger)target options:(NSDictionary *)options orientati
             rotatedCGImage = cgImage;
           }
 
+          // Crop it (if capture quality is set to preview)
+          if (self.cropToViewport) {
+            CGSize viewportSize = CGSizeMake(self.previewLayer.frame.size.width, self.previewLayer.frame.size.height);
+            CGRect captureRect = CGRectMake(0, 0, CGImageGetWidth(rotatedCGImage), CGImageGetHeight(rotatedCGImage));
+            CGRect croppedSize = AVMakeRectWithAspectRatioInsideRect(viewportSize, captureRect);
+
+            rotatedCGImage = CGImageCreateWithImageInRect(rotatedCGImage, croppedSize);
+          }
+
           // Erase stupid TIFF stuff
           [imageMetadata removeObjectForKey:(NSString *)kCGImagePropertyTIFFDictionary];