audioinputselector.h \
audiocaptureservice.h \
audiocaptureserviceplugin.h \
- audiocapturesession.h
+ audiocapturesession.h \
+ audiocaptureprobecontrol.h
SOURCES += audioencodercontrol.cpp \
audiocontainercontrol.cpp \
audioinputselector.cpp \
audiocaptureservice.cpp \
audiocaptureserviceplugin.cpp \
- audiocapturesession.cpp
+ audiocapturesession.cpp \
+ audiocaptureprobecontrol.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
--- /dev/null
+/****************************************************************************
+**
+** 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 "audiocaptureprobecontrol.h"
+
+AudioCaptureProbeControl::AudioCaptureProbeControl(QObject *parent):
+ QMediaAudioProbeControl(parent)
+{
+}
+
+AudioCaptureProbeControl::~AudioCaptureProbeControl()
+{
+}
+
+void AudioCaptureProbeControl::bufferProbed(const char *data, quint32 size, const QAudioFormat& format)
+{
+ if (!format.isValid())
+ return;
+
+ QAudioBuffer audioBuffer = QAudioBuffer(QByteArray::fromRawData(data, size), format);
+ QMetaObject::invokeMethod(this, "audioBufferProbed", Qt::QueuedConnection, Q_ARG(QAudioBuffer, audioBuffer));
+}
--- /dev/null
+/****************************************************************************
+**
+** 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 AUDIOCAPTUREPROBECONTROL_H
+#define AUDIOCAPTUREPROBECONTROL_H
+
+#include <qmediaaudioprobecontrol.h>
+#include <QtCore/qmutex.h>
+#include <qaudiobuffer.h>
+
+QT_USE_NAMESPACE
+
+class AudioCaptureProbeControl : public QMediaAudioProbeControl
+{
+ Q_OBJECT
+public:
+ explicit AudioCaptureProbeControl(QObject *parent);
+ virtual ~AudioCaptureProbeControl();
+
+ void bufferProbed(const char *data, quint32 size, const QAudioFormat& format);
+};
+
+#endif
#include "audioencodercontrol.h"
#include "audiocontainercontrol.h"
#include "audiomediarecordercontrol.h"
+#include "audiocaptureprobecontrol.h"
AudioCaptureService::AudioCaptureService(QObject *parent):
QMediaService(parent)
if (qstrcmp(name,QMediaContainerControl_iid) == 0)
return m_containerControl;
+ if (qstrcmp(name,QMediaAudioProbeControl_iid) == 0) {
+ AudioCaptureProbeControl *probe = new AudioCaptureProbeControl(this);
+ m_session->addProbe(probe);
+ return probe;
+ }
+
return 0;
}
#include "qmediarecorder.h"
#include "audiocapturesession.h"
+#include "audiocaptureprobecontrol.h"
+
+void FileProbeProxy::startProbes(const QAudioFormat &format)
+{
+ m_format = format;
+}
+
+void FileProbeProxy::stopProbes()
+{
+ m_format = QAudioFormat();
+}
+
+void FileProbeProxy::addProbe(AudioCaptureProbeControl *probe)
+{
+ QMutexLocker locker(&m_probeMutex);
+
+ if (m_probes.contains(probe))
+ return;
+
+ m_probes.append(probe);
+}
+
+void FileProbeProxy::removeProbe(AudioCaptureProbeControl *probe)
+{
+ QMutexLocker locker(&m_probeMutex);
+ m_probes.removeOne(probe);
+}
+
+qint64 FileProbeProxy::writeData(const char *data, qint64 len)
+{
+ if (m_format.isValid()) {
+ QMutexLocker locker(&m_probeMutex);
+
+ foreach (AudioCaptureProbeControl* probe, m_probes)
+ probe->bufferProbed(data, len, m_format);
+ }
+
+ return QFile::writeData(data, len);
+}
AudioCaptureSession::AudioCaptureSession(QObject *parent):
QObject(parent)
if (wavFile)
file.write((char*)&header,sizeof(CombinedHeader));
+ file.startProbes(m_format);
m_audioInput->start(qobject_cast<QIODevice*>(&file));
} else {
emit error(1,QString("can't open source, failed"));
{
if(m_audioInput) {
m_audioInput->stop();
+ file.stopProbes();
file.close();
if (wavFile) {
qint32 fileSize = file.size()-8;
m_state = QMediaRecorder::StoppedState;
}
+void AudioCaptureSession::addProbe(AudioCaptureProbeControl *probe)
+{
+ file.addProbe(probe);
+}
+
+void AudioCaptureSession::removeProbe(AudioCaptureProbeControl *probe)
+{
+ file.removeProbe(probe);
+}
+
void AudioCaptureSession::stateChanged(QAudio::State state)
{
switch(state) {
#include <QFile>
#include <QUrl>
#include <QDir>
+#include <QMutex>
#include "audioencodercontrol.h"
#include "audioinputselector.h"
QT_USE_NAMESPACE
+class AudioCaptureProbeControl;
+
+class FileProbeProxy: public QFile {
+public:
+ void startProbes(const QAudioFormat& format);
+ void stopProbes();
+ void addProbe(AudioCaptureProbeControl *probe);
+ void removeProbe(AudioCaptureProbeControl *probe);
+
+protected:
+ virtual qint64 writeData(const char *data, qint64 len);
+
+private:
+ QAudioFormat m_format;
+ QList<AudioCaptureProbeControl*> m_probes;
+ QMutex m_probeMutex;
+};
+
+
class AudioCaptureSession : public QObject
{
Q_OBJECT
void record();
void pause();
void stop();
+ void addProbe(AudioCaptureProbeControl *probe);
+ void removeProbe(AudioCaptureProbeControl *probe);
public slots:
void setCaptureDevice(const QString &deviceName);
QDir defaultDir() const;
QString generateFileName(const QDir &dir, const QString &ext) const;
- QFile file;
+ FileProbeProxy file;
QString m_captureDevice;
QUrl m_sink;
QUrl m_actualSink;
projects / platform / upstream / qtmultimedia.git / commitdiff