fix(picture-size): create None default value

react-native-camera · Jun 7, 2018 · ad87c8e · ad87c8e
1 parent 92e8ece
commit ad87c8e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 13 deletions.
diff --git a/android/src/main/java/com/google/android/cameraview/Camera1.java b/android/src/main/java/com/google/android/cameraview/Camera1.java
@@ -242,9 +242,16 @@ SortedSet<Size> getAvailablePictureSizes(AspectRatio ratio) {
 
     @Override
     void setPictureSize(Size size) {
-        mPictureSize = size;
+        if (size == null) {
+            if (mAspectRatio == null) {
+                return;
+            }
+          mPictureSize = mPictureSizes.sizes(mAspectRatio).last();
+        } else {
+          mPictureSize = size;
+        }
         if (mCameraParameters != null && mCamera != null) {
-            mCameraParameters.setPictureSize(size.getWidth(), size.getHeight());
+            mCameraParameters.setPictureSize(mPictureSize.getWidth(), mPictureSize.getHeight());
             mCamera.setParameters(mCameraParameters);
         }
     }

diff --git a/android/src/main/java/com/google/android/cameraview/Camera2.java b/android/src/main/java/com/google/android/cameraview/Camera2.java
@@ -366,7 +366,14 @@ void setPictureSize(Size size) {
         if (mStillImageReader != null) {
             mStillImageReader.close();
         }
-        mPictureSize = size;
+        if (size == null) {
+          if (mAspectRatio == null) {
+            return;
+          }
+          mPictureSizes.sizes(mAspectRatio).last();
+        } else {
+          mPictureSize = size;
+        }
         prepareStillImageReader();
         startCaptureSession();
     }

diff --git a/android/src/main/java/org/reactnative/camera/CameraViewManager.java b/android/src/main/java/org/reactnative/camera/CameraViewManager.java
@@ -103,7 +103,7 @@ public void setWhiteBalance(RNCameraView view, int whiteBalance) {
 
   @ReactProp(name = "pictureSize")
   public void setPictureSize(RNCameraView view, String size) {
-    view.setPictureSize(Size.parse(size));
+    view.setPictureSize(size.equals("None") ? null : Size.parse(size));
   }
 
   @ReactProp(name = "barCodeTypes")

diff --git a/android/src/main/java/org/reactnative/camera/RNCameraView.java b/android/src/main/java/org/reactnative/camera/RNCameraView.java
@@ -127,30 +127,38 @@ public void onFramePreview(CameraView cameraView, byte[] data, int width, int he
         int correctWidth = width;
         int correctHeight = height;
         byte[] correctData = data;
+        boolean willCallBarCodeTask = mShouldScanBarCodes && !barCodeScannerTaskLock && cameraView instanceof BarCodeScannerAsyncTaskDelegate;
+        boolean willCallFaceTask = mShouldDetectFaces && !faceDetectorTaskLock && cameraView instanceof FaceDetectorAsyncTaskDelegate;
+        boolean willCallGoogleBarcodeTask = mShouldGoogleDetectBarcodes && !googleBarcodeDetectorTaskLock && cameraView instanceof BarcodeDetectorAsyncTaskDelegate;
+        boolean willCallTextTask = mShouldRecognizeText && !textRecognizerTaskLock && cameraView instanceof TextRecognizerAsyncTaskDelegate;
+        if (!willCallBarCodeTask && !willCallFaceTask && !willCallGoogleBarcodeTask && !willCallTextTask) {
+          return;
+        }
+
         if (correctRotation == 90) {
-          correctWidth = height;
-          correctHeight = width;
-          correctData = rotateImage(data, correctHeight, correctWidth);
+            correctWidth = height;
+            correctHeight = width;
+            correctData = rotateImage(data, correctHeight, correctWidth);
         }
-        if (mShouldScanBarCodes && !barCodeScannerTaskLock && cameraView instanceof BarCodeScannerAsyncTaskDelegate) {
+        if (willCallBarCodeTask) {
           barCodeScannerTaskLock = true;
           BarCodeScannerAsyncTaskDelegate delegate = (BarCodeScannerAsyncTaskDelegate) cameraView;
           new BarCodeScannerAsyncTask(delegate, mMultiFormatReader, correctData, correctWidth, correctHeight).execute();
         }
 
-        if (mShouldDetectFaces && !faceDetectorTaskLock && cameraView instanceof FaceDetectorAsyncTaskDelegate) {
+        if (willCallFaceTask) {
           faceDetectorTaskLock = true;
           FaceDetectorAsyncTaskDelegate delegate = (FaceDetectorAsyncTaskDelegate) cameraView;
           new FaceDetectorAsyncTask(delegate, mFaceDetector, correctData, correctWidth, correctHeight, correctRotation).execute();
         }
 
-        if (mShouldGoogleDetectBarcodes && !googleBarcodeDetectorTaskLock && cameraView instanceof BarcodeDetectorAsyncTaskDelegate) {
+        if (willCallGoogleBarcodeTask) {
           googleBarcodeDetectorTaskLock = true;
           BarcodeDetectorAsyncTaskDelegate delegate = (BarcodeDetectorAsyncTaskDelegate) cameraView;
           new BarcodeDetectorAsyncTask(delegate, mGoogleBarcodeDetector, correctData, correctWidth, correctHeight, correctRotation).execute();
         }
 
-        if (mShouldRecognizeText && !textRecognizerTaskLock && cameraView instanceof TextRecognizerAsyncTaskDelegate) {
+        if (willCallTextTask) {
           textRecognizerTaskLock = true;
           TextRecognizerAsyncTaskDelegate delegate = (TextRecognizerAsyncTaskDelegate) cameraView;
           new TextRecognizerAsyncTask(delegate, mTextRecognizer, correctData, correctWidth, correctHeight, correctRotation).execute();

diff --git a/ios/RN/RNCamera.m b/ios/RN/RNCamera.m
@@ -616,6 +616,9 @@ - (void)initializeCaptureSessionInput
 - (void)updateSessionPreset:(AVCaptureSessionPreset)preset
 {
 #if !(TARGET_IPHONE_SIMULATOR)
+    if ([preset integerValue] < 0) {
+        return;
+    }
     if (preset) {
         if (self.isDetectingFaces && [preset isEqual:AVCaptureSessionPresetPhoto]) {
             RCTLog(@"AVCaptureSessionPresetPhoto not supported during face detection. Falling back to AVCaptureSessionPresetHigh");

diff --git a/ios/RN/RNCameraManager.m b/ios/RN/RNCameraManager.m
@@ -134,7 +134,8 @@ + (NSDictionary *)pictureSizes
              @"Photo" : AVCaptureSessionPresetPhoto,
              @"High" : AVCaptureSessionPresetHigh,
              @"Medium" : AVCaptureSessionPresetMedium,
-             @"Low" : AVCaptureSessionPresetLow
+             @"Low" : AVCaptureSessionPresetLow,
+             @"None": @(-1),
              };
 }
 

diff --git a/src/RNCamera.js b/src/RNCamera.js
@@ -234,7 +234,7 @@ export default class Camera extends React.Component<PropsType, StateType> {
     captureAudio: false,
     useCamera2Api: false,
     playSoundOnCapture: false,
-    pictureSize: '1920x1080',
+    pictureSize: 'None',
     videoStabilizationMode: 0,
   };