summaryrefslogtreecommitdiffstats
path: root/src/multimedia/platform/gstreamer
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/platform/gstreamer')
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp2
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp (renamed from src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp)50
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture_p.h (renamed from src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h)8
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp9
-rw-r--r--src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h8
-rw-r--r--src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp20
-rw-r--r--src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h2
-rw-r--r--src/multimedia/platform/gstreamer/qgstreamerintegration.cpp6
-rw-r--r--src/multimedia/platform/gstreamer/qgstreamerintegration_p.h2
9 files changed, 53 insertions, 54 deletions
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
index 40328bf72..99a44b70e 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
@@ -40,7 +40,7 @@
#include <qcameradevice.h>
#include "qgstreamercamera_p.h"
-#include "qgstreamercameraimagecapture_p.h"
+#include "qgstreamerimagecapture_p.h"
#include <private/qgstreamermediadevices_p.h>
#include <private/qgstreamerintegration_p.h>
#include <qmediacapturesession.h>
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
index e19a9c28e..f0f2f16e9 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
@@ -37,7 +37,7 @@
**
****************************************************************************/
-#include "qgstreamercameraimagecapture_p.h"
+#include "qgstreamerimagecapture_p.h"
#include "qplatformcamera_p.h"
#include <private/qgstvideobuffer_p.h>
#include <private/qgstutils_p.h>
@@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcImageCapture, "qt.multimedia.imageCapture")
-QGstreamerCameraImageCapture::QGstreamerCameraImageCapture(QCameraImageCapture *parent)
- : QPlatformCameraImageCapture(parent),
+QGstreamerImageCapture::QGstreamerImageCapture(QImageCapture *parent)
+ : QPlatformImageCapture(parent),
QGstreamerBufferProbe(ProbeBuffers)
{
bin = QGstBin("imageCaptureBin");
@@ -80,16 +80,16 @@ QGstreamerCameraImageCapture::QGstreamerCameraImageCapture(QCameraImageCapture *
addProbeToPad(queue.staticPad("src").pad(), false);
sink.set("signal-handoffs", true);
- g_signal_connect(sink.object(), "handoff", G_CALLBACK(&QGstreamerCameraImageCapture::saveImageFilter), this);
+ g_signal_connect(sink.object(), "handoff", G_CALLBACK(&QGstreamerImageCapture::saveImageFilter), this);
}
-QGstreamerCameraImageCapture::~QGstreamerCameraImageCapture()
+QGstreamerImageCapture::~QGstreamerImageCapture()
{
if (m_session)
m_session->releaseVideoPad(videoSrcPad);
}
-bool QGstreamerCameraImageCapture::isReadyForCapture() const
+bool QGstreamerImageCapture::isReadyForCapture() const
{
return m_session && !passImage && cameraActive;
}
@@ -134,7 +134,7 @@ QString generateFileName(const QDir &dir, const QString &ext)
}
-int QGstreamerCameraImageCapture::capture(const QString &fileName)
+int QGstreamerImageCapture::capture(const QString &fileName)
{
QString path = fileName;
if (path.isEmpty())
@@ -143,12 +143,12 @@ int QGstreamerCameraImageCapture::capture(const QString &fileName)
return doCapture(path);
}
-int QGstreamerCameraImageCapture::captureToBuffer()
+int QGstreamerImageCapture::captureToBuffer()
{
return doCapture(QString());
}
-int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
+int QGstreamerImageCapture::doCapture(const QString &fileName)
{
qCDebug(qLcImageCapture) << "do capture";
if (!m_session) {
@@ -156,7 +156,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
//so application can associate it with returned request id.
QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
Q_ARG(int, -1),
- Q_ARG(int, QCameraImageCapture::ResourceError),
+ Q_ARG(int, QImageCapture::ResourceError),
Q_ARG(QString,tr("Image capture not set to a session.")));
qCDebug(qLcImageCapture) << "error 1";
@@ -167,7 +167,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
//so application can associate it with returned request id.
QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
Q_ARG(int, -1),
- Q_ARG(int, QCameraImageCapture::ResourceError),
+ Q_ARG(int, QImageCapture::ResourceError),
Q_ARG(QString,tr("No camera available.")));
qCDebug(qLcImageCapture) << "error 2";
@@ -178,7 +178,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
//so application can associate it with returned request id.
QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
Q_ARG(int, -1),
- Q_ARG(int, QCameraImageCapture::NotReadyError),
+ Q_ARG(int, QImageCapture::NotReadyError),
Q_ARG(QString,tr("Camera is not ready.")));
qCDebug(qLcImageCapture) << "error 3";
@@ -198,7 +198,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
return m_lastId;
}
-bool QGstreamerCameraImageCapture::probeBuffer(GstBuffer *buffer)
+bool QGstreamerImageCapture::probeBuffer(GstBuffer *buffer)
{
if (!passImage)
return false;
@@ -244,7 +244,7 @@ bool QGstreamerCameraImageCapture::probeBuffer(GstBuffer *buffer)
return true;
}
-void QGstreamerCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
+void QGstreamerImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
{
QGstreamerMediaCapture *captureSession = static_cast<QGstreamerMediaCapture *>(session);
if (m_session == captureSession)
@@ -268,11 +268,11 @@ void QGstreamerCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSessio
gstPipeline = captureSession->pipeline();
gstPipeline.add(bin);
bin.setStateSync(GST_STATE_READY);
- connect(m_session, &QPlatformMediaCaptureSession::cameraChanged, this, &QGstreamerCameraImageCapture::onCameraChanged);
+ connect(m_session, &QPlatformMediaCaptureSession::cameraChanged, this, &QGstreamerImageCapture::onCameraChanged);
onCameraChanged();
}
-void QGstreamerCameraImageCapture::cameraActiveChanged(bool active)
+void QGstreamerImageCapture::cameraActiveChanged(bool active)
{
qCDebug(qLcImageCapture) << "cameraActiveChanged" << cameraActive << active;
if (cameraActive == active)
@@ -282,23 +282,23 @@ void QGstreamerCameraImageCapture::cameraActiveChanged(bool active)
emit readyForCaptureChanged(isReadyForCapture());
}
-void QGstreamerCameraImageCapture::onCameraChanged()
+void QGstreamerImageCapture::onCameraChanged()
{
if (m_session->camera()) {
cameraActiveChanged(m_session->camera()->isActive());
- connect(m_session->camera(), &QPlatformCamera::activeChanged, this, &QGstreamerCameraImageCapture::cameraActiveChanged);
+ connect(m_session->camera(), &QPlatformCamera::activeChanged, this, &QGstreamerImageCapture::cameraActiveChanged);
}
}
-gboolean QGstreamerCameraImageCapture::saveImageFilter(GstElement *element,
+gboolean QGstreamerImageCapture::saveImageFilter(GstElement *element,
GstBuffer *buffer,
GstPad *pad,
void *appdata)
{
Q_UNUSED(element);
Q_UNUSED(pad);
- QGstreamerCameraImageCapture *capture = static_cast<QGstreamerCameraImageCapture *>(appdata);
+ QGstreamerImageCapture *capture = static_cast<QGstreamerImageCapture *>(appdata);
if (capture->pendingImages.isEmpty()) {
capture->unlink();
@@ -322,7 +322,7 @@ gboolean QGstreamerCameraImageCapture::saveImageFilter(GstElement *element,
}
f.close();
- static QMetaMethod savedSignal = QMetaMethod::fromSignal(&QGstreamerCameraImageCapture::imageSaved);
+ static QMetaMethod savedSignal = QMetaMethod::fromSignal(&QGstreamerImageCapture::imageSaved);
savedSignal.invoke(capture,
Qt::QueuedConnection,
Q_ARG(int, imageData.id),
@@ -334,7 +334,7 @@ gboolean QGstreamerCameraImageCapture::saveImageFilter(GstElement *element,
return TRUE;
}
-void QGstreamerCameraImageCapture::unlink()
+void QGstreamerImageCapture::unlink()
{
return;
if (passImage)
@@ -350,7 +350,7 @@ void QGstreamerCameraImageCapture::unlink()
gstPipeline.setStateSync(GST_STATE_PLAYING);
}
-void QGstreamerCameraImageCapture::link()
+void QGstreamerImageCapture::link()
{
if (!(m_session && m_session->camera()))
return;
@@ -364,12 +364,12 @@ void QGstreamerCameraImageCapture::link()
gstPipeline.setStateSync(GST_STATE_PLAYING);
}
-QImageEncoderSettings QGstreamerCameraImageCapture::imageSettings() const
+QImageEncoderSettings QGstreamerImageCapture::imageSettings() const
{
return m_settings;
}
-void QGstreamerCameraImageCapture::setImageSettings(const QImageEncoderSettings &settings)
+void QGstreamerImageCapture::setImageSettings(const QImageEncoderSettings &settings)
{
if (m_settings != settings) {
m_settings = settings;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture_p.h
index 38b0d33b4..50d1d9a7b 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture_p.h
@@ -52,7 +52,7 @@
// We mean it.
//
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
#include "qgstreamermediacapture_p.h"
#include "private/qgstreamerbufferprobe_p.h"
@@ -63,13 +63,13 @@
QT_BEGIN_NAMESPACE
-class QGstreamerCameraImageCapture : public QPlatformCameraImageCapture, private QGstreamerBufferProbe
+class QGstreamerImageCapture : public QPlatformImageCapture, private QGstreamerBufferProbe
{
Q_OBJECT
public:
- QGstreamerCameraImageCapture(QCameraImageCapture *parent/*, const QGstPipeline &pipeline*/);
- virtual ~QGstreamerCameraImageCapture();
+ QGstreamerImageCapture(QImageCapture *parent/*, const QGstPipeline &pipeline*/);
+ virtual ~QGstreamerImageCapture();
bool isReadyForCapture() const override;
int capture(const QString &fileName) override;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
index d6ee3fdb4..237b2a505 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
@@ -39,11 +39,10 @@
#include "qgstreamermediacapture_p.h"
#include "qgstreamermediaencoder_p.h"
-#include "qgstreamercameraimagecapture_p.h"
+#include "qgstreamerimagecapture_p.h"
#include "qgstreamercamera_p.h"
#include <private/qgstpipeline_p.h>
-#include "qgstreamercameraimagecapture_p.h"
#include "private/qgstreameraudioinput_p.h"
#include "private/qgstreameraudiooutput_p.h"
#include "private/qgstreamervideooutput_p.h"
@@ -118,14 +117,14 @@ void QGstreamerMediaCapture::setCamera(QPlatformCamera *camera)
gstPipeline.dumpGraph("camera");
}
-QPlatformCameraImageCapture *QGstreamerMediaCapture::imageCapture()
+QPlatformImageCapture *QGstreamerMediaCapture::imageCapture()
{
return m_imageCapture;
}
-void QGstreamerMediaCapture::setImageCapture(QPlatformCameraImageCapture *imageCapture)
+void QGstreamerMediaCapture::setImageCapture(QPlatformImageCapture *imageCapture)
{
- QGstreamerCameraImageCapture *control = static_cast<QGstreamerCameraImageCapture *>(imageCapture);
+ QGstreamerImageCapture *control = static_cast<QGstreamerImageCapture *>(imageCapture);
if (m_imageCapture == control)
return;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
index bf10054d1..db42c1ee8 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
@@ -60,7 +60,7 @@
QT_BEGIN_NAMESPACE
class QGstreamerCamera;
-class QGstreamerCameraImageCapture;
+class QGstreamerImageCapture;
class QGstreamerMediaEncoder;
class QGstreamerAudioInput;
class QGstreamerAudioOutput;
@@ -77,8 +77,8 @@ public:
QPlatformCamera *camera() override;
void setCamera(QPlatformCamera *camera) override;
- QPlatformCameraImageCapture *imageCapture() override;
- void setImageCapture(QPlatformCameraImageCapture *imageCapture) override;
+ QPlatformImageCapture *imageCapture() override;
+ void setImageCapture(QPlatformImageCapture *imageCapture) override;
QPlatformMediaEncoder *mediaEncoder() override;
void setMediaEncoder(QPlatformMediaEncoder *encoder) override;
@@ -113,7 +113,7 @@ private:
QGstreamerVideoOutput *gstVideoOutput = nullptr;
QGstreamerMediaEncoder *m_mediaEncoder = nullptr;
- QGstreamerCameraImageCapture *m_imageCapture = nullptr;
+ QGstreamerImageCapture *m_imageCapture = nullptr;
};
QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp b/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp
index f89cf36c7..0f91e774d 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp
@@ -140,22 +140,22 @@ QMediaFormat::FileFormat QGstreamerFormatInfo::fileFormatForCaps(QGstStructure s
}
-QCameraImageCapture::FileFormat QGstreamerFormatInfo::imageFormatForCaps(QGstStructure structure)
+QImageCapture::FileFormat QGstreamerFormatInfo::imageFormatForCaps(QGstStructure structure)
{
const char *name = structure.name().data();
if (!strcmp(name, "image/jpeg")) {
- return QCameraImageCapture::JPEG;
+ return QImageCapture::JPEG;
} else if (!strcmp(name, "image/png")) {
- return QCameraImageCapture::PNG;
+ return QImageCapture::PNG;
} else if (!strcmp(name, "image/webp")) {
- return QCameraImageCapture::WebP;
+ return QImageCapture::WebP;
} else if (!strcmp(name, "image/webp")) {
- return QCameraImageCapture::WebP;
+ return QImageCapture::WebP;
} else if (!strcmp(name, "image/tiff")) {
- return QCameraImageCapture::Tiff;
+ return QImageCapture::Tiff;
}
- return QCameraImageCapture::UnspecifiedFormat;
+ return QImageCapture::UnspecifiedFormat;
}
static QPair<QList<QMediaFormat::AudioCodec>, QList<QMediaFormat::VideoCodec>> getCodecsList(bool decode)
@@ -266,9 +266,9 @@ QList<QGstreamerFormatInfo::CodecMap> QGstreamerFormatInfo::getMuxerList(bool de
return muxers;
}
-static QList<QCameraImageCapture::FileFormat> getImageFormatList()
+static QList<QImageCapture::FileFormat> getImageFormatList()
{
- QSet<QCameraImageCapture::FileFormat> formats;
+ QSet<QImageCapture::FileFormat> formats;
GList *elementList = gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_ENCODER,
GST_RANK_MARGINAL);
@@ -289,7 +289,7 @@ static QList<QCameraImageCapture::FileFormat> getImageFormatList()
for (int i = 0; i < caps.size(); i++) {
QGstStructure structure = caps.at(i);
auto f = QGstreamerFormatInfo::imageFormatForCaps(structure);
- if (f != QCameraImageCapture::UnspecifiedFormat) {
+ if (f != QImageCapture::UnspecifiedFormat) {
// qDebug() << structure.toString() << f;
formats.insert(f);
}
diff --git a/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h b/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h
index 47d0f133a..f8de964e4 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h
@@ -71,7 +71,7 @@ public:
static QMediaFormat::AudioCodec audioCodecForCaps(QGstStructure structure);
static QMediaFormat::VideoCodec videoCodecForCaps(QGstStructure structure);
static QMediaFormat::FileFormat fileFormatForCaps(QGstStructure structure);
- static QCameraImageCapture::FileFormat imageFormatForCaps(QGstStructure structure);
+ static QImageCapture::FileFormat imageFormatForCaps(QGstStructure structure);
QList<CodecMap> getMuxerList(bool demuxer, QList<QMediaFormat::AudioCodec> audioCodecs, QList<QMediaFormat::VideoCodec> videoCodecs);
};
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
index 06a0f6af8..732f0ed9f 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
@@ -44,7 +44,7 @@
#include "private/qgstreameraudiodecoder_p.h"
#include "private/qgstreamercamera_p.h"
#include "private/qgstreamermediaencoder_p.h"
-#include "private/qgstreamercameraimagecapture_p.h"
+#include "private/qgstreamerimagecapture_p.h"
#include "private/qgstreamerformatinfo_p.h"
#include "private/qgstreamervideorenderer_p.h"
#include "private/qgstreamervideosink_p.h"
@@ -101,9 +101,9 @@ QPlatformMediaEncoder *QGstreamerIntegration::createEncoder(QMediaRecorder *enco
return new QGstreamerMediaEncoder(encoder);
}
-QPlatformCameraImageCapture *QGstreamerIntegration::createImageCapture(QCameraImageCapture *imageCapture)
+QPlatformImageCapture *QGstreamerIntegration::createImageCapture(QImageCapture *imageCapture)
{
- return new QGstreamerCameraImageCapture(imageCapture);
+ return new QGstreamerImageCapture(imageCapture);
}
QPlatformVideoSink *QGstreamerIntegration::createVideoSink(QVideoSink *sink)
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
index 0bd21ead4..14167e750 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
@@ -74,7 +74,7 @@ public:
QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override;
QPlatformCamera *createCamera(QCamera *) override;
QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override;
- QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override;
+ QPlatformImageCapture *createImageCapture(QImageCapture *) override;
QPlatformVideoSink *createVideoSink(QVideoSink *sink) override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 07:26:43 +0000