From 4e771cc2b50f35f25af710ae4ab8bbf850f60deb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 8 Feb 2021 09:00:06 +0100 Subject: Get rid of QCameraImageCapture::DriveMode Nothing but single image capture was ever implemented, so the whole API was unused. Change-Id: I429040d3e2d74bddd6b76649ca6680acc9db126e Reviewed-by: Lars Knoll Reviewed-by: Doris Verria --- src/imports/multimedia/qmldir | 1 + src/multimedia/camera/qcameraimagecapture.cpp | 6 ---- src/multimedia/camera/qcameraimagecapture.h | 5 --- .../controls/qcameraimagecapturecontrol.cpp | 13 ------- .../controls/qcameraimagecapturecontrol.h | 3 -- .../qandroidcameraimagecapturecontrol.cpp | 10 ------ .../qandroidcameraimagecapturecontrol_p.h | 3 -- .../android/mediacapture/qandroidcamerasession.cpp | 33 +++++------------ .../android/mediacapture/qandroidcamerasession_p.h | 3 -- .../darwin/camera/avfimagecapturecontrol_p.h | 2 -- .../gstreamer/camerabin/camerabinimagecapture_p.h | 3 -- .../mediacapture/qgstreamerimagecapturecontrol_p.h | 3 -- .../qnx/camera/bbcameraimagecapturecontrol.cpp | 10 ------ .../qnx/camera/bbcameraimagecapturecontrol_p.h | 3 -- .../platform/qnx/camera/bbcamerasession.cpp | 41 +++++++--------------- .../platform/qnx/camera/bbcamerasession_p.h | 3 -- .../mockbackend/mockcameraimagecapturecontrol.h | 3 -- 17 files changed, 22 insertions(+), 123 deletions(-) diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir index d68049f63..e7dcc3dd6 100644 --- a/src/imports/multimedia/qmldir +++ b/src/imports/multimedia/qmldir @@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule typeinfo plugins.qmltypes typeinfo plugins.qmltypes Video 5.0 Video.qml + diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 52ce1e9f2..f8649b53f 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -415,12 +415,6 @@ void QCameraImageCapture::cancelCapture() \value FormatError Current format is not supported. */ -/*! - \enum QCameraImageCapture::DriveMode - - \value SingleImageCapture Drive mode is capturing a single picture. -*/ - /*! \fn QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString) diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index e76f9533b..f46c4bc1e 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -75,11 +75,6 @@ public: FormatError }; - enum DriveMode - { - SingleImageCapture - }; - enum CaptureDestination { CaptureToFile = 0x01, diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index 3eb627705..2586925b0 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -161,19 +161,6 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent) to \a fileName. */ -/*! - \fn QCameraImageCaptureControl::driveMode() const - - Returns the current camera drive mode. -*/ - -/*! - \fn QCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) - - Sets the current camera drive \a mode. -*/ - - /*! \fn QCameraImageCaptureControl::error(int id, int error, const QString &errorString) diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index 28bde94de..96d3af10b 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -60,9 +60,6 @@ class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QObject public: virtual bool isReadyForCapture() const = 0; - virtual QCameraImageCapture::DriveMode driveMode() const = 0; - virtual void setDriveMode(QCameraImageCapture::DriveMode mode) = 0; - virtual int capture(const QString &fileName) = 0; virtual void cancelCapture() = 0; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp index d230daa5c..bd3431755 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp @@ -61,16 +61,6 @@ bool QAndroidCameraImageCaptureControl::isReadyForCapture() const return m_session->isReadyForCapture(); } -QCameraImageCapture::DriveMode QAndroidCameraImageCaptureControl::driveMode() const -{ - return m_session->driveMode(); -} - -void QAndroidCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) -{ - m_session->setDriveMode(mode); -} - int QAndroidCameraImageCaptureControl::capture(const QString &fileName) { return m_session->capture(fileName); diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h index e7829cc47..f126efd82 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h @@ -65,9 +65,6 @@ public: bool isReadyForCapture() const override; - QCameraImageCapture::DriveMode driveMode() const override; - void setDriveMode(QCameraImageCapture::DriveMode mode) override; - int capture(const QString &fileName) override; void cancelCapture() override; diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp index 280182281..fdf791f85 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp @@ -71,7 +71,6 @@ QAndroidCameraSession::QAndroidCameraSession(QObject *parent) , m_status(QCamera::UnloadedStatus) , m_previewStarted(false) , m_captureDestination(QCameraImageCapture::CaptureToFile) - , m_captureImageDriveMode(QCameraImageCapture::SingleImageCapture) , m_lastImageCaptureId(0) , m_readyForCapture(false) , m_captureCanceled(false) @@ -577,16 +576,6 @@ void QAndroidCameraSession::setReadyForCapture(bool ready) emit readyForCaptureChanged(ready); } -QCameraImageCapture::DriveMode QAndroidCameraSession::driveMode() const -{ - return m_captureImageDriveMode; -} - -void QAndroidCameraSession::setDriveMode(QCameraImageCapture::DriveMode mode) -{ - m_captureImageDriveMode = mode; -} - int QAndroidCameraSession::capture(const QString &fileName) { ++m_lastImageCaptureId; @@ -597,24 +586,18 @@ int QAndroidCameraSession::capture(const QString &fileName) return m_lastImageCaptureId; } - if (m_captureImageDriveMode == QCameraImageCapture::SingleImageCapture) { - setReadyForCapture(false); + setReadyForCapture(false); - m_currentImageCaptureId = m_lastImageCaptureId; - m_currentImageCaptureFileName = fileName; + m_currentImageCaptureId = m_lastImageCaptureId; + m_currentImageCaptureFileName = fileName; - applyImageSettings(); - applyResolution(m_actualImageSettings.resolution()); + applyImageSettings(); + applyResolution(m_actualImageSettings.resolution()); - // adjust picture rotation depending on the device orientation - m_camera->setRotation(currentCameraRotation()); + // adjust picture rotation depending on the device orientation + m_camera->setRotation(currentCameraRotation()); - m_camera->takePicture(); - } else { - //: Drive mode is the camera's shutter mode, for example single shot, continuos exposure, etc. - emit imageCaptureError(m_lastImageCaptureId, QCameraImageCapture::NotSupportedFeatureError, - tr("Drive mode not supported")); - } + m_camera->takePicture(); return m_lastImageCaptureId; } diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h index a946f535f..ea0176a6f 100644 --- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h +++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h @@ -103,8 +103,6 @@ public: bool isReadyForCapture() const; void setReadyForCapture(bool ready); - QCameraImageCapture::DriveMode driveMode() const; - void setDriveMode(QCameraImageCapture::DriveMode mode); int capture(const QString &fileName); void cancelCapture(); @@ -187,7 +185,6 @@ private: QImageEncoderSettings m_requestedImageSettings; QImageEncoderSettings m_actualImageSettings; QCameraImageCapture::CaptureDestinations m_captureDestination; - QCameraImageCapture::DriveMode m_captureImageDriveMode; int m_lastImageCaptureId; bool m_readyForCapture; bool m_captureCanceled; diff --git a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h index 3c781a475..a426c0352 100644 --- a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h +++ b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h @@ -76,8 +76,6 @@ public: bool isReadyForCapture() const override; - QCameraImageCapture::DriveMode driveMode() const override { return QCameraImageCapture::SingleImageCapture; } - void setDriveMode(QCameraImageCapture::DriveMode ) override {} AVCaptureStillImageOutput *stillImageOutput() const {return m_stillImageOutput;} int capture(const QString &fileName) override; diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture_p.h index b91987bcd..8cd783ec9 100644 --- a/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture_p.h +++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimagecapture_p.h @@ -71,9 +71,6 @@ public: CameraBinImageCapture(CameraBinSession *session); virtual ~CameraBinImageCapture(); - QCameraImageCapture::DriveMode driveMode() const override { return QCameraImageCapture::SingleImageCapture; } - void setDriveMode(QCameraImageCapture::DriveMode) override {} - bool isReadyForCapture() const override; int capture(const QString &fileName) override; void cancelCapture() override; diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h index 3bdf96f4a..a9d2bd122 100644 --- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h +++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h @@ -64,9 +64,6 @@ public: QGstreamerImageCaptureControl(QGstreamerCaptureSession *session); virtual ~QGstreamerImageCaptureControl(); - QCameraImageCapture::DriveMode driveMode() const override { return QCameraImageCapture::SingleImageCapture; } - void setDriveMode(QCameraImageCapture::DriveMode) override {} - bool isReadyForCapture() const override; int capture(const QString &fileName) override; void cancelCapture() override; diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp index 25f0468ef..351630abe 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp +++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp @@ -60,16 +60,6 @@ bool BbCameraImageCaptureControl::isReadyForCapture() const return m_session->isReadyForCapture(); } -QCameraImageCapture::DriveMode BbCameraImageCaptureControl::driveMode() const -{ - return m_session->driveMode(); -} - -void BbCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) -{ - m_session->setDriveMode(mode); -} - int BbCameraImageCaptureControl::capture(const QString &fileName) { return m_session->capture(fileName); diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h index f36145cf6..f9b45672d 100644 --- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h +++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h @@ -64,9 +64,6 @@ public: bool isReadyForCapture() const override; - QCameraImageCapture::DriveMode driveMode() const override; - void setDriveMode(QCameraImageCapture::DriveMode mode) override; - int capture(const QString &fileName) override; void cancelCapture() override; diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp index 7c96d1898..b58e1b0d2 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp +++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp @@ -123,7 +123,6 @@ BbCameraSession::BbCameraSession(QObject *parent) , m_device("bb:RearCamera") , m_previewIsVideo(true) , m_surface(0) - , m_captureImageDriveMode(QCameraImageCapture::SingleImageCapture) , m_lastImageCaptureId(0) , m_captureDestination(QCameraImageCapture::CaptureToFile) , m_videoState(QMediaRecorder::StoppedState) @@ -294,16 +293,6 @@ bool BbCameraSession::isReadyForCapture() const return false; } -QCameraImageCapture::DriveMode BbCameraSession::driveMode() const -{ - return m_captureImageDriveMode; -} - -void BbCameraSession::setDriveMode(QCameraImageCapture::DriveMode mode) -{ - m_captureImageDriveMode = mode; -} - /** * A helper structure that keeps context data for image capture callbacks. */ @@ -371,25 +360,21 @@ int BbCameraSession::capture(const QString &fileName) return m_lastImageCaptureId; } - if (m_captureImageDriveMode == QCameraImageCapture::SingleImageCapture) { - // prepare context object for callback - ImageCaptureData *context = new ImageCaptureData; - context->requestId = m_lastImageCaptureId; - context->fileName = fileName; - context->session = this; + // prepare context object for callback + ImageCaptureData *context = new ImageCaptureData; + context->requestId = m_lastImageCaptureId; + context->fileName = fileName; + context->session = this; - const camera_error_t result = camera_take_photo(m_handle, - imageCaptureShutterCallback, - 0, - 0, - imageCaptureImageCallback, - context, false); + const camera_error_t result = camera_take_photo(m_handle, + imageCaptureShutterCallback, + 0, + 0, + imageCaptureImageCallback, + context, false); - if (result != CAMERA_EOK) - qWarning() << "Unable to take photo:" << result; - } else { - // TODO: implement burst mode when available in Qt API - } + if (result != CAMERA_EOK) + qWarning() << "Unable to take photo:" << result; return m_lastImageCaptureId; } diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h index fea041071..86dcae2b2 100644 --- a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h +++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h @@ -98,8 +98,6 @@ public: // image capture control bool isReadyForCapture() const; - QCameraImageCapture::DriveMode driveMode() const; - void setDriveMode(QCameraImageCapture::DriveMode mode); int capture(const QString &fileName); void cancelCapture(); @@ -197,7 +195,6 @@ private: QPointer m_surface; QMutex m_surfaceMutex; - QCameraImageCapture::DriveMode m_captureImageDriveMode; int m_lastImageCaptureId; QCameraImageCapture::CaptureDestinations m_captureDestination; diff --git a/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h b/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h index f3203ee23..d480b861a 100644 --- a/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h +++ b/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h @@ -50,9 +50,6 @@ public: { } - QCameraImageCapture::DriveMode driveMode() const { return QCameraImageCapture::SingleImageCapture; } - void setDriveMode(QCameraImageCapture::DriveMode) {} - bool isReadyForCapture() const { return m_ready && m_cameraControl->state() == QCamera::ActiveState; } int capture(const QString &fileName) -- cgit v1.2.3