New QCameraInfo class.
The class allows to get the list of available cameras on the system as well as getting some static information about them such as their unique ID, display name, physical position and sensor orientation. This makes QCamera::availableDevices() and QCamera::deviceDescription() obsolete. This patch contains the API, documentation and auto-tests but not the actual implementation by each backend (except for retrieving the default camera device). [ChangeLog][QtMultimedia] Added new QCameraInfo class [ChangeLog][QtMultimedia] QCamera: availableDevices() and deviceDescription() are deprecated, use QCameraInfo instead Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
committed by
The Qt Project
The Qt Project
parent
d964388b38
commit
b28ee24628
@@ -9,6 +9,7 @@ PUBLIC_HEADERS += \
|
||||
controls/qcameracapturebufferformatcontrol.h \
|
||||
controls/qcameracapturedestinationcontrol.h \
|
||||
controls/qcameracontrol.h \
|
||||
controls/qcamerainfocontrol.h \
|
||||
controls/qcameraexposurecontrol.h \
|
||||
controls/qcamerafeedbackcontrol.h \
|
||||
controls/qcameraflashcontrol.h \
|
||||
@@ -45,6 +46,7 @@ SOURCES += \
|
||||
controls/qcameracapturebufferformatcontrol.cpp \
|
||||
controls/qcameracapturedestinationcontrol.cpp \
|
||||
controls/qcameracontrol.cpp \
|
||||
controls/qcamerainfocontrol.cpp \
|
||||
controls/qcameraexposurecontrol.cpp \
|
||||
controls/qcamerafeedbackcontrol.cpp \
|
||||
controls/qcameraflashcontrol.cpp \
|
||||
@@ -79,4 +81,3 @@ SOURCES += \
|
||||
controls/qaudiooutputselectorcontrol.cpp \
|
||||
controls/qvideodeviceselectorcontrol.cpp
|
||||
|
||||
|
||||
|
||||
104
src/multimedia/controls/qcamerainfocontrol.cpp
Normal file
104
src/multimedia/controls/qcamerainfocontrol.cpp
Normal file
@@ -0,0 +1,104 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 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 "qcamerainfocontrol.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
\class QCameraInfoControl
|
||||
\since 5.3
|
||||
|
||||
\brief The QCameraInfoControl class provides a camera info media control.
|
||||
\inmodule QtMultimedia
|
||||
|
||||
\ingroup multimedia_control
|
||||
|
||||
The QCameraInfoControl class provides information about the camera devices
|
||||
available on the system.
|
||||
|
||||
The interface name of QCameraInfoControl is \c org.qt-project.qt.camerainfocontrol/5.3 as
|
||||
defined in QCameraInfoControl_iid.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\macro QCameraInfoControl_iid
|
||||
|
||||
\c org.qt-project.qt.camerainfocontrol/5.3
|
||||
|
||||
Defines the interface name of the QCameraInfoControl class.
|
||||
|
||||
\relates QVideoDeviceSelectorControl
|
||||
*/
|
||||
|
||||
/*!
|
||||
Constructs a camera info control with the given \a parent.
|
||||
*/
|
||||
QCameraInfoControl::QCameraInfoControl(QObject *parent)
|
||||
: QMediaControl(parent)
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
Destroys a camera info control.
|
||||
*/
|
||||
QCameraInfoControl::~QCameraInfoControl()
|
||||
{
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn QCameraInfoControl::cameraPosition(const QString &deviceName) const
|
||||
|
||||
Returns the physical position of the camera named \a deviceName on the hardware system.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QCameraInfoControl::cameraOrientation(const QString &deviceName) const
|
||||
|
||||
Returns the physical orientation of the sensor for the camera named \a deviceName.
|
||||
|
||||
The value is the orientation angle (clockwise, in steps of 90 degrees) of the camera sensor
|
||||
in relation to the display in its natural orientation.
|
||||
*/
|
||||
|
||||
#include "moc_qcamerainfocontrol.cpp"
|
||||
|
||||
QT_END_NAMESPACE
|
||||
71
src/multimedia/controls/qcamerainfocontrol.h
Normal file
71
src/multimedia/controls/qcamerainfocontrol.h
Normal file
@@ -0,0 +1,71 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2014 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QCAMERAINFOCONTROL_H
|
||||
#define QCAMERAINFOCONTROL_H
|
||||
|
||||
#include <QtMultimedia/qcamera.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
// Required for QDoc workaround
|
||||
class QString;
|
||||
|
||||
class Q_MULTIMEDIA_EXPORT QCameraInfoControl : public QMediaControl
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
virtual ~QCameraInfoControl();
|
||||
|
||||
virtual QCamera::Position cameraPosition(const QString &deviceName) const = 0;
|
||||
virtual int cameraOrientation(const QString &deviceName) const = 0;
|
||||
|
||||
protected:
|
||||
QCameraInfoControl(QObject *parent = 0);
|
||||
};
|
||||
|
||||
#define QCameraInfoControl_iid "org.qt-project.qt.camerainfocontrol/5.3"
|
||||
Q_MEDIA_DECLARE_CONTROL(QCameraInfoControl, QCameraInfoControl_iid)
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QCAMERAINFOCONTROL_H
|
||||
Reference in New Issue
Block a user