Changeset 4891

Timestamp:

Aug 19, 2014 1:37:12 AM (10 years ago)

Author:

ming

Message:

Re #1762: Related to r4838, check whether the device supports the capture size before deciding to use it

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/ios_dev.m

@@ -568 +568 @@
         }
         
+        AVCaptureDevice *dev = qf->dev_info[param->cap_id].dev;
+        
         /* Find the closest supported size */
-        for(i = 0; i < PJ_ARRAY_SIZE(supported_size)-1; ++i) {
-            if (supported_size[i] >= requested_size)
+        for(i = PJ_ARRAY_SIZE(supported_size)-1; i > 0; --i) {
+            if (![dev supportsAVCaptureSessionPreset: size_preset_str[i]])
+                continue;
+            if (supported_size[i-1] < requested_size)
                 break;
         }
@@ -584 +588 @@
 
         /* Set frame rate, this may only work on iOS 7 or later */
-        AVCaptureDevice *dev = qf->dev_info[param->cap_id].dev;
         if ([dev respondsToSelector:@selector(activeVideoMinFrameDuration)] &&
             [dev lockForConfiguration:NULL])