diff options
Diffstat (limited to 'src/multimedia/platform/darwin/camera/avfcameracontrol.mm')
-rw-r--r-- | src/multimedia/platform/darwin/camera/avfcameracontrol.mm | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/src/multimedia/platform/darwin/camera/avfcameracontrol.mm b/src/multimedia/platform/darwin/camera/avfcameracontrol.mm index b4cc9116a..7059588da 100644 --- a/src/multimedia/platform/darwin/camera/avfcameracontrol.mm +++ b/src/multimedia/platform/darwin/camera/avfcameracontrol.mm @@ -55,11 +55,9 @@ AVFCameraControl::AVFCameraControl(AVFCameraService *service, QObject *parent) , m_service(service) , m_state(QCamera::UnloadedState) , m_lastStatus(QCamera::UnloadedStatus) - , m_captureMode(QCamera::CaptureStillImage) { Q_UNUSED(service); connect(m_session, SIGNAL(stateChanged(QCamera::State)), SLOT(updateStatus())); - connect(this, &AVFCameraControl::captureModeChanged, m_session, &AVFCameraSession::onCaptureModeChanged); } AVFCameraControl::~AVFCameraControl() @@ -109,30 +107,6 @@ void AVFCameraControl::updateStatus() } } -QCamera::CaptureModes AVFCameraControl::captureMode() const -{ - return m_captureMode; -} - -void AVFCameraControl::setCaptureMode(QCamera::CaptureModes mode) -{ - if (m_captureMode == mode) - return; - - m_captureMode = mode; - Q_EMIT captureModeChanged(mode); -} - -bool AVFCameraControl::isCaptureModeSupported(QCamera::CaptureModes /*mode*/) const -{ - return true; -} - -void AVFCameraControl::setVideoSurface(QAbstractVideoSurface *surface) -{ - m_session->setVideoSurface(surface); -} - bool AVFCameraControl::canChangeProperty(QCameraControl::PropertyChangeType changeType, QCamera::Status status) const { Q_UNUSED(changeType); @@ -209,6 +183,11 @@ bool AVFCameraControl::CVPixelFormatFromQtFormat(QVideoFrame::PixelFormat qtForm return true; } +void AVFCameraControl::setVideoSurface(QAbstractVideoSurface *surface) +{ + m_session->setVideoSurface(surface); +} + AVCaptureConnection *AVFCameraControl::videoConnection() const { if (!m_session->videoOutput() || !m_session->videoOutput()->videoDataOutput()) |