Merge changes I47e6458d,Ie3c451ef,I5d17f530,I4ed5132d,I9af84dcb, ... into studio-1.3-dev
* changes:
emugl: Add *experimental* support for 'osmesa' backend.
emugl: GLDispatch: do not use static function pointers.
emugl: Get rid fo GLAPIENTRY
emugl: Refactor GLDispatch structure.
emugl: Refactor libOpenglRender's EGLDispatch.
emugl: Remove obsolete header file.
emugl: Reduce number of exported dynamic symbols.
android/build: Add support for LOCAL_SYMBOL_FILE
android/scripts/gen-dll-wrapper.py: Remove obsolete script.
android/scripts/gen-entries.py: Add new script.
diff --git a/android/camera/camera-capture-mac.m b/android/camera/camera-capture-mac.m
index 346daa6..9df11ae 100644
--- a/android/camera/camera-capture-mac.m
+++ b/android/camera/camera-capture-mac.m
@@ -33,6 +33,7 @@
#import <QTKit/QTCaptureVideoPreviewOutput.h>
#import <QTKit/QTMedia.h>
#import <QTKit/QTSampleBuffer.h>
+#import <AVFoundation/AVFoundation.h>
#endif
#import <CoreAudio/CoreAudio.h>
#include "android/camera/camera-capture.h"
@@ -544,6 +545,14 @@
/* Obtain FOURCC pixel format for the device. */
cis[0].pixel_format = _QTtoFOURCC(qt_pix_format);
if (cis[0].pixel_format == 0) {
+ AVCaptureDevice *videoDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+ for(AVCaptureDeviceFormat *vFormat in [videoDevice formats]) {
+ CMFormatDescriptionRef description= vFormat.formatDescription;
+ cis[0].pixel_format = _QTtoFOURCC(CMFormatDescriptionGetMediaSubType(description));
+ if (cis[0].pixel_format) break;
+ }
+ }
+ if (cis[0].pixel_format == 0) {
/* Unsupported pixel format. */
E("Pixel format '%.4s' reported by the camera device is unsupported",
(const char*)&qt_pix_format);
