diff options
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qavfcamera_p.h')
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/qavfcamera_p.h | 53 |
1 files changed, 10 insertions, 43 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qavfcamera_p.h b/src/plugins/multimedia/ffmpeg/qavfcamera_p.h index 1c0341496..0c88c520c 100644 --- a/src/plugins/multimedia/ffmpeg/qavfcamera_p.h +++ b/src/plugins/multimedia/ffmpeg/qavfcamera_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2022 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) 2022 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 QAVFCAMERA_H #define QAVFCAMERA_H @@ -94,15 +58,18 @@ public: void deviceOrientationChanged(int angle = -1); - const void *ffmpegHWAccel() const override { return &hwAccel; } + std::optional<int> ffmpegHWPixelFormat() const override; + + int cameraPixelFormatScore(QVideoFrameFormat::PixelFormat pixelFmt, + QVideoFrameFormat::ColorRange colorRange) const override; private: - void requestCameraPermissionIfNeeded(); - void cameraAuthorizationChanged(bool authorized); + bool checkCameraPermission(); void updateCameraFormat(); void updateVideoInput(); void attachVideoInputDevice(); - uint setPixelFormat(const QVideoFrameFormat::PixelFormat pixelFormat); + uint32_t setPixelFormat(QVideoFrameFormat::PixelFormat pixelFormat, uint32_t inputCvPixFormat); + QSize adjustedResolution() const; AVCaptureDevice *device() const; @@ -113,7 +80,7 @@ private: QAVFSampleBufferDelegate *m_sampleBufferDelegate = nullptr; dispatch_queue_t m_delegateQueue; QVideoOutputOrientationHandler m_orientationHandler; - QFFmpeg::HWAccel hwAccel; + AVPixelFormat m_hwPixelFormat = AV_PIX_FMT_NONE; }; QT_END_NAMESPACE |