diff options
Diffstat (limited to 'src/multimedia/platform/qplatformcamera_p.h')
| -rw-r--r-- | src/multimedia/platform/qplatformcamera_p.h | 76 |
1 files changed, 22 insertions, 54 deletions
diff --git a/src/multimedia/platform/qplatformcamera_p.h b/src/multimedia/platform/qplatformcamera_p.h index da910ce9e..341bf9121 100644 --- a/src/multimedia/platform/qplatformcamera_p.h +++ b/src/multimedia/platform/qplatformcamera_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QPLATFORMCAMERA_H #define QPLATFORMCAMERA_H @@ -51,28 +15,21 @@ // We mean it. // -#include <QtCore/qobject.h> -#include <QtMultimedia/qtmultimediaglobal.h> - +#include "qplatformvideosource_p.h" +#include "private/qerrorinfo_p.h" #include <QtMultimedia/qcamera.h> -#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE -class Q_MULTIMEDIA_EXPORT QPlatformCamera : public QObject +class Q_MULTIMEDIA_EXPORT QPlatformCamera : public QPlatformVideoSource { Q_OBJECT public: - virtual bool isActive() const = 0; - virtual void setActive(bool active) = 0; - virtual void setCamera(const QCameraDevice &camera) = 0; virtual bool setCameraFormat(const QCameraFormat &/*format*/) { return false; } QCameraFormat cameraFormat() const { return m_cameraFormat; } - virtual void setCaptureSession(QPlatformMediaCaptureSession *) {} - virtual bool isFocusModeSupported(QCamera::FocusMode mode) const { return mode == QCamera::FocusModeAuto; } virtual void setFocusMode(QCamera::FocusMode /*mode*/) {} @@ -102,6 +59,8 @@ public: virtual void setWhiteBalanceMode(QCamera::WhiteBalanceMode /*mode*/) {} virtual void setColorTemperature(int /*temperature*/) {} + QVideoFrameFormat frameFormat() const override; + QCamera::Features supportedFeatures() const { return m_supportedFeatures; } QCamera::FocusMode focusMode() const { return m_focusMode; } @@ -151,19 +110,27 @@ public: static int colorTemperatureForWhiteBalance(QCamera::WhiteBalanceMode mode); - // Can't use FFmpeg specific struct here, use void * for now. - virtual const void *ffmpegHWAccel() const { return nullptr; } + QCamera::Error error() const { return m_error.code(); } + QString errorString() const final { return m_error.description(); } + + void updateError(QCamera::Error error, const QString &errorString); Q_SIGNALS: - void activeChanged(bool); - void error(int error, const QString &errorString); - void newVideoFrame(const QVideoFrame &); // only used by FFmpeg + void errorOccurred(QCamera::Error error, const QString &errorString); protected: explicit QPlatformCamera(QCamera *parent); - static QCameraFormat findBestCameraFormat(const QCameraDevice &camera); + virtual int cameraPixelFormatScore(QVideoFrameFormat::PixelFormat /*format*/, + QVideoFrameFormat::ColorRange /*colorRange*/) const + { + return 0; + } + + QCameraFormat findBestCameraFormat(const QCameraDevice &camera) const; QCameraFormat m_cameraFormat; + QVideoFrameFormat::PixelFormat m_framePixelFormat = QVideoFrameFormat::Format_Invalid; + private: QCamera *m_camera = nullptr; QCamera::Features m_supportedFeatures = {}; @@ -188,6 +155,7 @@ private: float m_maxExposureTime = -1.; QCamera::WhiteBalanceMode m_whiteBalance = QCamera::WhiteBalanceAuto; int m_colorTemperature = 0; + QErrorInfo<QCamera::Error> m_error; }; QT_END_NAMESPACE |