diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2013-03-25 18:11:27 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 12:56:57 +0200 |
commit | 0a7882f6b308296ff9d44d891d3bdfed91679ce2 (patch) | |
tree | 8a1e1575158d8213773fcf4e692a160bf4b301cd /src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp | |
parent | 99fff6941ba6b1929c1bd8d46dc8776a6cbf11c6 (diff) | |
download | qtmultimedia-0a7882f6b308296ff9d44d891d3bdfed91679ce2.tar.gz |
Android: added camera support.
This patch includes all camera features: viewport, settings, image
capture, and video recording.
It also adds support for QAudioRecorder.
Change-Id: Ib962177cc8de4bac03f42a2bc0f534e03464bbfc
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp')
-rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp | 141 |
1 files changed, 141 insertions, 0 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp new file mode 100644 index 000000000..b7030e56b --- /dev/null +++ b/src/plugins/android/src/mediacapture/qandroidcamerazoomcontrol.cpp @@ -0,0 +1,141 @@ +/**************************************************************************** +** +** 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 "qandroidcamerazoomcontrol.h" + +#include "qandroidcamerasession.h" +#include "jcamera.h" +#include "qandroidmultimediautils.h" +#include <qmath.h> + +QT_BEGIN_NAMESPACE + +QAndroidCameraZoomControl::QAndroidCameraZoomControl(QAndroidCameraSession *session) + : QCameraZoomControl() + , m_cameraSession(session) + , m_maximumZoom(1.0) + , m_requestedZoom(1.0) + , m_currentZoom(1.0) +{ + connect(m_cameraSession, SIGNAL(opened()), + this, SLOT(onCameraOpened())); +} + +qreal QAndroidCameraZoomControl::maximumOpticalZoom() const +{ + // Optical zoom not supported + return 1.0; +} + +qreal QAndroidCameraZoomControl::maximumDigitalZoom() const +{ + return m_maximumZoom; +} + +qreal QAndroidCameraZoomControl::requestedOpticalZoom() const +{ + // Optical zoom not supported + return 1.0; +} + +qreal QAndroidCameraZoomControl::requestedDigitalZoom() const +{ + return m_requestedZoom; +} + +qreal QAndroidCameraZoomControl::currentOpticalZoom() const +{ + // Optical zoom not supported + return 1.0; +} + +qreal QAndroidCameraZoomControl::currentDigitalZoom() const +{ + return m_currentZoom; +} + +void QAndroidCameraZoomControl::zoomTo(qreal optical, qreal digital) +{ + Q_UNUSED(optical); + + if (!m_cameraSession->camera() || + qFuzzyCompare(m_requestedZoom, digital) || + qFuzzyCompare(m_maximumZoom, qreal(1))) { + return; + } + + m_requestedZoom = digital; + emit requestedDigitalZoomChanged(m_requestedZoom); + + digital = qBound(qreal(1), digital, m_maximumZoom); + int validZoomIndex = qt_findClosestValue(m_zoomRatios, qRound(digital * 100)); + qreal newZoom = m_zoomRatios.at(validZoomIndex) / qreal(100); + if (!qFuzzyCompare(m_currentZoom, newZoom)) { + m_cameraSession->camera()->setZoom(validZoomIndex); + m_currentZoom = newZoom; + emit currentDigitalZoomChanged(m_currentZoom); + } +} + +void QAndroidCameraZoomControl::onCameraOpened() +{ + m_requestedZoom = 1.0; + m_currentZoom = 1.0; + emit requestedDigitalZoomChanged(m_requestedZoom); + emit currentDigitalZoomChanged(m_currentZoom); + + if (m_cameraSession->camera()->isZoomSupported()) { + m_zoomRatios = m_cameraSession->camera()->getZoomRatios(); + qreal maxZoom = m_zoomRatios.last() / qreal(100); + if (m_maximumZoom != maxZoom) { + m_maximumZoom = maxZoom; + emit maximumDigitalZoomChanged(m_maximumZoom); + } + } else { + m_zoomRatios.clear(); + if (!qFuzzyCompare(m_maximumZoom, qreal(1))) { + m_maximumZoom = 1.0; + emit maximumDigitalZoomChanged(m_maximumZoom); + } + } +} + +QT_END_NAMESPACE |