Merge remote-tracking branch 'origin/5.6' into 5.7

Blacklisted a few functions in tst_QAudioInput.

Conflicts:
	.qmake.conf
	src/plugins/avfoundation/camera/avfcameracontrol.mm
	src/plugins/avfoundation/camera/avfcameraservice.h
	src/plugins/avfoundation/camera/avfcameraservice.mm
	src/plugins/avfoundation/camera/avfcamerasession.h
	src/plugins/avfoundation/camera/avfcamerasession.mm
	src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
	src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
	src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
	src/plugins/avfoundation/camera/avfimageencodercontrol.mm
	src/plugins/avfoundation/camera/avfmediarecordercontrol.h
	src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
	tests/auto/integration/qaudioinput/BLACKLIST

Task-number: QTBUG-54459
Task-number: QTBUG-49736
Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6

1 files changed, 82 insertions, 0 deletions

diff --git a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
new file mode 100644
index 000000000..200da90bd
--- /dev/null
+++ b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 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$
+**
+****************************************************************************/
+
+#ifndef AVFVIDEOENCODERSETTINGSCONTROL_H
+#define AVFVIDEOENCODERSETTINGSCONTROL_H
+
+#include <qvideoencodersettingscontrol.h>
+
+#include "avfcamerautility.h"
+#import <AVFoundation/AVFoundation.h>
+
+@class NSDictionary;
+
+QT_BEGIN_NAMESPACE
+
+class AVFCameraService;
+
+class AVFVideoEncoderSettingsControl : public QVideoEncoderSettingsControl
+{
+    Q_OBJECT
+
+public:
+    explicit AVFVideoEncoderSettingsControl(AVFCameraService *service);
+
+    QList<QSize> supportedResolutions(const QVideoEncoderSettings &requestedVideoSettings,
+                                      bool *continuous = 0) const Q_DECL_OVERRIDE;
+
+    QList<qreal> supportedFrameRates(const QVideoEncoderSettings &requestedVideoSettings,
+                                     bool *continuous = 0) const Q_DECL_OVERRIDE;
+
+    QStringList supportedVideoCodecs() const Q_DECL_OVERRIDE;
+    QString videoCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
+
+    QVideoEncoderSettings videoSettings() const Q_DECL_OVERRIDE;
+    void setVideoSettings(const QVideoEncoderSettings &requestedVideoSettings) Q_DECL_OVERRIDE;
+
+    NSDictionary *applySettings(AVCaptureConnection *connection);
+    void unapplySettings(AVCaptureConnection *connection);
+
+private:
+    AVFCameraService *m_service;
+
+    QVideoEncoderSettings m_requestedSettings;
+    QVideoEncoderSettings m_actualSettings;
+
+    AVCaptureDeviceFormat *m_restoreFormat;
+    AVFPSRange m_restoreFps;
+};
+
+QT_END_NAMESPACE
+
+#endif // AVFVIDEOENCODERSETTINGSCONTROL_H