1 files changed, 24 insertions, 10 deletions

diff --git a/src/plugins/avfoundation/camera/avfcamerasession.h b/src/plugins/avfoundation/camera/avfcamerasession.h
index 8ce7461df..4772351e6 100644
--- a/src/plugins/avfoundation/camera/avfcamerasession.h
+++ b/src/plugins/avfoundation/camera/avfcamerasession.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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 Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** 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
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** 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$
@@ -36,6 +36,7 @@
 
 #include <QtCore/qmutex.h>
 #include <QtMultimedia/qcamera.h>
+#include <QVideoFrame>
 
 #import <AVFoundation/AVFoundation.h>
 
@@ -45,7 +46,8 @@ QT_BEGIN_NAMESPACE
 
 class AVFCameraControl;
 class AVFCameraService;
-class AVFVideoRendererControl;
+class AVFCameraRendererControl;
+class AVFMediaVideoProbeControl;
 
 struct AVFCameraInfo
 {
@@ -69,7 +71,7 @@ public:
     static const QList<AVFCameraInfo> &availableCameraDevices();
     static AVFCameraInfo cameraDeviceInfo(const QByteArray &device);
 
-    void setVideoOutput(AVFVideoRendererControl *output);
+    void setVideoOutput(AVFCameraRendererControl *output);
     AVCaptureSession *captureSession() const { return m_captureSession; }
     AVCaptureDevice *videoCaptureDevice() const;
 
@@ -77,6 +79,10 @@ public:
     QCamera::State requestedState() const { return m_state; }
     bool isActive() const { return m_active; }
 
+    void addProbe(AVFMediaVideoProbeControl *probe);
+    void removeProbe(AVFMediaVideoProbeControl *probe);
+    FourCharCode defaultCodec();
+
 public Q_SLOTS:
     void setState(QCamera::State state);
 
@@ -84,6 +90,7 @@ public Q_SLOTS:
     void processSessionStarted();
     void processSessionStopped();
 
+    void onCameraFrameFetched(const QVideoFrame &frame);
 Q_SIGNALS:
     void readyToConfigureConnections();
     void stateChanged(QCamera::State newState);
@@ -93,12 +100,14 @@ Q_SIGNALS:
 private:
     static void updateCameraDevices();
     void attachInputDevices();
+    void applyImageEncoderSettings();
+    void applyViewfinderSettings();
 
     static int m_defaultCameraIndex;
     static QList<AVFCameraInfo> m_cameraDevices;
 
     AVFCameraService *m_service;
-    AVFVideoRendererControl *m_videoOutput;
+    AVFCameraRendererControl *m_videoOutput;
 
     QCamera::State m_state;
     bool m_active;
@@ -107,6 +116,11 @@ private:
     AVCaptureDeviceInput *m_videoInput;
     AVCaptureDeviceInput *m_audioInput;
     AVFCameraSessionObserver *m_observer;
+
+    QSet<AVFMediaVideoProbeControl *> m_videoProbes;
+    QMutex m_videoProbesMutex;
+
+    FourCharCode m_defaultCodec;
 };
 
 QT_END_NAMESPACE