slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced camera viewfinder resolution control with settings control

Browse Source 
It allows to specify a number of camera fiewfinder parameters
including frame rate, resolution and pixel format.

It also allows to extend the list of parameters without breaking source
or binary compatibility.

Change-Id: Ibea85a968ab7ee7b8d1ae34c7fcbac8f5586f53f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
This commit is contained in:
Dmytro Poplavskiy
2012-05-18 14:38:54 +10:00
committed by Qt by Nokia
parent f11c5c83a0
commit b51e1bfa66
4 changed files with 158 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/controls/controls.pri
View File

@@ -15,7 +15,7 @@ PUBLIC_HEADERS += \
controls/qcameraimagecapturecontrol.h \ controls/qcameraimagecapturecontrol.h \
controls/qcameraimageprocessingcontrol.h \ controls/qcameraimageprocessingcontrol.h \
controls/qcameralockscontrol.h \ controls/qcameralockscontrol.h \
controls/qcameraviewfinderresolutioncontrol.h \ controls/qcameraviewfindersettingscontrol.h \
controls/qimageencodercontrol.h \ controls/qimageencodercontrol.h \
controls/qmediacontainercontrol.h \ controls/qmediacontainercontrol.h \
controls/qmediagaplessplaybackcontrol.h \ controls/qmediagaplessplaybackcontrol.h \
@@ -52,7 +52,7 @@ SOURCES += \
controls/qcameraimagecapturecontrol.cpp \ controls/qcameraimagecapturecontrol.cpp \
controls/qcameraimageprocessingcontrol.cpp \ controls/qcameraimageprocessingcontrol.cpp \
controls/qcameralockscontrol.cpp \ controls/qcameralockscontrol.cpp \
controls/qcameraviewfinderresolutioncontrol.cpp \ controls/qcameraviewfindersettingscontrol.cpp \
controls/qimageencodercontrol.cpp \ controls/qimageencodercontrol.cpp \
controls/qmediacontainercontrol.cpp \ controls/qmediacontainercontrol.cpp \
controls/qmediagaplessplaybackcontrol.cpp \ controls/qmediagaplessplaybackcontrol.cpp \

109
src/multimedia/controls/qcameraviewfinderresolutioncontrol.cpp
View File

@@ -1,109 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** 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, Nokia gives you certain additional
** rights. These rights are described in the Nokia 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.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qcameraviewfinderresolutioncontrol.h"
#include "qmediacontrol_p.h"
QT_BEGIN_NAMESPACE
/*!
\class QCameraViewfinderResolutionControl
\inmodule QtMultimedia
\ingroup multimedia
\ingroup multimedia_control
\brief The QCameraViewfinderResolutionControl class provides an abstract class
for controlling camera viewfinder parameters.
The interface name of QCameraViewfinderResolutionControl is \c org.qt-project.qt.cameraviewfinderresolutioncontrol/5.0 as
defined in QCameraViewfinderResolutionControl_iid.
\sa QMediaService::requestControl(), QCamera
*/
/*!
\macro QCameraViewfinderResolutionControl_iid
\c org.qt-project.qt.cameraviewfinderresolutioncontrol/5.0
Defines the interface name of the QCameraViewfinderResolutionControl class.
\relates QCameraViewfinderResolutionControl
*/
/*!
Constructs a camera viewfinder control object with \a parent.
*/
QCameraViewfinderResolutionControl::QCameraViewfinderResolutionControl(QObject *parent)
: QMediaControl(*new QMediaControlPrivate, parent)
{
}
/*!
Destroys the camera viewfinder control object.
*/
QCameraViewfinderResolutionControl::~QCameraViewfinderResolutionControl()
{
}
/*!
\fn QCameraViewfinderResolutionControl::viewfinderResolution() const
Returns the current resolution of the camera viewfinder stream.
*/
/*!
\fn QCameraViewfinderResolutionControl::setViewfinderResolution(const QSize &resolution)
Set the resolution of the camera viewfinder stream to \a resolution.
Calling this while the camera is active may result in the camera being unloaded and
reloaded. If video recording is in progress, this call may be ignored. If an unsupported
resolution is specified the camera may fail to load, or the setting may be ignored.
Returns false if this setting cannot be applied at this time or if the resolution is
invalid. Returns true if the setting will be applied (or attempted to be applied).
*/
#include "moc_qcameraviewfinderresolutioncontrol.cpp"
QT_END_NAMESPACE

136
src/multimedia/controls/qcameraviewfindersettingscontrol.cpp Normal file
View File

@@ -0,0 +1,136 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** 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, Nokia gives you certain additional
** rights. These rights are described in the Nokia 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.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qcameraviewfindersettingscontrol.h"
#include "qmediacontrol_p.h"
QT_BEGIN_NAMESPACE
/*!
\class QCameraViewfinderSettingsControl
\inmodule QtMultimedia
\ingroup multimedia
\ingroup multimedia_control
\brief The QCameraViewfinderSettingsControl class provides an abstract class
for controlling camera viewfinder parameters.
The interface name of QCameraViewfinderSettingsControl is \c org.qt-project.qt.cameraviewfindersettingscontrol/5.0 as
defined in QCameraViewfinderSettingsControl_iid.
\sa QMediaService::requestControl(), QCamera
*/
/*!
\macro QCameraViewfinderSettingsControl_iid
\c org.qt-project.qt.cameraviewfinderresettingscontrol/5.0
Defines the interface name of the QCameraViewfinderSettingsControl class.
\relates QCameraViewfinderSettingsControl
*/
/*!
Constructs a camera viewfinder control object with \a parent.
*/
QCameraViewfinderSettingsControl::QCameraViewfinderSettingsControl(QObject *parent)
: QMediaControl(*new QMediaControlPrivate, parent)
{
}
/*!
Destroys the camera viewfinder control object.
*/
QCameraViewfinderSettingsControl::~QCameraViewfinderSettingsControl()
{
}
/*!
\enum QCameraViewfinderSettingsControl::ViewfinderParameter
\value Resolution
Viewfinder resolution, QSize.
\value PixelAspectRatio
Pixel aspect ratio, QSize as in QVideoSurfaceFormat::pixelAspectRatio
\value MinimumFrameRate
Minimum viewfinder frame rate, qreal
\value MaximumFrameRate
Maximum viewfinder frame rate, qreal
\value PixelFormat
Viewfinder pixel format, QVideoFrame::PixelFormat
\value UserParameter
The base value for platform specific extended parameters.
For such parameters the sequential values starting from UserParameter shuld be used.
*/
/*!
\fn QCameraViewfinderSettingsControl::isViewfinderParameterSupported(ViewfinderParameter parameter)
Returns true if configuration of viewfinder \a parameter is supported by camera backend.
*/
/*!
\fn QCameraViewfinderSettingsControl::viewfinderParameter(ViewfinderParameter parameter) const
Returns the value of viewfinder \a parameter.
*/
/*!
\fn QCameraViewfinderSettingsControl::setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value)
Set the prefferred \a value of viewfinder \a parameter.
Calling this while the camera is active may result in the camera being
stopped and reloaded. If video recording is in progress, this call may be ignored.
If an unsupported parameter is specified the camera may fail to load,
or the setting may be ignored.
Viewfinder parameters may also depend on other camera settings,
especially in video capture mode. If camera configuration conflicts
with viewfinder settings, the camara configuration is usually preferred.
*/
#include "moc_qcameraviewfindersettingscontrol.cpp"
QT_END_NAMESPACE

31
src/multimedia/controls/qcameraviewfinderresolutioncontrol.h → src/multimedia/controls/qcameraviewfindersettingscontrol.h
View File

@@ -41,8 +41,8 @@
#ifndef QCAMERAVIEWFINDERRESOLUTIONCONTROL_H #ifndef QCAMERAVIEWFINDERSETTINGSCONTROL_H
#define QCAMERAVIEWFINDERRESOLUTIONCONTROL_H #define QCAMERAVIEWFINDERSETTINGSCONTROL_H
#include <qmediacontrol.h> #include <qmediacontrol.h>
@@ -52,25 +52,34 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia) QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraViewfinderResolutionControl : public QMediaControl class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl : public QMediaControl
{ {
Q_OBJECT Q_OBJECT
public: public:
~QCameraViewfinderResolutionControl(); enum ViewfinderParameter {
Resolution,
PixelAspectRatio,
MinimumFrameRate,
MaximumFrameRate,
PixelFormat,
UserParameter = 1000
};
virtual QSize viewfinderResolution() const = 0; ~QCameraViewfinderSettingsControl();
virtual bool setViewfinderResolution(const QSize &resolution) = 0;
virtual bool isViewfinderParameterSupported(ViewfinderParameter parameter) const = 0;
virtual QVariant viewfinderParameter(ViewfinderParameter parameter) const = 0;
virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0;
protected: protected:
QCameraViewfinderResolutionControl(QObject *parent = 0); QCameraViewfinderSettingsControl(QObject *parent = 0);
}; };
#define QCameraViewfinderResolutionControl_iid "org.qt-project.qt.cameraviewfindercontrol/5.0" #define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0"
Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderResolutionControl, QCameraViewfinderResolutionControl_iid) Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSettingsControl_iid)
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
#endif // QCAMERAVIEWFINDERRESOLUTIONCONTROL_H #endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H