summaryrefslogtreecommitdiff
path: root/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-01-05 15:39:55 +0100
committerLars Knoll <lars.knoll@qt.io>2021-01-22 07:00:11 +0000
commit0acdf6a5b2dd0dc3d66c8e0480a5f8a23afe99a7 (patch)
tree1b1201f94b36343ba3aee698b8fea2bab4e2dce5 /src/gsttools/qgstreamervideoinputdevicecontrol.cpp
parentd9bfd52ff87d5fef11e1968432c36b1e8fa9c23a (diff)
downloadqtmultimedia-0acdf6a5b2dd0dc3d66c8e0480a5f8a23afe99a7.tar.gz
Implement proper hardware detection using gstreamer
Scrap all the code that was trying to figure out supported video devices using low level code. Instead do it properly using GstDeviceMonitor. Use the chance to remove some unneccesary arguments to the methods. Change-Id: I7a45035b5340314768a096458d68f78176e58811 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gsttools/qgstreamervideoinputdevicecontrol.cpp')
-rw-r--r--src/gsttools/qgstreamervideoinputdevicecontrol.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
index 54ae8fadc..088b97101 100644
--- a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
+++ b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
@@ -66,27 +66,27 @@ QGstreamerVideoInputDeviceControl::~QGstreamerVideoInputDeviceControl()
int QGstreamerVideoInputDeviceControl::deviceCount() const
{
- return QGstUtils::enumerateCameras(m_factory).count();
+ return QGstUtils::enumerateCameras().count();
}
QString QGstreamerVideoInputDeviceControl::deviceName(int index) const
{
- return QGstUtils::enumerateCameras(m_factory).value(index).name;
+ return QGstUtils::enumerateCameras().value(index).name;
}
QString QGstreamerVideoInputDeviceControl::deviceDescription(int index) const
{
- return QGstUtils::enumerateCameras(m_factory).value(index).description;
+ return QGstUtils::enumerateCameras().value(index).description;
}
QCamera::Position QGstreamerVideoInputDeviceControl::cameraPosition(int index) const
{
- return QGstUtils::enumerateCameras(m_factory).value(index).position;
+ return QGstUtils::enumerateCameras().value(index).position;
}
int QGstreamerVideoInputDeviceControl::cameraOrientation(int index) const
{
- return QGstUtils::enumerateCameras(m_factory).value(index).orientation;
+ return QGstUtils::enumerateCameras().value(index).orientation;
}
int QGstreamerVideoInputDeviceControl::defaultDevice() const