Merge branch 'pr2714'

Rebased on master.
Merges #2714

qtox.pro

@@ -160,6 +160,7 @@ win32 {
         QMAKE_INFO_PLIST = osx/info.plist
         QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
         LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -ltoxencryptsave -ltoxdns -lsodium -lvpx -lopus -framework OpenAL -lavformat -lavdevice -lavcodec -lavutil -lswscale -mmacosx-version-min=10.7
+        LIBS += -framework AVFoundation -framework Foundation -framework CoreMedia
         LIBS += -lqrencode -lsqlcipher
         contains(DEFINES, QTOX_PLATFORM_EXT) { LIBS += -framework IOKit -framework CoreFoundation }
         contains(DEFINES, QTOX_FILTER_AUDIO) { LIBS += -lfilteraudio }
@@ -462,7 +463,11 @@ macx {
         src/platform/install_osx.cpp
 
     HEADERS += \
-        src/platform/install_osx.h
+        src/platform/install_osx.h \
+        src/platform/camera/avfoundation.h
+
+    OBJECTIVE_SOURCES += \
+        src/platform/camera/avfoundation.mm
 }
 
 SOURCES += \

src/platform/camera/avfoundation.h

@@ -0,0 +1,37 @@
+/*
+    Copyright © 2015 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef AVFOUNDATION_H
+#define AVFOUNDATION_H
+
+#include <QString>
+#include <QVector>
+#include <QPair>
+#include "src/video/videomode.h"
+
+#ifndef Q_OS_MACX
+#error "This file is only meant to be compiled for Mac OS X targets"
+#endif
+
+namespace avfoundation
+{
+    QVector<VideoMode> getDeviceModes(QString devName);
+    QVector<QPair<QString, QString>> getDeviceList();
+}
+
+#endif // AVFOUNDATION_H

src/platform/camera/avfoundation.mm

@@ -0,0 +1,70 @@
+/*
+    Copyright (c) 2014 Thilo Borgmann <thilo.borgmann@mail.de>
+    Copyright © 2015 by The qTox Project
+
+    This file is part of qTox, a Qt-based graphical interface for Tox.
+
+    qTox is libre software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    qTox is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with qTox.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "avfoundation.h"
+
+#import <AVFoundation/AVFoundation.h>
+
+QVector<QPair<QString, QString> > avfoundation::getDeviceList()
+{
+    QVector<QPair<QString, QString> > result;
+
+    NSArray* devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    for (AVCaptureDevice* device in devices) {
+        result.append({ QString::fromUtf8([[device uniqueID] UTF8String]), QString::fromUtf8([[device localizedName] UTF8String]) });
+    }
+
+    return result;
+}
+
+QVector<VideoMode> avfoundation::getDeviceModes(QString devName)
+{
+    QVector<VideoMode> result;
+
+    NSArray* devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+    AVCaptureDevice* device = nil;
+
+    for (AVCaptureDevice* dev in devices) {
+        if (devName == QString::fromUtf8([[dev uniqueID] UTF8String])) {
+            device = dev;
+            break;
+        }
+    }
+    if (device == nil) {
+        return result;
+    }
+
+    for (AVCaptureDeviceFormat* format in [device formats]) {
+        CMFormatDescriptionRef formatDescription;
+        CMVideoDimensions dimensions;
+        formatDescription = (CMFormatDescriptionRef)[format performSelector:@selector(formatDescription)];
+        dimensions = CMVideoFormatDescriptionGetDimensions(formatDescription);
+
+        for (AVFrameRateRange* range in format.videoSupportedFrameRateRanges) {
+            VideoMode mode;
+            mode.width = dimensions.width;
+            mode.height = dimensions.height;
+            mode.FPS = range.maxFrameRate;
+            result.append(mode);
+        }
+    }
+
+    return result;
+}

src/video/cameradevice.cpp

@@ -34,6 +34,9 @@ extern "C" {
 #ifdef Q_OS_LINUX
 #include "src/platform/camera/v4l2.h"
 #endif
+#ifdef Q_OS_OSX
+#include "src/platform/camera/avfoundation.h"
+#endif
 
 QHash<QString, CameraDevice*> CameraDevice::openDevices;
 QMutex CameraDevice::openDeviceLock, CameraDevice::iformatLock;
@@ -162,6 +165,13 @@ CameraDevice* CameraDevice::open(QString devName, VideoMode mode)
         av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
         av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
     }
+#endif
+#ifdef Q_OS_OSX
+    else if (iformat->name == QString("avfoundation") && mode)
+    {
+        av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
+        av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
+    }
 #endif
     else if (mode)
     {
@@ -281,6 +291,10 @@ QVector<QPair<QString, QString>> CameraDevice::getDeviceList()
 #ifdef Q_OS_LINUX
     else if (iformat->name == QString("video4linux2,v4l2"))
         devices += v4l2::getDeviceList();
+#endif
+#ifdef Q_OS_OSX
+    else if (iformat->name == QString("avfoundation"))
+        devices += avfoundation::getDeviceList();
 #endif
     else
         devices += getRawDeviceListGeneric();
@@ -324,6 +338,10 @@ QVector<VideoMode> CameraDevice::getVideoModes(QString devName)
 #ifdef Q_OS_LINUX
     else if (iformat->name == QString("video4linux2,v4l2"))
         return v4l2::getDeviceModes(devName);
+#endif
+#ifdef Q_OS_OSX
+    else if (iformat->name == QString("avfoundation"))
+        return avfoundation::getDeviceModes(devName);
 #endif
     else
         qWarning() << "Video mode listing not implemented for input "<<iformat->name;

src/video/videomode.h

@@ -25,7 +25,7 @@
 struct VideoMode
 {
     unsigned short width, height; ///< Displayed video resolution (NOT frame resolution)
-    unsigned short FPS; ///< Max frames per second supported by the device at this resolution
+    float FPS; ///< Max frames per second supported by the device at this resolution
 
     /// All zeros means a default/unspecified mode
     operator bool() const