Plugins::WebBrowser: modify record

Author: KangLin

App/Client/main.cpp

@@ -1,14 +1,16 @@
 // Author: Kang Lin <[email protected]>
 
 /*!
- *  \~english \defgroup VIEWER_APP Rabbit remote control programe
+ *  \~english
+ *  \defgroup VIEWER_APP Rabbit remote control programe
  *  \brief Rabbit remote control programe
- *  
- *  \~chinese \defgroup VIEWER_APP 玉兔远程控制程序
+ *
+ *  \~chinese
+ *  \defgroup VIEWER_APP 玉兔远程控制程序
  *  \brief 玉兔远程控制程序
+ *
  *  \~
  *  \ingroup APP
- *  
  */
 
 #include <QLoggingCategory>
@@ -20,6 +22,9 @@
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     #include <QRegularExpression>
 #endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    #include <QRandomGenerator>
+#endif
 #if defined(Q_OS_ANDROID) && (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 #include <QtAndroid>
 #endif
@@ -44,7 +49,7 @@ int main(int argc, char *argv[])
 
     qDebug(log) << "Version:" << RabbitRemoteControl_VERSION;
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-    
+
     /* 移到　snapcraft.yaml 和　io.github.KangLin.RabbitRemoteControl.yml
     // 修复 qtwebengine 沙箱权限问题
     if(!qEnvironmentVariable("SNAP").isEmpty()) {

Plugins/WebBrowser/FrmWebBrowser.cpp

@@ -64,7 +64,7 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     , m_pCapturePage(nullptr)
     , m_pCaptureFulPage(nullptr)
     , m_pRecord(nullptr)
-    , m_MultimediaRecord(pPara)
+    , m_pMultimediaRecord(nullptr)
 {
     qDebug(log) << Q_FUNC_INFO;
     bool check = false;
@@ -710,16 +710,23 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     }
 
     pMenu->addSeparator();
-    m_pCapturePage = pMenu->addAction(QIcon::fromTheme("screen-shot"), tr("Capture page"),
-                     this, &CFrmWebBrowser::slotCapturePage);
+    m_pCapturePage = pMenu->addAction(
+        QIcon::fromTheme("screen-shot"), tr("Capture page"),
+        this, &CFrmWebBrowser::slotCapturePage);
     m_pCapturePage->setStatusTip(tr("Capture page"));
-    m_pCaptureFulPage = pMenu->addAction(QIcon::fromTheme("screen-shot"), tr("Capture full page"),
-                     this, &CFrmWebBrowser::slotCaptureFullPage);
+    m_pCaptureFulPage = pMenu->addAction(
+        QIcon::fromTheme("screen-shot"), tr("Capture full page"),
+        this, &CFrmWebBrowser::slotCaptureFullPage);
     m_pCaptureFulPage->setStatusTip(tr("Capture full page"));
     m_pRecord = pMenu->addAction(QIcon::fromTheme("media-record"), tr("Record"),
                      this, &CFrmWebBrowser::slotRecord);
     m_pRecord->setCheckable(true);
     m_pRecord->setStatusTip(tr("Record"));
+#ifdef HAVE_QT6_RECORD
+    m_pRecord->setEnabled(true);
+#else
+    m_pRecord->setEnabled(false);
+#endif
 
     EnableAction(false);
     return 0;
@@ -1118,31 +1125,54 @@ void CFrmWebBrowser::slotRecord()
     if(m_pRecord->isChecked()) {
         m_pRecord->setText(tr("Stop record"));
         m_pRecord->setIcon(QIcon::fromTheme("media-stop"));
-        m_MultimediaRecord.start();
+
+        Q_ASSERT(!m_pMultimediaRecord);
+        // Note: It automatically releases memory when exiting.
+        // See: CMultimediaRecordThread::CMultimediaRecordThread()
+        m_pMultimediaRecord = new CMultimediaRecordThread(m_pPara);
+        if(m_pMultimediaRecord) {
+            connect(m_pMultimediaRecord, &CMultimediaRecordThread::finished,
+                    this, [this]() {
+                        m_pMultimediaRecord = nullptr;
+                        if(m_pRecord->isChecked()) {
+                            m_pRecord->activate(QAction::Trigger);
+                            emit sigError(RV::FailRecordPage, tr("Fail record web page"));
+                        }
+                    });
+            m_pMultimediaRecord->start();
+        }
+
         // modify interval
         qreal rate = m_pPara->m_Record.GetVideoFrameRate();
         if(rate <= 0)
             rate = 24;
         m_tmRecord.start(qreal(1000) / rate);
-        //slotRecordTimeout();
+        emit sigInformation(tr("Start record web page"));
     } else {
         m_pRecord->setIcon(QIcon::fromTheme("media-record"));
         m_pRecord->setText(tr("Record"));
         m_tmRecord.stop();
-        m_MultimediaRecord.quit();
+        if(m_pMultimediaRecord) {
+            QMetaObject::invokeMethod(m_pMultimediaRecord,
+                                      "slotQuit",
+                                      Qt::AutoConnection);
+            m_pMultimediaRecord = nullptr;
+            emit sigInformation(tr("Record web page is stoped"));
+        }
     }
     m_pRecord->setStatusTip(m_pRecord->text());
 }
 
 void CFrmWebBrowser::slotRecordTimeout()
 {
     //qDebug(log) << Q_FUNC_INFO;
+    if(!m_pMultimediaRecord) return;
     auto pWeb = CurrentView();
     if(!pWeb) return;
     QPixmap pixmap = pWeb->grab();
     QImage image = pixmap.toImage();
     if(image.isNull()) return;
-    QMetaObject::invokeMethod(&m_MultimediaRecord,
+    QMetaObject::invokeMethod(m_pMultimediaRecord,
                               "slotUpdateVideoFrame",
                               Qt::AutoConnection,
                               Q_ARG(QImage, image));

Plugins/WebBrowser/FrmWebBrowser.h

@@ -30,6 +30,7 @@ class CFrmWebBrowser : public QWidget
         Fail = -1,
         FailCapturePage = -2,
         FailCaptureFullPage = -3,
+        FailRecordPage = -4
     };
     Q_ENUM(RV)
 
@@ -122,6 +123,6 @@ public Q_SLOTS:
     QString m_szStyleSheet;
     friend CFrmWebView;
 
-    CMultimediaRecordThread m_MultimediaRecord;
+    CMultimediaRecordThread* m_pMultimediaRecord;
     QTimer m_tmRecord;
 };

Plugins/WebBrowser/MultimediaRecord.cpp

@@ -9,13 +9,13 @@ static Q_LOGGING_CATEGORY(log, "WebBrowser.Record")
 
 CMultimediaRecord::CMultimediaRecord(CParameterWebBrowser *pPara, QObject *parent)
     : QObject{parent}
-    , m_pParaRecord(nullptr)
     , m_pMediaDevices(nullptr)
     , m_VideoFrameStartTime(0)
 {
     bool check = false;
+    qDebug(log) << Q_FUNC_INFO;
     if(pPara) {
-        m_pParaRecord = &pPara->m_Record;
+        m_ParaRecord = pPara->m_Record;
         m_pMediaDevices = &pPara->m_MediaDevices;
     }
 #if HAVE_QT6_RECORD
@@ -28,35 +28,46 @@ CMultimediaRecord::CMultimediaRecord(CParameterWebBrowser *pPara, QObject *paren
 #endif // #if HAVE_QT6_RECORD
 }
 
+CMultimediaRecord::~CMultimediaRecord()
+{
+    qDebug(log) << Q_FUNC_INFO;
+}
+
 void CMultimediaRecord::slotStart()
 {
-    // 配置音频输入（捕获系统音频或麦克风）
+#ifdef HAVE_QT6_RECORD
+    // 配置音频输入（捕获系统音频输入或麦克风）
     if(m_pMediaDevices) {
         const auto inputs = QMediaDevices::audioInputs();
         foreach(auto input, inputs) {
             if(input.id() == m_pMediaDevices->m_Para.m_AudioInput) {
                 m_AudioInput.setDevice(input);
+                m_CaptureSession.setAudioInput(&m_AudioInput);
                 break;
             }
         }
     }
-    m_CaptureSession.setAudioInput(&m_AudioInput);
     m_CaptureSession.setVideoFrameInput(&m_VideoFrameInput);
     // 配置录制器, 设置录制参数：输出文件、编码、质量等
-    if(m_pParaRecord)
-        *m_pParaRecord >> m_Recorder;
+    m_ParaRecord >> m_Recorder;
     m_CaptureSession.setRecorder(&m_Recorder);
     m_VideoFrameStartTime = 0;
     m_Recorder.record();
+#endif
 }
 
 void CMultimediaRecord::slotStop()
 {
+#ifdef HAVE_QT6_RECORD
     m_Recorder.stop();
+#endif
+    m_pMediaDevices = nullptr;
 }
 
 void CMultimediaRecord::slotUpdateVideoFrame(const QImage image)
 {
+    //qDebug(log) << Q_FUNC_INFO;
+#ifdef HAVE_QT6_RECORD
     // 将 QImage 转换为 QVideoFrame
     QImage img = image;
     //qDebug(log) << "Image format:" << img.format();
@@ -74,12 +85,13 @@ void CMultimediaRecord::slotUpdateVideoFrame(const QImage image)
     if (m_VideoFrameStartTime == 0) m_VideoFrameStartTime = QDateTime::currentMSecsSinceEpoch() * 1000;
     qint64 currentTime = QDateTime::currentMSecsSinceEpoch() * 1000 - m_VideoFrameStartTime;
     frame.setStartTime(currentTime);
-    qreal rate = m_pParaRecord->GetVideoFrameRate();
+    qreal rate = m_ParaRecord.GetVideoFrameRate();
     if(rate <= 0)
         rate = 24;
     frame.setEndTime(currentTime + qreal(1000000) / rate);
-    frame.setStreamFrameRate(m_pParaRecord->GetVideoFrameRate());//*/
+    frame.setStreamFrameRate(m_ParaRecord.GetVideoFrameRate());//*/
     m_VideoFrameInput.sendVideoFrame(frame);
+#endif
 }
 
 #if HAVE_QT6_RECORD
@@ -89,7 +101,7 @@ void CMultimediaRecord::slotRecordStateChanged(QMediaRecorder::RecorderState sta
     switch(state) {
     case QMediaRecorder::RecorderState::StoppedState: {
         QString szFile = m_Recorder.actualLocation().toLocalFile();
-        switch(m_pParaRecord->GetEndAction())
+        switch(m_ParaRecord.GetEndAction())
         {
         case CParameterRecord::ENDACTION::OpenFile: {
             bool bRet = QDesktopServices::openUrl(QUrl::fromLocalFile(szFile));
@@ -125,30 +137,45 @@ void CMultimediaRecord::slotRecordError(QMediaRecorder::Error error, const QStri
 }
 #endif // HAVE_QT6_RECORD
 
-CMultimediaRecordThread::CMultimediaRecordThread(CParameterWebBrowser* pPara, QObject *parent)
+CMultimediaRecordThread::CMultimediaRecordThread(
+    CParameterWebBrowser* pPara, QObject *parent)
     : QThread(parent)
     , m_pPara(pPara)
     , m_pRecord(nullptr)
-{}
+{
+    qDebug(log) << Q_FUNC_INFO;
+    connect(this, &QThread::finished, this, &QObject::deleteLater);
+}
+
+CMultimediaRecordThread::~CMultimediaRecordThread()
+{
+    qDebug(log) << Q_FUNC_INFO;
+}
 
 void CMultimediaRecordThread::run()
 {
     m_pRecord = new CMultimediaRecord(m_pPara);
     if(!m_pRecord) return;
     connect(m_pRecord, &CMultimediaRecord::sigFinished,
-            this, &CMultimediaRecordThread::quit);
+            this, &QThread::quit);
     m_pRecord->slotStart();
     exec();
-    m_pRecord->slotStop();
-    exec();
     delete m_pRecord;
+    m_pRecord = nullptr;
 }
 
 void CMultimediaRecordThread::slotUpdateVideoFrame(const QImage image)
 {
     if(!m_pRecord) return;
+    m_pRecord->slotUpdateVideoFrame(image);
+}
+
+void CMultimediaRecordThread::slotQuit()
+{
+    if(!m_pRecord) return;
+    m_pRecord->slotStop();
+    /*
     QMetaObject::invokeMethod(m_pRecord,
-                              "slotUpdateVideoFrame",
-                              Qt::AutoConnection,
-                              Q_ARG(QImage, image));
+                              "slotStop",
+                              Qt::AutoConnection);*/
 }

Plugins/WebBrowser/MultimediaRecord.h

@@ -26,6 +26,7 @@ class CMultimediaRecord : public QObject
     Q_OBJECT
 public:
     explicit CMultimediaRecord(CParameterWebBrowser* pPara, QObject *parent = nullptr);
+    ~CMultimediaRecord();
 
     enum RV {
         Success = 0,
@@ -43,32 +44,54 @@ public Q_SLOTS:
     void sigFinished();
 
 private:
-    CParameterRecord* m_pParaRecord;
+    CParameterRecord m_ParaRecord;
     CParameterMediaDevices* m_pMediaDevices;
 #if HAVE_QT6_MULTIMEDIA
     QMediaCaptureSession m_CaptureSession;
 #endif
+    qint64 m_VideoFrameStartTime;
 #ifdef HAVE_QT6_RECORD
     QAudioInput m_AudioInput;
     QVideoFrameInput m_VideoFrameInput;
     QAudioBufferInput m_AudioBufferInput;
     QAudioBufferOutput m_AudioBufferOutput;
     QMediaRecorder m_Recorder;
-    qint64 m_VideoFrameStartTime;
 private Q_SLOTS:
     void slotRecordStateChanged(QMediaRecorder::RecorderState state);
     void slotRecordError(QMediaRecorder::Error error, const QString &errorString);
-#endif    
+#endif
 };
 
+/*!
+ * \brief The CMultimediaRecordThread class
+ * \details Must use pointer. eg:
+ * - New object:
+ *  \code
+ *  CMultimediaRecordThread* pThread = new CMultimediaRecordThread(m_pPara);
+ *  \endcode
+ * - Start thread:
+ *  \code
+ *  if(pThread)
+ *      pThread->start();
+ *  \endcode
+ * - Stop thread.
+ *  \code
+ *  pThread->slotQuit();
+ *  \endcode
+ * 
+ * \note
+ * - It automatically releases memory when exiting.
+ * - To stop a thread, you must use slotQuit(), and cannot use quit().
+ */
 class CMultimediaRecordThread : public QThread
 {
     Q_OBJECT
 public:
     explicit CMultimediaRecordThread(CParameterWebBrowser* pPara, QObject *parent = nullptr);
-
+    ~CMultimediaRecordThread();
 public Q_SLOTS:
     void slotUpdateVideoFrame(const QImage image);
+    void slotQuit();
 protected:
     virtual void run() override;
 private: