Split gstreamer plugin into smaller plugins providing fewer services
The gstreamer blob has been split into four plugins: audiodecoder, camerabin, mediacapture, and mediaplayer. Note: camerabin is still disabled because it is untested camerabin2 implementation. A new qmake configuration use_gstreamer_camera has been introduced and is needed for the mediacapture plugin to expose the camera service. This configuration has been disabled by default. Shared functionality has been moved to the internal gsttools library. Change-Id: Ifb2604f440cfa97513d39f5d7978766c88eaec45 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Jonas Rabbe
Qt by Nokia
3
src/plugins/gstreamer/mediacapture/mediacapture.json
Normal file
3
src/plugins/gstreamer/mediacapture/mediacapture.json
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"Keys": ["org.qt-project.qt.audiosource"]
|
||||
}
|
||||
@@ -1,6 +1,14 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
load(qt_module)
|
||||
|
||||
DEFINES += QMEDIA_GSTREAMER_CAPTURE
|
||||
TARGET = gstmediacapture
|
||||
PLUGIN_TYPE = mediaservice
|
||||
|
||||
load(qt_plugin)
|
||||
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
|
||||
|
||||
include(../common.pri)
|
||||
|
||||
INCLUDEPATH += $$PWD
|
||||
|
||||
HEADERS += $$PWD/qgstreamercaptureservice.h \
|
||||
$$PWD/qgstreamercapturesession.h \
|
||||
@@ -12,7 +20,8 @@ HEADERS += $$PWD/qgstreamercaptureservice.h \
|
||||
$$PWD/qgstreamerv4l2input.h \
|
||||
$$PWD/qgstreamercapturemetadatacontrol.h \
|
||||
$$PWD/qgstreamerimagecapturecontrol.h \
|
||||
$$PWD/qgstreamerimageencode.h
|
||||
$$PWD/qgstreamerimageencode.h \
|
||||
$$PWD/qgstreamercaptureserviceplugin.h
|
||||
|
||||
SOURCES += $$PWD/qgstreamercaptureservice.cpp \
|
||||
$$PWD/qgstreamercapturesession.cpp \
|
||||
@@ -24,4 +33,22 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
|
||||
$$PWD/qgstreamerv4l2input.cpp \
|
||||
$$PWD/qgstreamercapturemetadatacontrol.cpp \
|
||||
$$PWD/qgstreamerimagecapturecontrol.cpp \
|
||||
$$PWD/qgstreamerimageencode.cpp
|
||||
$$PWD/qgstreamerimageencode.cpp \
|
||||
$$PWD/qgstreamercaptureserviceplugin.cpp
|
||||
|
||||
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
|
||||
INSTALLS += target
|
||||
|
||||
# Camera usage with gstreamer needs to have
|
||||
#CONFIG += use_gstreamer_camera
|
||||
|
||||
use_gstreamer_camera {
|
||||
DEFINES += USE_GSTREAMER_CAMERA
|
||||
|
||||
OTHER_FILES += \
|
||||
mediacapturecamera.json
|
||||
} else {
|
||||
OTHER_FILES += \
|
||||
mediacapture.json
|
||||
}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"Keys": ["org.qt-project.qt.audiosource", "org.qt-project.qt.camera"]
|
||||
}
|
||||
@@ -51,16 +51,16 @@
|
||||
#include "qgstreamerv4l2input.h"
|
||||
#include "qgstreamercapturemetadatacontrol.h"
|
||||
|
||||
#include "qgstreameraudioinputendpointselector.h"
|
||||
#include "qgstreamervideoinputdevicecontrol.h"
|
||||
#include "qgstreamerimagecapturecontrol.h"
|
||||
#include "qgstreameraudioprobecontrol.h"
|
||||
#include <private/qgstreameraudioinputendpointselector_p.h>
|
||||
#include <private/qgstreamervideoinputdevicecontrol_p.h>
|
||||
#include <private/qgstreameraudioprobecontrol_p.h>
|
||||
|
||||
#include "qgstreamervideorenderer.h"
|
||||
#include <private/qgstreamervideorenderer_p.h>
|
||||
|
||||
#if defined(HAVE_WIDGETS)
|
||||
#include "qgstreamervideooverlay.h"
|
||||
#include "qgstreamervideowidget.h"
|
||||
#include <private/qgstreamervideooverlay_p.h>
|
||||
#include <private/qgstreamervideowidget_p.h>
|
||||
#endif
|
||||
|
||||
#include <qmediaserviceproviderplugin.h>
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <qmediacontrol.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QAudioEndpointSelector;
|
||||
class QVideoDeviceControl;
|
||||
@@ -74,7 +75,7 @@ public:
|
||||
void releaseControl(QMediaControl *);
|
||||
|
||||
private:
|
||||
void setAudioPreview(GstElement*);
|
||||
void setAudioPreview(GstElement *);
|
||||
|
||||
QGstreamerCaptureSession *m_captureSession;
|
||||
QGstreamerCameraControl *m_cameraControl;
|
||||
|
||||
@@ -0,0 +1,278 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** 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 <QtCore/qstring.h>
|
||||
#include <QtCore/qdebug.h>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
#include "qgstreamercaptureserviceplugin.h"
|
||||
|
||||
//#define QT_SUPPORTEDMIMETYPES_DEBUG
|
||||
|
||||
#include "qgstreamercaptureservice.h"
|
||||
#include <private/qgstutils_p.h>
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/poll.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/mman.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <gst/gst.h>
|
||||
|
||||
QMediaService* QGstreamerCaptureServicePlugin::create(const QString &key)
|
||||
{
|
||||
QGstUtils::initializeGst();
|
||||
|
||||
if (key == QLatin1String(Q_MEDIASERVICE_AUDIOSOURCE))
|
||||
return new QGstreamerCaptureService(key);
|
||||
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
if (key == QLatin1String(Q_MEDIASERVICE_CAMERA))
|
||||
return new QGstreamerCaptureService(key);
|
||||
#endif
|
||||
|
||||
qWarning() << "Gstreamer capture service plugin: unsupported key:" << key;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void QGstreamerCaptureServicePlugin::release(QMediaService *service)
|
||||
{
|
||||
delete service;
|
||||
}
|
||||
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
QMediaServiceProviderHint::Features QGstreamerCaptureServicePlugin::supportedFeatures(
|
||||
const QByteArray &service) const
|
||||
{
|
||||
if (service == Q_MEDIASERVICE_CAMERA)
|
||||
return QMediaServiceProviderHint::VideoSurface;
|
||||
|
||||
return QMediaServiceProviderHint::Features();
|
||||
}
|
||||
|
||||
QList<QByteArray> QGstreamerCaptureServicePlugin::devices(const QByteArray &service) const
|
||||
{
|
||||
if (service == Q_MEDIASERVICE_CAMERA) {
|
||||
if (m_cameraDevices.isEmpty())
|
||||
updateDevices();
|
||||
|
||||
return m_cameraDevices;
|
||||
}
|
||||
|
||||
return QList<QByteArray>();
|
||||
}
|
||||
|
||||
QString QGstreamerCaptureServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device)
|
||||
{
|
||||
if (service == Q_MEDIASERVICE_CAMERA) {
|
||||
if (m_cameraDevices.isEmpty())
|
||||
updateDevices();
|
||||
|
||||
for (int i=0; i<m_cameraDevices.count(); i++)
|
||||
if (m_cameraDevices[i] == device)
|
||||
return m_cameraDescriptions[i];
|
||||
}
|
||||
|
||||
return QString();
|
||||
}
|
||||
|
||||
QVariant QGstreamerCaptureServicePlugin::deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property)
|
||||
{
|
||||
Q_UNUSED(service);
|
||||
Q_UNUSED(device);
|
||||
Q_UNUSED(property);
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
void QGstreamerCaptureServicePlugin::updateDevices() const
|
||||
{
|
||||
m_cameraDevices.clear();
|
||||
m_cameraDescriptions.clear();
|
||||
|
||||
QDir devDir("/dev");
|
||||
devDir.setFilter(QDir::System);
|
||||
|
||||
QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
|
||||
|
||||
foreach( const QFileInfo &entryInfo, entries ) {
|
||||
//qDebug() << "Try" << entryInfo.filePath();
|
||||
|
||||
int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
|
||||
if (fd == -1)
|
||||
continue;
|
||||
|
||||
bool isCamera = false;
|
||||
|
||||
v4l2_input input;
|
||||
memset(&input, 0, sizeof(input));
|
||||
for (; ::ioctl(fd, VIDIOC_ENUMINPUT, &input) >= 0; ++input.index) {
|
||||
if(input.type == V4L2_INPUT_TYPE_CAMERA || input.type == 0) {
|
||||
isCamera = ::ioctl(fd, VIDIOC_S_INPUT, input.index) != 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (isCamera) {
|
||||
// find out its driver "name"
|
||||
QString name;
|
||||
struct v4l2_capability vcap;
|
||||
memset(&vcap, 0, sizeof(struct v4l2_capability));
|
||||
|
||||
if (ioctl(fd, VIDIOC_QUERYCAP, &vcap) != 0)
|
||||
name = entryInfo.fileName();
|
||||
else
|
||||
name = QString((const char*)vcap.card);
|
||||
//qDebug() << "found camera: " << name;
|
||||
|
||||
m_cameraDevices.append(entryInfo.filePath().toLocal8Bit());
|
||||
m_cameraDescriptions.append(name);
|
||||
}
|
||||
::close(fd);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
QtMultimedia::SupportEstimate QGstreamerCaptureServicePlugin::hasSupport(const QString &mimeType,
|
||||
const QStringList& codecs) const
|
||||
{
|
||||
if (m_supportedMimeTypeSet.isEmpty())
|
||||
updateSupportedMimeTypes();
|
||||
|
||||
return QGstUtils::hasSupport(mimeType, codecs, m_supportedMimeTypeSet);
|
||||
}
|
||||
|
||||
void QGstreamerCaptureServicePlugin::updateSupportedMimeTypes() const
|
||||
{
|
||||
//enumerate supported mime types
|
||||
gst_init(NULL, NULL);
|
||||
|
||||
GList *plugins, *orig_plugins;
|
||||
orig_plugins = plugins = gst_default_registry_get_plugin_list ();
|
||||
|
||||
while (plugins) {
|
||||
GList *features, *orig_features;
|
||||
|
||||
GstPlugin *plugin = (GstPlugin *) (plugins->data);
|
||||
plugins = g_list_next (plugins);
|
||||
|
||||
if (plugin->flags & (1<<1)) //GST_PLUGIN_FLAG_BLACKLISTED
|
||||
continue;
|
||||
|
||||
orig_features = features = gst_registry_get_feature_list_by_plugin(gst_registry_get_default (),
|
||||
plugin->desc.name);
|
||||
while (features) {
|
||||
if (!G_UNLIKELY(features->data == NULL)) {
|
||||
GstPluginFeature *feature = GST_PLUGIN_FEATURE(features->data);
|
||||
if (GST_IS_ELEMENT_FACTORY (feature)) {
|
||||
GstElementFactory *factory = GST_ELEMENT_FACTORY(gst_plugin_feature_load(feature));
|
||||
if (factory
|
||||
&& factory->numpadtemplates > 0
|
||||
&& (qstrcmp(factory->details.klass, "Codec/Decoder/Audio") == 0
|
||||
|| qstrcmp(factory->details.klass, "Codec/Decoder/Video") == 0
|
||||
|| qstrcmp(factory->details.klass, "Codec/Demux") == 0 )) {
|
||||
const GList *pads = factory->staticpadtemplates;
|
||||
while (pads) {
|
||||
GstStaticPadTemplate *padtemplate = (GstStaticPadTemplate*)(pads->data);
|
||||
pads = g_list_next (pads);
|
||||
if (padtemplate->direction != GST_PAD_SINK)
|
||||
continue;
|
||||
if (padtemplate->static_caps.string) {
|
||||
GstCaps *caps = gst_static_caps_get(&padtemplate->static_caps);
|
||||
if (!gst_caps_is_any (caps) && ! gst_caps_is_empty (caps)) {
|
||||
for (guint i = 0; i < gst_caps_get_size(caps); i++) {
|
||||
GstStructure *structure = gst_caps_get_structure(caps, i);
|
||||
QString nameLowcase = QString(gst_structure_get_name (structure)).toLower();
|
||||
|
||||
m_supportedMimeTypeSet.insert(nameLowcase);
|
||||
if (nameLowcase.contains("mpeg")) {
|
||||
//Because mpeg version number is only included in the detail
|
||||
//description, it is necessary to manually extract this information
|
||||
//in order to match the mime type of mpeg4.
|
||||
const GValue *value = gst_structure_get_value(structure, "mpegversion");
|
||||
if (value) {
|
||||
gchar *str = gst_value_serialize (value);
|
||||
QString versions(str);
|
||||
QStringList elements = versions.split(QRegExp("\\D+"), QString::SkipEmptyParts);
|
||||
foreach (const QString &e, elements)
|
||||
m_supportedMimeTypeSet.insert(nameLowcase + e);
|
||||
g_free (str);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
gst_object_unref (factory);
|
||||
}
|
||||
} else if (GST_IS_TYPE_FIND_FACTORY(feature)) {
|
||||
QString name(gst_plugin_feature_get_name(feature));
|
||||
if (name.contains('/')) //filter out any string without '/' which is obviously not a mime type
|
||||
m_supportedMimeTypeSet.insert(name.toLower());
|
||||
}
|
||||
}
|
||||
features = g_list_next (features);
|
||||
}
|
||||
gst_plugin_feature_list_free (orig_features);
|
||||
}
|
||||
gst_plugin_list_free (orig_plugins);
|
||||
|
||||
#if defined QT_SUPPORTEDMIMETYPES_DEBUG
|
||||
QStringList list = m_supportedMimeTypeSet.toList();
|
||||
list.sort();
|
||||
if (qgetenv("QT_DEBUG_PLUGINS").toInt() > 0) {
|
||||
foreach (const QString &type, list)
|
||||
qDebug() << type;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
QStringList QGstreamerCaptureServicePlugin::supportedMimeTypes() const
|
||||
{
|
||||
return QStringList();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** 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 QGSTREAMERCAPTURESERVICEPLUGIN_H
|
||||
#define QGSTREAMERCAPTURESERVICEPLUGIN_H
|
||||
|
||||
#include <qmediaserviceproviderplugin.h>
|
||||
#include <QtCore/qset.h>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QGstreamerCaptureServicePlugin
|
||||
: public QMediaServiceProviderPlugin
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
, public QMediaServiceSupportedDevicesInterface
|
||||
, public QMediaServiceFeaturesInterface
|
||||
#endif
|
||||
, public QMediaServiceSupportedFormatsInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
|
||||
Q_INTERFACES(QMediaServiceFeaturesInterface)
|
||||
#endif
|
||||
Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediacapturecamera.json")
|
||||
#else
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "mediacapture.json")
|
||||
#endif
|
||||
public:
|
||||
QMediaService* create(QString const& key);
|
||||
void release(QMediaService *service);
|
||||
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const;
|
||||
|
||||
QList<QByteArray> devices(const QByteArray &service) const;
|
||||
QString deviceDescription(const QByteArray &service, const QByteArray &device);
|
||||
QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property);
|
||||
#endif
|
||||
|
||||
QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
|
||||
QStringList supportedMimeTypes() const;
|
||||
|
||||
private:
|
||||
#if defined(USE_GSTREAMER_CAMERA)
|
||||
void updateDevices() const;
|
||||
|
||||
mutable QList<QByteArray> m_cameraDevices;
|
||||
mutable QStringList m_cameraDescriptions;
|
||||
#endif
|
||||
void updateSupportedMimeTypes() const;
|
||||
|
||||
mutable QSet<QString> m_supportedMimeTypeSet; //for fast access
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QGSTREAMERCAPTURESERVICEPLUGIN_H
|
||||
@@ -42,12 +42,12 @@
|
||||
#include "qgstreamercapturesession.h"
|
||||
#include "qgstreamerrecordercontrol.h"
|
||||
#include "qgstreamermediacontainercontrol.h"
|
||||
#include "qgstreamervideorendererinterface.h"
|
||||
#include "qgstreameraudioencode.h"
|
||||
#include "qgstreamervideoencode.h"
|
||||
#include "qgstreamerimageencode.h"
|
||||
#include "qgstreameraudioprobecontrol.h"
|
||||
#include <qmediarecorder.h>
|
||||
#include <private/qgstreamervideorendererinterface_p.h>
|
||||
#include <private/qgstreameraudioprobecontrol_p.h>
|
||||
#include <private/qgstreamerbushelper_p.h>
|
||||
|
||||
#include <gst/gsttagsetter.h>
|
||||
|
||||
Reference in New Issue
Block a user