diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-01-22 16:18:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 14:10:00 +0100 |
| commit | b28ee24628f77fced393cacc45500be6761e4497 (patch) | |
| tree | 811173f8a2caf84e0fa386010283ccfd32c6ad0d /src/plugins/directshow/dsserviceplugin.cpp | |
| parent | d964388b38ec4762e315d86aacb779604bcdca1b (diff) | |
New QCameraInfo class.
The class allows to get the list of available cameras on the system as
well as getting some static information about them such as their unique
ID, display name, physical position and sensor orientation.
This makes QCamera::availableDevices() and QCamera::deviceDescription()
obsolete.
This patch contains the API, documentation and auto-tests but not the
actual implementation by each backend (except for retrieving the default
camera device).
[ChangeLog][QtMultimedia] Added new QCameraInfo class
[ChangeLog][QtMultimedia] QCamera: availableDevices() and
deviceDescription() are deprecated, use QCameraInfo instead
Change-Id: I64fd65729ab26a789468979ed5444ee90bb82cd0
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/plugins/directshow/dsserviceplugin.cpp')
| -rw-r--r-- | src/plugins/directshow/dsserviceplugin.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index dca7430af..d262febdd 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -107,6 +107,20 @@ QMediaServiceProviderHint::Features DSServicePlugin::supportedFeatures( return QMediaServiceProviderHint::Features(); } +QByteArray DSServicePlugin::defaultDevice(const QByteArray &service) const +{ +#ifdef QMEDIA_DIRECTSHOW_CAMERA + if (service == Q_MEDIASERVICE_CAMERA) { + if (m_cameraDevices.isEmpty()) + updateDevices(); + + return m_defaultCameraDevice; + } +#endif + + return QByteArray(); +} + QList<QByteArray> DSServicePlugin::devices(const QByteArray &service) const { #ifdef QMEDIA_DIRECTSHOW_CAMERA @@ -140,10 +154,13 @@ QString DSServicePlugin::deviceDescription(const QByteArray &service, const QByt void DSServicePlugin::updateDevices() const { + m_defaultCameraDevice.clear(); DSVideoDeviceControl::enumerateDevices(&m_cameraDevices, &m_cameraDescriptions); if (m_cameraDevices.isEmpty()) { qWarning() << "No camera devices found"; + } else { + m_defaultCameraDevice = m_cameraDevices.first(); } } #endif |