Add AVF camera utilities - general aux. functions/classes
Move configuration lock class into avfutility.h + add several standalone functions to work with AVCaptureDeviceFormat/AVCaptureDevice etc. - utility functions that are not specific to any class. Change-Id: Idba544248772a3b2a4e00dddb377b1c0e62b8085 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
committed by
Yoann Lopes
parent
5a0a3791a1
commit
d27f493df0
@@ -32,7 +32,7 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "avfcameraexposurecontrol.h"
|
#include "avfcameraexposurecontrol.h"
|
||||||
#include "avfconfigurationlock.h"
|
#include "avfcamerautility.h"
|
||||||
#include "avfcamerasession.h"
|
#include "avfcamerasession.h"
|
||||||
#include "avfcameraservice.h"
|
#include "avfcameraservice.h"
|
||||||
#include "avfcameradebug.h"
|
#include "avfcameradebug.h"
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "avfcamerafocuscontrol.h"
|
#include "avfcamerafocuscontrol.h"
|
||||||
#include "avfconfigurationlock.h"
|
#include "avfcamerautility.h"
|
||||||
#include "avfcameraservice.h"
|
#include "avfcameraservice.h"
|
||||||
#include "avfcamerasession.h"
|
#include "avfcamerasession.h"
|
||||||
#include "avfcameradebug.h"
|
#include "avfcameradebug.h"
|
||||||
|
|||||||
@@ -31,15 +31,20 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef AVFCONFIGURATIONLOCK_H
|
#ifndef AVFCAMERAUTILITY_H
|
||||||
#define AVFCONFIGURATIONLOCK_H
|
#define AVFCAMERAUTILITY_H
|
||||||
|
|
||||||
|
#include <QtCore/qsysinfo.h>
|
||||||
#include <QtCore/qglobal.h>
|
#include <QtCore/qglobal.h>
|
||||||
|
#include <QtCore/qvector.h>
|
||||||
#include <QtCore/qdebug.h>
|
#include <QtCore/qdebug.h>
|
||||||
|
#include <QtCore/qsize.h>
|
||||||
|
#include <QtCore/qpair.h>
|
||||||
|
|
||||||
#include <AVFoundation/AVFoundation.h>
|
#include <AVFoundation/AVFoundation.h>
|
||||||
|
|
||||||
@class AVCaptureDevice;
|
// In case we have SDK below 10.7/7.0:
|
||||||
|
@class AVCaptureDeviceFormat;
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
@@ -73,6 +78,36 @@ private:
|
|||||||
bool m_locked;
|
bool m_locked;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
inline QSysInfo::MacVersion qt_OS_limit(QSysInfo::MacVersion osxVersion,
|
||||||
|
QSysInfo::MacVersion iosVersion)
|
||||||
|
{
|
||||||
|
#ifdef Q_OS_OSX
|
||||||
|
Q_UNUSED(iosVersion)
|
||||||
|
return osxVersion;
|
||||||
|
#else
|
||||||
|
Q_UNUSED(osxVersion)
|
||||||
|
return iosVersion;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef QPair<qreal, qreal> AVFPSRange;
|
||||||
|
AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection);
|
||||||
|
typedef QPair<int, int> AVFRational;
|
||||||
|
AVFRational qt_float_to_rational(qreal par, int limit);
|
||||||
|
|
||||||
|
#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_7, __IPHONE_7_0)
|
||||||
|
|
||||||
|
bool qt_is_video_range_subtype(AVCaptureDeviceFormat *format);
|
||||||
|
QSize qt_device_format_resolution(AVCaptureDeviceFormat *format);
|
||||||
|
QSize qt_device_format_high_resolution(AVCaptureDeviceFormat *format);
|
||||||
|
QSize qt_device_format_pixel_aspect_ratio(AVCaptureDeviceFormat *format);
|
||||||
|
QVector<AVFPSRange> qt_device_format_framerates(AVCaptureDeviceFormat *format);
|
||||||
|
AVCaptureDeviceFormat *qt_find_best_resolution_match(AVCaptureDevice *captureDevice, const QSize &res);
|
||||||
|
AVCaptureDeviceFormat *qt_find_best_framerate_match(AVCaptureDevice *captureDevice, Float64 fps);
|
||||||
|
AVFrameRateRange *qt_find_supported_framerate_range(AVCaptureDeviceFormat *format, Float64 fps);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
386
src/plugins/avfoundation/camera/avfcamerautility.mm
Normal file
386
src/plugins/avfoundation/camera/avfcamerautility.mm
Normal file
@@ -0,0 +1,386 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2015 The Qt Company Ltd.
|
||||||
|
** Contact: http://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL21$
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
** and conditions see http://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 or version 3 as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||||
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||||
|
** following information to ensure the GNU Lesser General Public License
|
||||||
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** As a special exception, The Qt Company gives you certain additional
|
||||||
|
** rights. These rights are described in The Qt Company LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "avfcamerautility.h"
|
||||||
|
#include "avfcameradebug.h"
|
||||||
|
|
||||||
|
#include <QtCore/qvector.h>
|
||||||
|
#include <QtCore/qpair.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection)
|
||||||
|
{
|
||||||
|
Q_ASSERT(videoConnection);
|
||||||
|
|
||||||
|
AVFPSRange newRange;
|
||||||
|
// "The value in the videoMinFrameDuration is equivalent to the reciprocal
|
||||||
|
// of the maximum framerate, the value in the videoMaxFrameDuration is equivalent
|
||||||
|
// to the reciprocal of the minimum framerate."
|
||||||
|
if (videoConnection.supportsVideoMinFrameDuration) {
|
||||||
|
const CMTime cmMin = videoConnection.videoMinFrameDuration;
|
||||||
|
if (CMTimeCompare(cmMin, kCMTimeInvalid)) { // Has some non-default value:
|
||||||
|
if (const Float64 minSeconds = CMTimeGetSeconds(cmMin))
|
||||||
|
newRange.second = 1. / minSeconds;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (videoConnection.supportsVideoMaxFrameDuration) {
|
||||||
|
const CMTime cmMax = videoConnection.videoMaxFrameDuration;
|
||||||
|
if (CMTimeCompare(cmMax, kCMTimeInvalid)) {
|
||||||
|
if (const Float64 maxSeconds = CMTimeGetSeconds(cmMax))
|
||||||
|
newRange.first = 1. / maxSeconds;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return newRange;
|
||||||
|
}
|
||||||
|
|
||||||
|
AVFRational qt_float_to_rational(qreal par, int limit)
|
||||||
|
{
|
||||||
|
Q_ASSERT(limit > 0);
|
||||||
|
|
||||||
|
// In Qt we represent pixel aspect ratio
|
||||||
|
// as a rational number (we use QSize).
|
||||||
|
// AVFoundation describes dimensions in pixels
|
||||||
|
// and in pixels with width multiplied by PAR.
|
||||||
|
// Represent this PAR as a ratio.
|
||||||
|
int a = 0, b = 1, c = 1, d = 1;
|
||||||
|
qreal mid = 0.;
|
||||||
|
while (b <= limit && d <= limit) {
|
||||||
|
mid = qreal(a + c) / (b + d);
|
||||||
|
|
||||||
|
if (qAbs(par - mid) < 0.000001) {
|
||||||
|
if (b + d <= limit)
|
||||||
|
return AVFRational(a + c, b + d);
|
||||||
|
else if (d > b)
|
||||||
|
return AVFRational(c, d);
|
||||||
|
else
|
||||||
|
return AVFRational(a, b);
|
||||||
|
} else if (par > mid) {
|
||||||
|
a = a + c;
|
||||||
|
b = b + d;
|
||||||
|
} else {
|
||||||
|
c = a + c;
|
||||||
|
d = b + d;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (b > limit)
|
||||||
|
return AVFRational(c, d);
|
||||||
|
|
||||||
|
return AVFRational(a, b);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_7, __IPHONE_7_0)
|
||||||
|
|
||||||
|
bool qt_is_video_range_subtype(AVCaptureDeviceFormat *format)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format);
|
||||||
|
#ifdef Q_OS_IOS
|
||||||
|
// Use only 420f on iOS, not 420v.
|
||||||
|
const FourCharCode subType = CMFormatDescriptionGetMediaSubType(format.formatDescription);
|
||||||
|
return subType == kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
|
||||||
|
#else
|
||||||
|
Q_UNUSED(format)
|
||||||
|
#endif
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
inline bool qt_area_sane(const QSize &size)
|
||||||
|
{
|
||||||
|
return !size.isNull() && size.isValid()
|
||||||
|
&& std::numeric_limits<int>::max() / size.width() >= size.height();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool avf_format_compare(AVCaptureDeviceFormat *f1, AVCaptureDeviceFormat *f2)
|
||||||
|
{
|
||||||
|
Q_ASSERT(f1);
|
||||||
|
Q_ASSERT(f2);
|
||||||
|
const QSize r1(qt_device_format_resolution(f1));
|
||||||
|
const QSize r2(qt_device_format_resolution(f2));
|
||||||
|
return r1.width() > r2.width() && r1.height() > r2.height();
|
||||||
|
}
|
||||||
|
|
||||||
|
QVector<AVCaptureDeviceFormat *> qt_sort_device_formats(AVCaptureDevice *captureDevice)
|
||||||
|
{
|
||||||
|
// Select only formats with framerate ranges + sort them by resoluions,
|
||||||
|
Q_ASSERT(captureDevice);
|
||||||
|
|
||||||
|
QVector<AVCaptureDeviceFormat *>sorted;
|
||||||
|
|
||||||
|
NSArray *formats = captureDevice.formats;
|
||||||
|
if (!formats || !formats.count)
|
||||||
|
return sorted;
|
||||||
|
|
||||||
|
sorted.reserve(formats.count);
|
||||||
|
for (AVCaptureDeviceFormat *format in formats) {
|
||||||
|
if (qt_is_video_range_subtype(format))
|
||||||
|
continue;
|
||||||
|
if (format.videoSupportedFrameRateRanges && format.videoSupportedFrameRateRanges.count) {
|
||||||
|
const QSize resolution(qt_device_format_resolution(format));
|
||||||
|
if (!resolution.isNull() && resolution.isValid())
|
||||||
|
sorted << format;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::sort(sorted.begin(), sorted.end(), avf_format_compare);
|
||||||
|
return sorted;
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64 qt_find_min_framerate_distance(AVCaptureDeviceFormat *format, Float64 fps)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format && format.videoSupportedFrameRateRanges
|
||||||
|
&& format.videoSupportedFrameRateRanges.count);
|
||||||
|
|
||||||
|
AVFrameRateRange *range = [format.videoSupportedFrameRateRanges objectAtIndex:0];
|
||||||
|
Float64 distance = qAbs(range.maxFrameRate - fps);
|
||||||
|
for (NSUInteger i = 1, e = format.videoSupportedFrameRateRanges.count; i < e; ++i) {
|
||||||
|
range = [format.videoSupportedFrameRateRanges objectAtIndex:i];
|
||||||
|
distance = qMin(distance, qAbs(range.maxFrameRate - fps));
|
||||||
|
}
|
||||||
|
|
||||||
|
return distance;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // Unnamed namespace.
|
||||||
|
|
||||||
|
QSize qt_device_format_resolution(AVCaptureDeviceFormat *format)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format);
|
||||||
|
if (!format.formatDescription)
|
||||||
|
return QSize();
|
||||||
|
|
||||||
|
const CMVideoDimensions res = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
|
||||||
|
return QSize(res.width, res.height);
|
||||||
|
}
|
||||||
|
|
||||||
|
QSize qt_device_format_high_resolution(AVCaptureDeviceFormat *format)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format);
|
||||||
|
QSize res;
|
||||||
|
#if defined(Q_OS_IOS) && QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_8_0)
|
||||||
|
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_IOS_8_0) {
|
||||||
|
const CMVideoDimensions hrDim(format.highResolutionStillImageDimensions);
|
||||||
|
res.setWidth(hrDim.width);
|
||||||
|
res.setHeight(hrDim.height);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
QVector<AVFPSRange> qt_device_format_framerates(AVCaptureDeviceFormat *format)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format);
|
||||||
|
|
||||||
|
QVector<AVFPSRange> qtRanges;
|
||||||
|
|
||||||
|
if (!format.videoSupportedFrameRateRanges || !format.videoSupportedFrameRateRanges.count)
|
||||||
|
return qtRanges;
|
||||||
|
|
||||||
|
qtRanges.reserve(format.videoSupportedFrameRateRanges.count);
|
||||||
|
for (AVFrameRateRange *range in format.videoSupportedFrameRateRanges)
|
||||||
|
qtRanges << AVFPSRange(range.minFrameRate, range.maxFrameRate);
|
||||||
|
|
||||||
|
return qtRanges;
|
||||||
|
}
|
||||||
|
|
||||||
|
QSize qt_device_format_pixel_aspect_ratio(AVCaptureDeviceFormat *format)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format);
|
||||||
|
|
||||||
|
if (!format.formatDescription) {
|
||||||
|
qDebugCamera() << Q_FUNC_INFO << "no format description found";
|
||||||
|
return QSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
const CMVideoDimensions res = CMVideoFormatDescriptionGetDimensions(format.formatDescription);
|
||||||
|
const CGSize resPAR = CMVideoFormatDescriptionGetPresentationDimensions(format.formatDescription, true, false);
|
||||||
|
|
||||||
|
if (qAbs(resPAR.width - res.width) < 1.) {
|
||||||
|
// "Pixel aspect ratio is used to adjust the width, leaving the height alone."
|
||||||
|
return QSize(1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!res.width || !resPAR.width)
|
||||||
|
return QSize();
|
||||||
|
|
||||||
|
const AVFRational asRatio(qt_float_to_rational(resPAR.width > res.width
|
||||||
|
? res.width / qreal(resPAR.width)
|
||||||
|
: resPAR.width / qreal(res.width), 200));
|
||||||
|
return QSize(asRatio.first, asRatio.second);
|
||||||
|
}
|
||||||
|
|
||||||
|
AVCaptureDeviceFormat *qt_find_best_resolution_match(AVCaptureDevice *captureDevice, const QSize &request)
|
||||||
|
{
|
||||||
|
Q_ASSERT(captureDevice);
|
||||||
|
Q_ASSERT(!request.isNull() && request.isValid());
|
||||||
|
|
||||||
|
if (!captureDevice.formats || !captureDevice.formats.count)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
for (AVCaptureDeviceFormat *format in captureDevice.formats) {
|
||||||
|
if (qt_is_video_range_subtype(format))
|
||||||
|
continue;
|
||||||
|
if (qt_device_format_resolution(format) == request)
|
||||||
|
return format;
|
||||||
|
// iOS only (still images).
|
||||||
|
if (qt_device_format_high_resolution(format) == request)
|
||||||
|
return format;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!qt_area_sane(request))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
typedef QPair<QSize, AVCaptureDeviceFormat *> FormatPair;
|
||||||
|
|
||||||
|
QVector<FormatPair> formats;
|
||||||
|
formats.reserve(captureDevice.formats.count);
|
||||||
|
|
||||||
|
for (AVCaptureDeviceFormat *format in captureDevice.formats) {
|
||||||
|
if (qt_is_video_range_subtype(format))
|
||||||
|
continue;
|
||||||
|
const QSize res(qt_device_format_resolution(format));
|
||||||
|
if (!res.isNull() && res.isValid() && qt_area_sane(res))
|
||||||
|
formats << FormatPair(res, format);
|
||||||
|
const QSize highRes(qt_device_format_high_resolution(format));
|
||||||
|
if (!highRes.isNull() && highRes.isValid() && qt_area_sane(highRes))
|
||||||
|
formats << FormatPair(highRes, format);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!formats.size())
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
AVCaptureDeviceFormat *best = formats[0].second;
|
||||||
|
QSize next(formats[0].first);
|
||||||
|
int wDiff = qAbs(request.width() - next.width());
|
||||||
|
int hDiff = qAbs(request.height() - next.height());
|
||||||
|
const int area = request.width() * request.height();
|
||||||
|
int areaDiff = qAbs(area - next.width() * next.height());
|
||||||
|
for (int i = 1; i < formats.size(); ++i) {
|
||||||
|
next = formats[i].first;
|
||||||
|
const int newWDiff = qAbs(next.width() - request.width());
|
||||||
|
const int newHDiff = qAbs(next.height() - request.height());
|
||||||
|
const int newAreaDiff = qAbs(area - next.width() * next.height());
|
||||||
|
|
||||||
|
if ((newWDiff < wDiff && newHDiff < hDiff)
|
||||||
|
|| ((newWDiff <= wDiff || newHDiff <= hDiff) && newAreaDiff <= areaDiff)) {
|
||||||
|
wDiff = newWDiff;
|
||||||
|
hDiff = newHDiff;
|
||||||
|
best = formats[i].second;
|
||||||
|
areaDiff = newAreaDiff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return best;
|
||||||
|
}
|
||||||
|
|
||||||
|
AVCaptureDeviceFormat *qt_find_best_framerate_match(AVCaptureDevice *captureDevice, Float64 fps)
|
||||||
|
{
|
||||||
|
Q_ASSERT(captureDevice);
|
||||||
|
Q_ASSERT(fps > 0.);
|
||||||
|
|
||||||
|
const qreal epsilon = 0.1;
|
||||||
|
|
||||||
|
// Sort formats by their resolution.
|
||||||
|
const QVector<AVCaptureDeviceFormat *> sorted(qt_sort_device_formats(captureDevice));
|
||||||
|
if (!sorted.size())
|
||||||
|
return nil;
|
||||||
|
|
||||||
|
for (int i = 0; i < sorted.size(); ++i) {
|
||||||
|
AVCaptureDeviceFormat *format = sorted[i];
|
||||||
|
for (AVFrameRateRange *range in format.videoSupportedFrameRateRanges) {
|
||||||
|
if (range.maxFrameRate - range.minFrameRate < epsilon) {
|
||||||
|
// On OS X ranges are points (built-in camera).
|
||||||
|
if (qAbs(fps - range.maxFrameRate) < epsilon)
|
||||||
|
return format;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fps >= range.minFrameRate && fps <= range.maxFrameRate)
|
||||||
|
return format;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64 distance = qt_find_min_framerate_distance(sorted[0], fps);
|
||||||
|
AVCaptureDeviceFormat *match = sorted[0];
|
||||||
|
for (int i = 1; i < sorted.size(); ++i) {
|
||||||
|
const Float64 newDistance = qt_find_min_framerate_distance(sorted[i], fps);
|
||||||
|
if (newDistance < distance) {
|
||||||
|
distance = newDistance;
|
||||||
|
match = sorted[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return match;
|
||||||
|
}
|
||||||
|
|
||||||
|
AVFrameRateRange *qt_find_supported_framerate_range(AVCaptureDeviceFormat *format, Float64 fps)
|
||||||
|
{
|
||||||
|
Q_ASSERT(format && format.videoSupportedFrameRateRanges
|
||||||
|
&& format.videoSupportedFrameRateRanges.count);
|
||||||
|
|
||||||
|
const qreal epsilon = 0.1;
|
||||||
|
|
||||||
|
for (AVFrameRateRange *range in format.videoSupportedFrameRateRanges) {
|
||||||
|
if (range.maxFrameRate - range.minFrameRate < epsilon) {
|
||||||
|
// On OS X ranges are points (built-in camera).
|
||||||
|
if (qAbs(fps - range.maxFrameRate) < epsilon)
|
||||||
|
return range;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fps >= range.minFrameRate && fps <= range.maxFrameRate)
|
||||||
|
return range;
|
||||||
|
}
|
||||||
|
|
||||||
|
AVFrameRateRange *match = [format.videoSupportedFrameRateRanges objectAtIndex:0];
|
||||||
|
Float64 distance = qAbs(match.maxFrameRate - fps);
|
||||||
|
for (NSUInteger i = 1, e = format.videoSupportedFrameRateRanges.count; i < e; ++i) {
|
||||||
|
AVFrameRateRange *range = [format.videoSupportedFrameRateRanges objectAtIndex:i];
|
||||||
|
const Float64 newDistance = qAbs(range.maxFrameRate - fps);
|
||||||
|
if (newDistance < distance) {
|
||||||
|
distance = newDistance;
|
||||||
|
match = range;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return match;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // SDK
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "avfcamerazoomcontrol.h"
|
#include "avfcamerazoomcontrol.h"
|
||||||
#include "avfconfigurationlock.h"
|
|
||||||
#include "avfcameraservice.h"
|
#include "avfcameraservice.h"
|
||||||
|
#include "avfcamerautility.h"
|
||||||
#include "avfcamerasession.h"
|
#include "avfcamerasession.h"
|
||||||
#include "avfcameracontrol.h"
|
#include "avfcameracontrol.h"
|
||||||
#include "avfcameradebug.h"
|
#include "avfcameradebug.h"
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ HEADERS += \
|
|||||||
avfcameradevicecontrol.h \
|
avfcameradevicecontrol.h \
|
||||||
avfcamerafocuscontrol.h \
|
avfcamerafocuscontrol.h \
|
||||||
avfcameraexposurecontrol.h \
|
avfcameraexposurecontrol.h \
|
||||||
avfconfigurationlock.h
|
avfcamerautility.h
|
||||||
|
|
||||||
OBJECTIVE_SOURCES += \
|
OBJECTIVE_SOURCES += \
|
||||||
avfcameraserviceplugin.mm \
|
avfcameraserviceplugin.mm \
|
||||||
@@ -57,7 +57,8 @@ OBJECTIVE_SOURCES += \
|
|||||||
avfcameradevicecontrol.mm \
|
avfcameradevicecontrol.mm \
|
||||||
avfcamerarenderercontrol.mm \
|
avfcamerarenderercontrol.mm \
|
||||||
avfcamerafocuscontrol.mm \
|
avfcamerafocuscontrol.mm \
|
||||||
avfcameraexposurecontrol.mm
|
avfcameraexposurecontrol.mm \
|
||||||
|
avfcamerautility.mm
|
||||||
|
|
||||||
ios {
|
ios {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user