From 7d2040234d04568aa4658f4a39828c9305bc6571 Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 15 Jul 2019 15:22:39 +0200
Subject: Camera: Update the doc about supported viewfinder settings

Change-Id: I9d74355fb800234d4fbd12235b89965921027223
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/multimedia/camera/qcamera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/multimedia')

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index bd3f30739..a78f56575 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -644,7 +644,7 @@ void QCamera::setViewfinderSettings(const QCameraViewfinderSettings &settings)
     If \a settings is non null, the returned list is reduced to settings matching the given partial
     \a settings.
 
-    The camera must be loaded before calling this function, otherwise the returned list
+    The status of the camera must be LoadedStatus before calling this function, otherwise the returned list
     is empty.
 
     \sa setViewfinderSettings(), supportedViewfinderResolutions(), supportedViewfinderFrameRateRanges(),
-- 
cgit v1.2.3


From 411bd814849dace75ec755c46f668604eb6f4821 Mon Sep 17 00:00:00 2001
From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Thu, 11 Jul 2019 17:54:10 +0200
Subject: GStreamer: Implement fetching audio/video codecs by container

Moved stream types to QGstCodecsInfo and added possibility to fetch audio
or video codecs by a container. Or fetch containers by audio or video codec.

It would allow to debug supported codecs and containers:

QGstCodecsInfo containers(QGstCodecsInfo::Muxer);
QGstCodecsInfo audioCodecs(QGstCodecsInfo::AudioEncoder);
for (auto &container: containers.supportedCodecs())
    qDebug() << audioCodecs.supportedCodecs(containers.supportedStreamTypes(container));

Change-Id: I26bf5579db6974a166d408c4865a9ffe314e3e15
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/multimedia/gsttools_headers/qgstcodecsinfo_p.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/multimedia')

diff --git a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h b/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
index 33ab3de4b..d7aadef21 100644
--- a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
+++ b/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
@@ -54,6 +54,7 @@
 #include <private/qgsttools_global_p.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qstringlist.h>
+#include <QSet>
 
 #include <gst/gst.h>
 
@@ -76,6 +77,8 @@ public:
     QString codecDescription(const QString &codec) const;
     QByteArray codecElement(const QString &codec) const;
     QStringList codecOptions(const QString &codec) const;
+    QSet<QString> supportedStreamTypes(const QString &codec) const;
+    QStringList supportedCodecs(const QSet<QString> &types) const;
 
 private:
     void updateCodecs(ElementType elementType);
@@ -83,6 +86,7 @@ private:
 
     QStringList m_codecs;
     QMap<QString, CodecInfo> m_codecInfo;
+    QMap<QString, QSet<QString>> m_streamTypes;
 };
 
 Q_DECLARE_TYPEINFO(QGstCodecsInfo::CodecInfo, Q_MOVABLE_TYPE);
-- 
cgit v1.2.3