GStreamer: fixed build when using GST_PHOTOGRAPHY.

CameraBinExposure was reimplementing the Qt4 version of QCameraExposureControl instead of the refactored version of Qt5. Zoom features were still handled in CameraBinFocus but these have been moved to their own control in Qt5. Task-number: QTBUG-29300 Change-Id: I0c71cac6011137bc5457f0d362da44c72039004a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-02-28 15:28:56 +01:00
parent 339fda0ca9
commit e747d4c0cd
12 changed files with 330 additions and 187 deletions
--- a/src/plugins/gstreamer/camerabin/camerabinzoom.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinzoom.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 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.
+**
+** 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 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: 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
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "camerabinzoom.h"
+#include "camerabinsession.h"
+
+#include <gst/interfaces/photography.h>
+
+#define ZOOM_PROPERTY "zoom"
+#define MAX_ZOOM_PROPERTY "max-zoom"
+
+QT_BEGIN_NAMESPACE
+
+CameraBinZoom::CameraBinZoom(CameraBinSession *session)
+    : QCameraZoomControl(session)
+    , m_session(session)
+    , m_requestedOpticalZoom(1.0)
+    , m_requestedDigitalZoom(1.0)
+{
+
+}
+
+CameraBinZoom::~CameraBinZoom()
+{
+}
+
+qreal CameraBinZoom::maximumOpticalZoom() const
+{
+    return 1.0;
+}
+
+qreal CameraBinZoom::maximumDigitalZoom() const
+{
+    gfloat zoomFactor = 1.0;
+    g_object_get(GST_BIN(m_session->cameraBin()), MAX_ZOOM_PROPERTY, &zoomFactor, NULL);
+    return zoomFactor;
+}
+
+qreal CameraBinZoom::requestedDigitalZoom() const
+{
+    return m_requestedDigitalZoom;
+}
+
+qreal CameraBinZoom::requestedOpticalZoom() const
+{
+    return m_requestedOpticalZoom;
+}
+
+qreal CameraBinZoom::currentOpticalZoom() const
+{
+    return 1.0;
+}
+
+qreal CameraBinZoom::currentDigitalZoom() const
+{
+    gfloat zoomFactor = 1.0;
+    g_object_get(GST_BIN(m_session->cameraBin()), ZOOM_PROPERTY, &zoomFactor, NULL);
+    return zoomFactor;
+}
+
+void CameraBinZoom::zoomTo(qreal optical, qreal digital)
+{
+    qreal oldDigitalZoom = currentDigitalZoom();
+
+    if (m_requestedDigitalZoom != digital) {
+        m_requestedDigitalZoom = digital;
+        emit requestedDigitalZoomChanged(digital);
+    }
+
+    if (m_requestedOpticalZoom != optical) {
+        m_requestedOpticalZoom = optical;
+        emit requestedOpticalZoomChanged(optical);
+    }
+
+    digital = qBound(qreal(1.0), digital, maximumDigitalZoom());
+    g_object_set(GST_BIN(m_session->cameraBin()), ZOOM_PROPERTY, digital, NULL);
+
+    qreal newDigitalZoom = currentDigitalZoom();
+    if (!qFuzzyCompare(oldDigitalZoom, newDigitalZoom))
+        emit currentDigitalZoomChanged(digital);
+}
+
+QT_END_NAMESPACE