Merge branch 'gateway240-master'

* gateway240-master:
  Update Camera Position
  Fix Deprecated AvCaptureDevice Enumeration

Author: vonnieda

mac/platformcontext.mm

@@ -88,7 +88,10 @@ of this software and associated documentation files (the "Software"), to deal
     LOG(LOG_DEBUG, "enumerateDevices called\n");
 
     m_devices.clear();
-    for (AVCaptureDevice* device in [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) 
+    AVCaptureDeviceDiscoverySession *captureDeviceDiscoverySession = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:@[AVCaptureDeviceTypeBuiltInWideAngleCamera,AVCaptureDeviceTypeExternalUnknown]
+                                          mediaType:AVMediaTypeVideo
+                                           position:AVCaptureDevicePositionUnspecified];
+    for (AVCaptureDevice* device in [captureDeviceDiscoverySession devices])
     {
         platformDeviceInfo* deviceInfo = new platformDeviceInfo();
         deviceInfo->m_captureDevice = CFBridgingRetain(device);
@@ -104,7 +107,7 @@ of this software and associated documentation files (the "Software"), to deal
         NSRange vidRange = [device.modelID rangeOfString:@"VendorID_"];
         if (vidRange.length > 0)
         {
-            uint32_t maxLen = device.modelID.length - vidRange.location - 9;
+            unsigned long maxLen = device.modelID.length - vidRange.location - 9;
             maxLen = (maxLen > 5) ? 5 : maxLen;        
             deviceInfo->m_vid = [[device.modelID substringWithRange:NSMakeRange(vidRange.location + 9, maxLen)] intValue];
         }
@@ -117,7 +120,7 @@ of this software and associated documentation files (the "Software"), to deal
         NSRange pidRange = [device.modelID rangeOfString:@"ProductID_"];
         if (pidRange.length > 0)
         {
-            uint32_t maxLen = device.modelID.length - pidRange.location - 10;
+            unsigned long maxLen = device.modelID.length - pidRange.location - 10;
             maxLen = (maxLen > 5) ? 5 : maxLen;
             deviceInfo->m_pid = [[device.modelID substringWithRange:NSMakeRange(pidRange.location + 10, maxLen)] intValue];
         }

mac/platformstream.mm

@@ -83,10 +83,10 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput
         if (CVPixelBufferLockBaseAddress(pixelBuffer, 0) == kCVReturnSuccess)
         {
             const uint8_t *pixelPtr = static_cast<const uint8_t*>(CVPixelBufferGetBaseAddress(pixelBuffer));
-            uint32_t frameBytes = CVPixelBufferGetHeight(pixelBuffer) *
+            unsigned long frameBytes = CVPixelBufferGetHeight(pixelBuffer) *
                   CVPixelBufferGetBytesPerRow(pixelBuffer);
 
-            m_stream->callback(pixelPtr, frameBytes);
+            m_stream->callback(pixelPtr, (uint32_t)frameBytes);
 
             CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
         }

mac/uvcctrl.mm

@@ -146,7 +146,7 @@ of this software and associated documentation files (the "Software"), to deal
     CFMutableDictionaryRef dict = IOServiceMatching(kIOUSBDeviceClassName);
 
     io_iterator_t serviceIterator;
-    kern_return_t result = IOServiceGetMatchingServices(kIOMasterPortDefault, dict, &serviceIterator);
+    kern_return_t result = IOServiceGetMatchingServices(NULL, dict, &serviceIterator);
     if (result != kIOReturnSuccess) {
         LOG(LOG_DEBUG, "UVCCtrl::findDevice() IOServiceGetMatchingServices failed: %d\n", result);
         return NULL;