fix(ios): select correct capture session preset when defaultVideoQual…

…ity is not provided (react-native-camera#1908) Closes react-native-camera#1900
xaphod · Nov 7, 2018 · 41079d5 · 41079d5
1 parent 4f3e4f1
commit 41079d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ios/RN/RNCamera.h b/ios/RN/RNCamera.h
@@ -43,7 +43,7 @@
 @property (nonatomic, assign) BOOL canReadText;
 @property(assign, nonatomic) AVVideoCodecType videoCodecType;
 @property (assign, nonatomic) AVCaptureVideoStabilizationMode videoStabilizationMode;
-@property(assign, nonatomic) NSInteger defaultVideoQuality;
+@property(assign, nonatomic, nullable) NSNumber *defaultVideoQuality;
 
 - (id)initWithBridge:(RCTBridge *)bridge;
 - (void)updateType;

diff --git a/ios/RN/RNCamera.m b/ios/RN/RNCamera.m
@@ -605,7 +605,9 @@ - (void)startSession
             return;
         }
 
-        AVCaptureSessionPreset preset = [RNCameraUtils captureSessionPresetForVideoResolution:[self defaultVideoQuality]];
+        // Default video quality AVCaptureSessionPresetHigh if non is provided
+        AVCaptureSessionPreset preset = ([self defaultVideoQuality]) ? [RNCameraUtils captureSessionPresetForVideoResolution:[[self defaultVideoQuality] integerValue]] : AVCaptureSessionPresetHigh;
+
         self.session.sessionPreset = preset == AVCaptureSessionPresetHigh ? AVCaptureSessionPresetPhoto: preset;
 
         AVCaptureStillImageOutput *stillImageOutput = [[AVCaptureStillImageOutput alloc] init];

diff --git a/ios/RN/RNCameraManager.m b/ios/RN/RNCameraManager.m
@@ -246,7 +246,7 @@ + (NSDictionary *)faceDetectorConstants
 
 RCT_CUSTOM_VIEW_PROPERTY(defaultVideoQuality, NSInteger, RNCamera)
 {
-    [view setDefaultVideoQuality:(NSInteger) [RCTConvert NSInteger:json]];
+    [view setDefaultVideoQuality: [NSNumber numberWithInteger:[RCTConvert NSInteger:json]]];
 }
 
 RCT_REMAP_METHOD(takePicture,