QML Camera element redesign.

Grouped camera properties in a similar way to C++ QCamera API.
Added support for video recording.

Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b
Reviewed-on: http://codereview.qt-project.org/3552
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2011-08-25 14:05:10 +10:00
committed by Qt by Nokia
parent 47a5dd4371
commit 1913f164dc
16 changed files with 2321 additions and 961 deletions

View File

@@ -0,0 +1,162 @@
/****************************************************************************
**
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the plugins 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$
**
****************************************************************************/
#ifndef QDECLARATIVECAMERARECORDER_H
#define QDECLARATIVECAMERARECORDER_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of other Qt classes. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <qcamera.h>
#include <qmediarecorder.h>
#include <qmediaencodersettings.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDeclarativeCamera;
class QDeclarativeCameraRecorder : public QObject
{
Q_OBJECT
Q_ENUMS(RecorderState)
Q_PROPERTY(RecorderState recorderState READ recorderState WRITE setRecorderState NOTIFY recorderStateChanged)
Q_PROPERTY(QSize resolution READ captureResolution WRITE setCaptureResolution NOTIFY captureResolutionChanged)
Q_PROPERTY(QString videoCodec READ videoCodec WRITE setVideoCodec NOTIFY videoCodecChanged)
Q_PROPERTY(QString audioCodec READ audioCodec WRITE setAudioCodec NOTIFY audioCodecChanged)
Q_PROPERTY(QString mediaContainer READ mediaContainer WRITE setMediaContainer NOTIFY mediaContainerChanged)
Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
Q_PROPERTY(QString outputLocation READ outputLocation WRITE setOutputLocation NOTIFY outputLocationChanged)
Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
Q_PROPERTY(QString errorString READ errorString NOTIFY error)
public:
enum RecorderState
{
StoppedState = QMediaRecorder::StoppedState,
RecordingState = QMediaRecorder::RecordingState
};
~QDeclarativeCameraRecorder();
RecorderState recorderState() const;
QSize captureResolution();
QString outputLocation() const;
qint64 duration() const;
bool isMuted() const;
QString audioCodec() const;
QString videoCodec() const;
QString mediaContainer() const;
QMediaRecorder::Error error() const;
QString errorString() const;
public Q_SLOTS:
void setOutputLocation(const QUrl &location);
void record();
void stop();
void setRecorderState(QDeclarativeCameraRecorder::RecorderState state);
void setMuted(bool muted);
void setMetadata(const QString &key, const QVariant &value);
void setCaptureResolution(const QSize &resolution);
void setAudioCodec(const QString &codec);
void setVideoCodec(const QString &codec);
void setMediaContainer(const QString &container);
Q_SIGNALS:
void recorderStateChanged(QDeclarativeCameraRecorder::RecorderState state);
void durationChanged(qint64 duration);
void mutedChanged(bool muted);
void outputLocationChanged(const QString &location);
void error(QMediaRecorder::Error errorCode);
void metaDataAvailableChanged(bool available);
void metaDataWritableChanged(bool writable);
void metaDataChanged();
void captureResolutionChanged(const QSize &);
void audioCodecChanged(const QString &codec);
void videoCodecChanged(const QString &codec);
void mediaContainerChanged(const QString &container);
private slots:
void updateRecorderState(QMediaRecorder::State);
void updateRecorderError(QMediaRecorder::Error);
private:
friend class QDeclarativeCamera;
QDeclarativeCameraRecorder(QCamera *camera, QObject *parent = 0);
void applySettings();
QMediaRecorder *m_recorder;
QAudioEncoderSettings m_audioSettings;
QVideoEncoderSettings m_videoSettings;
QString m_mediaContainer;
};
QT_END_NAMESPACE
QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraRecorder))
QT_END_HEADER
#endif