Add some media probing API.

Change-Id: Ib83918f99b699ac3fbc7ede82a392d00d4c18005
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-27 15:02:31 +10:00
committed by Qt by Nokia
parent 6c51d2aadf
commit 8b1f11b370
11 changed files with 906 additions and 6 deletions

View File

@@ -31,7 +31,9 @@ PUBLIC_HEADERS += \
controls/qradiotunercontrol.h \
controls/qvideodevicecontrol.h \
controls/qvideoencodercontrol.h \
controls/qvideorenderercontrol.h
controls/qvideorenderercontrol.h \
controls/qmediaaudioprobecontrol.h \
controls/qmediavideoprobecontrol.h
SOURCES += \
controls/qaudioencodercontrol.cpp \
@@ -63,4 +65,6 @@ SOURCES += \
controls/qradiotunercontrol.cpp \
controls/qvideodevicecontrol.cpp \
controls/qvideoencodercontrol.cpp \
controls/qvideorenderercontrol.cpp
controls/qvideorenderercontrol.cpp \
controls/qmediaaudioprobecontrol.cpp \
controls/qmediavideoprobecontrol.cpp

View File

@@ -0,0 +1,97 @@
/****************************************************************************
**
** 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 "qmediaaudioprobecontrol.h"
#include "qmediacontrol_p.h"
QT_BEGIN_NAMESPACE
/*!
\class QMediaAudioProbeControl
\inmodule QtMultimedia
\ingroup multimedia
\ingroup multimedia_control
\brief The QMediaAudioProbeControl class allows control over probing audio data in media objects.
\l QAudioProbe is the client facing class for probing audio - this class is implemented by
media backends to provide this functionality.
The interface name of QMediaAudioProbeControl is \c com.nokia.Qt.QMediaAudioProbeControl/1.0 as
defined in QMediaAudioProbeControl_iid.
\sa QAudioProbe, QMediaService::requestControl(), QMediaPlayer, QCamera
*/
/*!
\macro QMediaAudioProbeControl_iid
\c com.nokia.Qt.QMediaAudioProbeControl/1.0
Defines the interface name of the QMediaAudioProbeControl class.
\relates QMediaAudioProbeControl
*/
/*!
Create a new media audio probe control object with the given \a parent.
*/
QMediaAudioProbeControl::QMediaAudioProbeControl(QObject *parent)
: QMediaControl(*new QMediaControlPrivate, parent)
{
}
/*! Destroys this audio probe control */
QMediaAudioProbeControl::~QMediaAudioProbeControl()
{
}
/*!
\fn QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer)
This signal should be emitted when an audio buffer is processed in the
media service.
*/
#include "moc_qmediaaudioprobecontrol.cpp"
QT_END_NAMESPACE

View File

@@ -0,0 +1,75 @@
/****************************************************************************
**
** 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$
**
****************************************************************************/
#ifndef QMEDIAAUDIOPROBECONTROL_H
#define QMEDIAAUDIOPROBECONTROL_H
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioBuffer;
class QMediaAudioProbeControl : public QMediaControl
{
Q_OBJECT
public:
virtual ~QMediaAudioProbeControl();
signals:
void audioBufferProbed(const QAudioBuffer &buffer);
protected:
explicit QMediaAudioProbeControl(QObject *parent = 0);
};
#define QMediaAudioProbeControl_iid "com.nokia.Qt.QMediaAudioProbeControl/1.0"
Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAAUDIOPROBECONTROL_H

View File

@@ -0,0 +1,97 @@
/****************************************************************************
**
** 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 "qmediavideoprobecontrol.h"
#include "qmediacontrol_p.h"
QT_BEGIN_NAMESPACE
/*!
\class QMediaVideoProbeControl
\inmodule QtMultimedia
\ingroup multimedia
\ingroup multimedia_control
\brief The QMediaVideoProbeControl class allows control over probing video frames in media objects.
\l QVideoProbe is the client facing class for probing video - this class is implemented by
media backends to provide this functionality.
The interface name of QMediaVideoProbeControl is \c com.nokia.Qt.QMediaVideoProbeControl/1.0 as
defined in QMediaVideoProbeControl_iid.
\sa QVideoProbe, QMediaService::requestControl(), QMediaPlayer, QCamera
*/
/*!
\macro QMediaVideoProbeControl_iid
\c com.nokia.Qt.QMediaVideoProbeControl/1.0
Defines the interface name of the QMediaVideoProbeControl class.
\relates QMediaVideoProbeControl
*/
/*!
Create a new media video probe control object with the given \a parent.
*/
QMediaVideoProbeControl::QMediaVideoProbeControl(QObject *parent)
: QMediaControl(*new QMediaControlPrivate, parent)
{
}
/*! Destroys this video probe control */
QMediaVideoProbeControl::~QMediaVideoProbeControl()
{
}
/*!
\fn QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame)
This signal should be emitted when a video frame is processed in the
media service.
*/
#include "moc_qmediavideoprobecontrol.cpp"
QT_END_NAMESPACE

View File

@@ -0,0 +1,77 @@
/****************************************************************************
**
** 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$
**
****************************************************************************/
#ifndef QMEDIAVIDEOPROBECONTROL_H
#define QMEDIAVIDEOPROBECONTROL_H
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QVideoFrame;
class QMediaVideoProbeControl : public QMediaControl
{
Q_OBJECT
public:
virtual ~QMediaVideoProbeControl();
signals:
void videoFrameProbed(const QVideoFrame &frame);
protected:
explicit QMediaVideoProbeControl(QObject *parent = 0);
};
#define QMediaVideoProbeControl_iid "com.nokia.Qt.QMediaVideoProbeControl/1.0"
Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAVIDEOPROBECONTROL_H