Remove some dead code

Change-Id: I8206b684c5dcef847e09e211e129757cc03c6701
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

18 files changed, 2 insertions, 160 deletions

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index d599a41a9..ace835aae 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -93,7 +93,6 @@ void QCameraPrivate::setState(QCamera::State newState)
         return;
     }
 
-    restartPending = false;
     control->setState(newState);
 }
 
@@ -101,44 +100,12 @@ void QCameraPrivate::_q_updateState(QCamera::State newState)
 {
     Q_Q(QCamera);
 
-    //omit changins state to Loaded when the camera is temporarily
-    //stopped to apply shanges
-    if (restartPending)
-        return;
-
     if (newState != state) {
         state = newState;
         emit q->stateChanged(state);
     }
 }
 
-void QCameraPrivate::_q_preparePropertyChange(int changeType)
-{
-    if (!control)
-        return;
-
-    QCamera::Status status = control->status();
-
-    //all the changes are allowed until the camera is starting
-    if (control->state() != QCamera::ActiveState)
-        return;
-
-    if (control->canChangeProperty(QPlatformCamera::PropertyChangeType(changeType), status))
-        return;
-
-    restartPending = true;
-    control->setState(QCamera::LoadedState);
-    QMetaObject::invokeMethod(q_ptr, "_q_restartCamera", Qt::QueuedConnection);
-}
-
-void QCameraPrivate::_q_restartCamera()
-{
-    if (restartPending) {
-        restartPending = false;
-        control->setState(QCamera::ActiveState);
-    }
-}
-
 void QCameraPrivate::init()
 {
     Q_Q(QCamera);
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index f8e2ac39d..e70db30b0 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -136,8 +136,6 @@ Q_SIGNALS:
 private:
     Q_DISABLE_COPY(QCamera)
     Q_DECLARE_PRIVATE(QCamera)
-    Q_PRIVATE_SLOT(d_func(), void _q_preparePropertyChange(int))
-    Q_PRIVATE_SLOT(d_func(), void _q_restartCamera())
     Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))
     Q_PRIVATE_SLOT(d_func(), void _q_updateState(QCamera::State))
     friend class QCameraInfo;
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index 24f5e92cb..a5f755754 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -68,8 +68,7 @@ public:
         : QObjectPrivate(),
           state(QCamera::UnloadedState),
           error(QCamera::NoError),
-          supressLockChangedSignal(false),
-          restartPending(false)
+          supressLockChangedSignal(false)
     {
     }
 
@@ -96,16 +95,12 @@ public:
 
     bool supressLockChangedSignal;
 
-    bool restartPending;
-
     void _q_error(int error, const QString &errorString);
     void unsetError() { error = QCamera::NoError; errorString.clear(); }
 
     void setState(QCamera::State);
 
     void _q_updateState(QCamera::State newState);
-    void _q_preparePropertyChange(int changeType);
-    void _q_restartCamera();
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 347d14c2f..35c5e842f 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -250,17 +250,8 @@ void QCameraImageCapture::setEncodingSettings(const QImageEncoderSettings &setti
 {
     Q_D(QCameraImageCapture);
 
-    if (d->control) {
-        QCamera *camera = qobject_cast<QCamera*>(d->camera);
-        if (camera) {
-            QMetaObject::invokeMethod(camera,
-                                      "_q_preparePropertyChange",
-                                      Qt::DirectConnection,
-                                      Q_ARG(int, QPlatformCamera::ImageEncodingSettings));
-        }
-
+    if (d->control)
         d->control->setImageSettings(settings);
-    }
 }
 
 /*!
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
index 6b1aec554..3a08621c7 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
@@ -101,21 +101,6 @@ void QAndroidCameraControl::setCamera(const QCameraInfo &camera)
     m_cameraSession->setSelectedCamera(id);
 }
 
-
-bool QAndroidCameraControl::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
-{
-    Q_UNUSED(status);
-
-    switch (changeType) {
-    case QPlatformCamera::ImageEncodingSettings:
-    case QPlatformCamera::VideoEncodingSettings:
-    case QPlatformCamera::Viewfinder:
-        return true;
-    default:
-        return false;
-    }
-}
-
 QPlatformCameraFocus *QAndroidCameraControl::focusControl()
 {
     return m_cameraSession->focusControl();
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
index abeeb942b..742105137 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
@@ -73,8 +73,6 @@ public:
 
     void setCamera(const QCameraInfo &camera) override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
-
     QPlatformCameraFocus *focusControl() override;
     QPlatformCameraExposure *exposureControl() override;
     QPlatformCameraImageProcessing *imageProcessingControl() override;
diff --git a/src/multimedia/platform/darwin/camera/avfcameracontrol.mm b/src/multimedia/platform/darwin/camera/avfcameracontrol.mm
index 8f4c04378..5ee2be793 100644
--- a/src/multimedia/platform/darwin/camera/avfcameracontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameracontrol.mm
@@ -107,14 +107,6 @@ void AVFCameraControl::updateStatus()
     }
 }
 
-bool AVFCameraControl::canChangeProperty(QPlatformCamera::PropertyChangeType changeType, QCamera::Status status) const
-{
-    Q_UNUSED(changeType);
-    Q_UNUSED(status);
-
-    return true;
-}
-
 QVideoFrame::PixelFormat AVFCameraControl::QtPixelFormatFromCVFormat(unsigned avPixelFormat)
 {
     // BGRA <-> ARGB "swap" is intentional:
diff --git a/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h b/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h
index 5a61dc34b..ffba37d70 100644
--- a/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h
@@ -76,8 +76,6 @@ public:
 
     void setCamera(const QCameraInfo &camera) override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
-
     QPlatformCameraFocus *focusControl() override;
     QPlatformCameraExposure *exposureControl() override;
     QPlatformCameraImageProcessing *imageProcessingControl() override;
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
index 11dc0f092..df126523e 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
@@ -182,21 +182,6 @@ void CameraBinControl::delayedReload()
     }
 }
 
-bool CameraBinControl::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
-{
-    Q_UNUSED(status);
-
-    switch (changeType) {
-    case QPlatformCamera::Viewfinder:
-        return true;
-    case QPlatformCamera::CaptureMode:
-    case QPlatformCamera::ImageEncodingSettings:
-    case QPlatformCamera::VideoEncodingSettings:
-    default:
-        return status != QCamera::ActiveStatus;
-    }
-}
-
 #define VIEWFINDER_COLORSPACE_CONVERSION 0x00000004
 
 bool CameraBinControl::viewfinderColorSpaceConversion() const
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
index a169a83e6..434d9f58f 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
@@ -76,7 +76,6 @@ public:
 
     void setCamera(const QCameraInfo &camera) override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
     bool viewfinderColorSpaceConversion() const;
 
 public slots:
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
index 23902ec55..ac9aae51a 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
@@ -153,20 +153,6 @@ void QGstreamerCameraControl::reloadPipeline()
     }
 }
 
-bool QGstreamerCameraControl::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
-{
-    Q_UNUSED(status);
-
-    switch (changeType) {
-    case QPlatformCamera::ImageEncodingSettings:
-    case QPlatformCamera::VideoEncodingSettings:
-    case QPlatformCamera::Viewfinder:
-        return true;
-    default:
-        return false;
-    }
-}
-
 void QGstreamerCameraControl::setVideoSurface(QAbstractVideoSurface *surface)
 {
     m_session->setVideoPreview(surface);
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
index f462823ff..e29da1ae1 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
@@ -74,8 +74,6 @@ public:
 
     void setCamera(const QCameraInfo &camera) override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
-
     void setVideoSurface(QAbstractVideoSurface *surface) override;
 
 public slots:
diff --git a/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
index 1bb3dc486..18d2bafaa 100644
--- a/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
@@ -90,11 +90,6 @@ bool BbCameraControl::isCaptureModeSupported(QCamera::CaptureModes mode) const
     return m_session->isCaptureModeSupported(mode);
 }
 
-bool BbCameraControl::canChangeProperty(PropertyChangeType /* changeType */, QCamera::Status /* status */) const
-{
-    return false;
-}
-
 void BbCameraControl::cameraOpened()
 {
 }
diff --git a/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
index 8dc63670b..52eab1577 100644
--- a/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
@@ -73,8 +73,6 @@ public:
     void setCaptureMode(QCamera::CaptureModes) override;
     bool isCaptureModeSupported(QCamera::CaptureModes mode) const override;
 
-    bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
-
     enum LocksApplyMode
     {
         IndependentMode,
diff --git a/src/multimedia/platform/qplatformcamera.cpp b/src/multimedia/platform/qplatformcamera.cpp
index ddd1dc3b5..4686bf4d0 100644
--- a/src/multimedia/platform/qplatformcamera.cpp
+++ b/src/multimedia/platform/qplatformcamera.cpp
@@ -116,29 +116,6 @@ QPlatformCamera::QPlatformCamera(QObject *parent)
 */
 
 /*!
-    \fn bool QPlatformCamera::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
-
-    Returns true if backend can effectively apply changing camera properties of \a changeType type
-    while the camera state is QCamera::Active and camera status matches \a status parameter.
-
-    If backend doesn't support applying this change in the active state, it will be stopped
-    before the settings are changed and restarted after.
-    Otherwise the backend should apply the change in the current state,
-    with the camera status indicating the progress, if necessary.
-*/
-
-/*!
-  \enum QPlatformCamera::PropertyChangeType
-
-  \value CaptureMode Indicates the capture mode is changed.
-  \value ImageEncodingSettings Image encoder settings are changed, including resolution.
-  \value VideoEncodingSettings
-        Video encoder settings are changed, including audio, video and container settings.
-  \value Viewfinder Viewfinder is changed.
-  \value ViewfinderSettings Viewfinder settings are changed.
-*/
-
-/*!
     \fn QPlatformCamera::supportedViewfinderSettings() const
 
     Returns a list of supported camera viewfinder settings.
diff --git a/src/multimedia/platform/qplatformcamera_p.h b/src/multimedia/platform/qplatformcamera_p.h
index d2e204c91..98b44134d 100644
--- a/src/multimedia/platform/qplatformcamera_p.h
+++ b/src/multimedia/platform/qplatformcamera_p.h
@@ -58,12 +58,6 @@ class Q_MULTIMEDIA_EXPORT QPlatformCamera : public QObject
     Q_OBJECT
 
 public:
-    enum PropertyChangeType {
-        ImageEncodingSettings = 2,
-        VideoEncodingSettings = 3,
-        Viewfinder = 4,
-    };
-
     virtual QCamera::State state() const = 0;
     virtual void setState(QCamera::State state) = 0;
 
@@ -71,8 +65,6 @@ public:
 
     virtual void setCamera(const QCameraInfo &camera) = 0;
 
-    virtual bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const = 0;
-
     virtual QPlatformCameraFocus *focusControl() { return nullptr; }
     virtual QPlatformCameraExposure *exposureControl() { return nullptr; }
     virtual QPlatformCameraImageProcessing *imageProcessingControl() { return nullptr; }
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index b7b023027..afb2b63c8 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -137,17 +137,6 @@ void QMediaRecorderPrivate::_q_applySettings()
     }
 }
 
-void QMediaRecorderPrivate::restartCamera()
-{
-    //restart camera if it can't apply new settings in the Active state
-    if (camera) {
-        QMetaObject::invokeMethod(camera,
-                                  "_q_preparePropertyChange",
-                                  Qt::DirectConnection,
-                                  Q_ARG(int, QPlatformCamera::VideoEncodingSettings));
-    }
-}
-
 /*!
     Constructs a media recorder which records the media produced by a microphone and camera.
 */
diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h
index e262241f7..6aa4d20d6 100644
--- a/src/multimedia/recording/qmediarecorder_p.h
+++ b/src/multimedia/recording/qmediarecorder_p.h
@@ -76,7 +76,6 @@ public:
     QMediaRecorderPrivate() = default;
 
     void applySettingsLater();
-    void restartCamera();
 
     QPointer<QCamera> camera;