feat: Upgrade to QT6

as title

log: as title

Author: robertkill

debian/control

@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Deepin Sysdev <[email protected]>
 Build-Depends: debhelper (>= 8.0.0),
 	pkg-config,
-	qt5-qmake,
-	qtbase5-dev,
-	libdtkcore-dev,
+	qmake6,
+	qt6-base-dev,
+	libdtk6core-dev,
 	seetaface-boxes,
 	seetaface-landmarker,
 	seetaface-anti-spoofing-x,
@@ -16,9 +16,9 @@ Build-Depends: debhelper (>= 8.0.0),
 	seetaface-pose-estimation,
 	seetaface-authorize,
 	seetaface-tennis,
-	libdtkwidget-dev,
-	libdtkcore5-bin,
-	qtmultimedia5-dev
+	libdtk6widget-dev,
+	libdtk6core-bin,
+	qt6-multimedia-dev
 Standards-Version: 4.5.1
 Homepage: https://github.com/linuxdeepin/deepin-face
 
@@ -36,7 +36,7 @@ Depends: ${shlibs:Depends},
 	  seetaface-authorize,
 	  seetaface-tennis,
 	  seetaface-models,
-	  libqt5multimedia5-plugins,
+	  libqt6multimedia6,
 	  gstreamer1.0-plugins-bad
 Description: Face recognition service 
  deepin-face is a face recognition service implemented by the open source face recognition engine seetaface

debian/rules

@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 # See debhelper(7) (uncomment to enable)
 # output every command that modifies files on the build system.
-export DH_VERBOSE = 1
-export QT_SELECT=5
-
+export DH_VERBOSE=1
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -16,9 +14,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 
 %:
-	dh $@
-
+	dh $@ --buildsystem qmake6
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr
-	dh_installtmpfiles deepin-face.tmpfiles
+	dh_installtmpfiles deepin-face.tmpfiles

drivermanger.cpp

@@ -91,7 +91,6 @@ QDBusUnixFileDescriptor DriverManger::enrollStart(QString chara,
     QMetaObject::invokeMethod(m_spErollthread.data(),
                               "Start",
                               Qt::QueuedConnection,
-                              QGenericReturnArgument(),
                               Q_ARG(QString, actionId),
                               Q_ARG(int, fd[1]));
 
@@ -153,7 +152,6 @@ QDBusUnixFileDescriptor DriverManger::verifyStart(QStringList charas,
     QMetaObject::invokeMethod(m_spVerifyThread.data(),
                               "Start",
                               Qt::QueuedConnection,
-                              QGenericReturnArgument(),
                               Q_ARG(QString, actionId),
                               Q_ARG(QVector<float*>, faceCharas));
     return QDBusUnixFileDescriptor(0);

workmodule.cpp

@@ -5,7 +5,7 @@
 #include "workmodule.h"
 #include "modelmanger.h"
 
-#include <QCameraInfo>
+#include <QMediaDevices>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QtConcurrent>
@@ -34,44 +34,42 @@ void ErollThread::Start(QString actionId, int socket)
 void ErollThread::run()
 {
     m_camera.reset();
-    auto cameras = QCameraInfo::availableCameras();
-    for (const auto &obj : qAsConst(cameras)) {
+    auto cameras = QMediaDevices::videoInputs();
+    for (const QCameraDevice &obj : cameras) {
         m_camera.reset(new QCamera(obj));
         if (m_camera->isAvailable())
             break;
     }
 
-
     if (m_camera.isNull()) {
         qDebug() << "open camera fail";
         Q_EMIT processStatus(m_actionId, FaceEnrollException);
         return;
     }
 
-    m_camera->setCaptureMode(QCamera::CaptureStillImage);
-    m_imageCapture.reset(new QCameraImageCapture(m_camera.data()));
-    m_imageCapture->setCaptureDestination(QCameraImageCapture::CaptureToBuffer);
-    QList<QSize> supportedResolutions = m_imageCapture->supportedResolutions();
+    m_captureSession.reset(new QMediaCaptureSession);
+    m_captureSession->setCamera(m_camera.data());
+    m_imageCapture.reset(new QImageCapture);
+    m_captureSession->setImageCapture(m_imageCapture.data());
+    QList<QSize> supportedResolutions = m_camera->cameraDevice().photoResolutions();
     if (supportedResolutions.contains(QSize(800, 600))) {
-        auto settings = m_imageCapture->encodingSettings();
-        settings.setResolution(QSize(800, 600));
-        m_imageCapture->setEncodingSettings(settings);
+        m_imageCapture->setResolution(QSize(800, 600));
     }
-    connect(m_camera.data(), &QCamera::stateChanged, this, &ErollThread::updateCameraState);
-    connect(m_imageCapture.data(), &QCameraImageCapture::readyForCaptureChanged, this, &ErollThread::readyForCapture);
-    connect(m_imageCapture.data(), &QCameraImageCapture::imageCaptured, this, &ErollThread::processCapturedImage);
-    connect(m_imageCapture.data(), QOverload<int, QCameraImageCapture::Error, const QString &>::of(&QCameraImageCapture::error),
+    connect(m_imageCapture.data(), &QImageCapture::readyForCaptureChanged, this, &ErollThread::readyForCapture);
+    connect(m_imageCapture.data(), &QImageCapture::imageCaptured, this, &ErollThread::processCapturedImage);
+    connect(m_imageCapture.data(), QOverload<int, QImageCapture::Error, const QString &>::of(&QImageCapture::errorOccurred),
             this, &ErollThread::captureError);
     m_camera->start();
+    m_imageCapture->capture();
 }
 
 void ErollThread::Stop()
 {
     qDebug() << "ErollThread::Stop thread:" << QThread::currentThreadId();
-    m_imageCapture->cancelCapture();
+    // m_imageCapture->cancelCapture();
     m_stopCapture = true;
     m_camera->stop();
-    m_camera->unload();
+    // m_camera->unload();
     close(m_fileSocket);
 }
 
@@ -115,10 +113,10 @@ void ErollThread::sendCapture(QImage &img)
     free(buf);
 }
 
-void ErollThread::updateCameraState(QCamera::State state)
-{
-    qInfo() << "updateCameraState" << state;
-}
+// void ErollThread::updateCameraState(QCamera::State state)
+// {
+//     qInfo() << "updateCameraState" << state;
+// }
 
 void ErollThread::readyForCapture(bool ready)
 {
@@ -128,10 +126,12 @@ void ErollThread::readyForCapture(bool ready)
     }
 }
 
-void ErollThread::captureError(int, QCameraImageCapture::Error, const QString &errorString)
+void ErollThread::captureError(int err, QImageCapture::Error, const QString &errorString)
 {
-    qDebug() << "read camera fail:" << errorString;
-    Q_EMIT processStatus(m_actionId, FaceEnrollException);
+    if (err > 0) {
+        qDebug() << "read camera fail:" << errorString;
+        Q_EMIT processStatus(m_actionId, FaceEnrollException);
+    }
     return;
 }
 
@@ -297,40 +297,40 @@ void VerifyThread::run()
 {
     qDebug() << "Verify run";
     m_camera.reset();
-    auto cameras = QCameraInfo::availableCameras();
-    for (const auto &obj : qAsConst(cameras)) {
+    m_camera.reset();
+    auto cameras = QMediaDevices::videoInputs();
+    for (const QCameraDevice &obj : cameras) {
         m_camera.reset(new QCamera(obj));
         if (m_camera->isAvailable())
             break;
     }
+
     if (m_camera.isNull()) {
         qDebug() << "open camera fail";
         Q_EMIT processStatus(m_actionId, FaceEnrollException);
         return;
     }
 
-    m_camera->setCaptureMode(QCamera::CaptureStillImage);
-    m_imageCapture.reset(new QCameraImageCapture(m_camera.data()));
-    m_imageCapture->setCaptureDestination(QCameraImageCapture::CaptureToBuffer);
-    QList<QSize> supportedResolutions = m_imageCapture->supportedResolutions();
+    m_captureSession.reset(new QMediaCaptureSession);
+    m_captureSession->setCamera(m_camera.data());
+    m_imageCapture.reset(new QImageCapture);
+    m_captureSession->setImageCapture(m_imageCapture.data());
+    QList<QSize> supportedResolutions = m_camera->cameraDevice().photoResolutions();
     if (supportedResolutions.contains(QSize(800, 600))) {
-        auto settings = m_imageCapture->encodingSettings();
-        settings.setResolution(QSize(800, 600));
-        m_imageCapture->setEncodingSettings(settings);
+        m_imageCapture->setResolution(QSize(800, 600));
     }
 
-    connect(m_camera.data(), &QCamera::stateChanged, this, &VerifyThread::updateCameraState);
-    connect(m_imageCapture.data(), &QCameraImageCapture::readyForCaptureChanged, this, &VerifyThread::readyForCapture);
-    connect(m_imageCapture.data(), &QCameraImageCapture::imageCaptured, this, &VerifyThread::processCapturedImage);
-    connect(m_imageCapture.data(), QOverload<int, QCameraImageCapture::Error, const QString &>::of(&QCameraImageCapture::error),
+    connect(m_imageCapture.data(), &QImageCapture::readyForCaptureChanged, this, &VerifyThread::readyForCapture);
+    connect(m_imageCapture.data(), &QImageCapture::imageCaptured, this, &VerifyThread::processCapturedImage);
+    connect(m_imageCapture.data(), QOverload<int, QImageCapture::Error, const QString &>::of(&QImageCapture::errorOccurred),
             this, &VerifyThread::captureError);
     m_camera->start();
 }
 
-void VerifyThread::updateCameraState(QCamera::State state)
-{
-    qDebug() << "updateCameraState" << state;
-}
+// void VerifyThread::updateCameraState(QCamera::State state)
+// {
+//     qDebug() << "updateCameraState" << state;
+// }
 
 void VerifyThread::readyForCapture(bool ready)
 {
@@ -340,10 +340,12 @@ void VerifyThread::readyForCapture(bool ready)
     }
 }
 
-void VerifyThread::captureError(int, QCameraImageCapture::Error, const QString &errorString)
+void VerifyThread::captureError(int err, QImageCapture::Error, const QString &errorString)
 {
-    qDebug() << "read camera fail:" << errorString;
-    Q_EMIT processStatus(m_actionId, FaceEnrollException);
+    if (err > 0) {
+        qDebug() << "read camera fail:" << errorString;
+        Q_EMIT processStatus(m_actionId, FaceEnrollException);
+    }
     return;
 }
 
@@ -466,11 +468,11 @@ void VerifyThread::Stop()
 {
     qDebug() << "VerifyThread::Stop thread:" << QThread::currentThreadId();
 
-    m_imageCapture->cancelCapture();
+    // m_imageCapture->cancelCapture();
     // 当关闭相机后, 会取消图片的抓取, 此时不需要去处理抓取的图片
-    disconnect(m_imageCapture.data(), &QCameraImageCapture::imageCaptured, this, &VerifyThread::processCapturedImage);
+    disconnect(m_imageCapture.data(), &QImageCapture::imageCaptured, this, &VerifyThread::processCapturedImage);
     m_camera->stop();
-    m_camera->unload();
+    // m_camera->unload();
     for (int i = 0; i < m_charaDatas.size(); i++) {
         if (m_charaDatas[i] != nullptr) {
             free(m_charaDatas[i]);

workmodule.h

@@ -5,20 +5,22 @@
 #ifndef WORKMODULE_H
 #define WORKMODULE_H
 
-#include "qcamera.h"
+#include <QCamera>
 #include <memory>
 #include <unistd.h>
 #include <QDebug>
 #include <QImage>
 #include <QPixmap>
 #include <QThread>
-#include <QCameraImageCapture>
+#include <QImageCapture>
+#include <QMediaCaptureSession>
 
 QT_BEGIN_NAMESPACE
 class QMutex;
 QT_END_NAMESPACE
 
 class DriverManger;
+class QMediaCaptureSession;
 class ErollThread : public QObject
 {
     Q_OBJECT
@@ -39,14 +41,15 @@ public Q_SLOTS:
 
 
 private Q_SLOTS:
-    void updateCameraState(QCamera::State state);
+    // void updateCameraState(QCamera::State state);
     void readyForCapture(bool ready);
-    void captureError(int, QCameraImageCapture::Error, const QString &errorString);
+    void captureError(int err, QImageCapture::Error, const QString &errorString);
     void processCapturedImage(int id, const QImage &preview);
 
 private:
     QScopedPointer<QCamera> m_camera;
-    QScopedPointer<QCameraImageCapture> m_imageCapture;
+    QScopedPointer<QImageCapture> m_imageCapture;
+    QScopedPointer<QMediaCaptureSession> m_captureSession;
     QString m_actionId;
     int m_fileSocket;
     bool m_bFirst;
@@ -72,14 +75,15 @@ public Q_SLOTS:
     void run();
 
 private Q_SLOTS:
-    void updateCameraState(QCamera::State state);
+    // void updateCameraState(QCamera::State state);
     void readyForCapture(bool ready);
-    void captureError(int, QCameraImageCapture::Error, const QString &errorString);
+    void captureError(int err, QImageCapture::Error, const QString &errorString);
     void processCapturedImage(int id, const QImage &preview);
 
 private:
     QScopedPointer<QCamera> m_camera;
-    QScopedPointer<QCameraImageCapture> m_imageCapture;
+    QScopedPointer<QImageCapture> m_imageCapture;
+    QScopedPointer<QMediaCaptureSession> m_captureSession;
     QString m_actionId;
     QVector<float*> m_charaDatas;
 };