Merge pull request #148 from barry-ran/dev

Dev

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+
+# These are supported funding model platforms
+
+github: barry-ran
+patreon: # Replace with a single Patreon username
+open_collective: QtScrcpy
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ["https://paypal.me/QtScrcpy", "https://gitee.com/Barryda/MyPictureBed/blob/master/QtScrcpy/payme.md"]

QtScrcpy/device/decoder/fpscounter.cpp

@@ -40,6 +40,7 @@ void FpsCounter::timerEvent(QTimerEvent *event)
         m_curRendered = m_rendered;
         m_curSkipped = m_skipped;
         resetCounter();
+        emit updateFPS(m_curRendered);
         //qInfo("FPS:%d Discard:%d", m_curRendered, m_skipped);
     }
 }

QtScrcpy/device/decoder/fpscounter.h

@@ -15,6 +15,9 @@ class FpsCounter : public QObject
     void addRenderedFrame();
     void addSkippedFrame();
 
+signals:
+    void updateFPS(quint32 fps);
+
 protected:
     virtual void timerEvent(QTimerEvent *event);
 

QtScrcpy/device/decoder/videobuffer.cpp

@@ -115,6 +115,11 @@ void VideoBuffer::interrupt()
     }
 }
 
+FpsCounter *VideoBuffer::getFPSCounter()
+{
+    return &m_fpsCounter;
+}
+
 void VideoBuffer::swap()
 {
     AVFrame *tmp = m_decodingFrame;

QtScrcpy/device/decoder/videobuffer.h

@@ -37,6 +37,8 @@ class VideoBuffer
     // wake up and avoid any blocking call
     void interrupt();
 
+    FpsCounter *getFPSCounter();
+
 private:
     void swap();
 

QtScrcpy/device/device.cpp

@@ -277,6 +277,7 @@ void Device::initSignals()
                 m_vb->unLock();
             },
             Qt::QueuedConnection);
+        connect(m_vb->getFPSCounter(), &::FpsCounter::updateFPS, m_videoForm, &VideoForm::updateFPS);
     }
 }
 

QtScrcpy/device/ui/videoform.cpp

@@ -1,5 +1,6 @@
 #include <QDesktopWidget>
 #include <QFileInfo>
+#include <QLabel>
 #include <QMessageBox>
 #include <QMimeData>
 #include <QMouseEvent>
@@ -68,6 +69,16 @@ void VideoForm::initUI()
     ui->keepRadioWidget->setWidget(m_videoWidget);
     ui->keepRadioWidget->setWidthHeightRadio(m_widthHeightRatio);
 
+    m_fpsLabel = new QLabel(m_videoWidget);
+    QFont ft;
+    ft.setPointSize(15);
+    ft.setWeight(QFont::Light);
+    ft.setBold(true);
+    m_fpsLabel->setFont(ft);
+    m_fpsLabel->move(5, 15);
+    m_fpsLabel->setMinimumWidth(100);
+    m_fpsLabel->setStyleSheet(R"(QLabel {color: #00FF00;})");
+
     setMouseTracking(true);
     m_videoWidget->setMouseTracking(true);
     ui->keepRadioWidget->setMouseTracking(true);
@@ -115,6 +126,14 @@ void VideoForm::removeBlackRect()
     resize(ui->keepRadioWidget->goodSize());
 }
 
+void VideoForm::showFPS(bool show)
+{
+    if (!m_fpsLabel) {
+        return;
+    }
+    m_fpsLabel->setVisible(show);
+}
+
 void VideoForm::updateRender(const AVFrame *frame)
 {
     if (m_videoWidget->isHidden()) {
@@ -429,6 +448,15 @@ void VideoForm::onSwitchFullScreen()
     }
 }
 
+void VideoForm::updateFPS(quint32 fps)
+{
+    qDebug() << "FPS:" << fps;
+    if (!m_fpsLabel) {
+        return;
+    }
+    m_fpsLabel->setText(QString("FPS:%1").arg(fps));
+}
+
 void VideoForm::staysOnTop(bool top)
 {
     bool needShow = false;

QtScrcpy/device/ui/videoform.h

@@ -14,6 +14,7 @@ class ToolForm;
 class Device;
 class FileHandler;
 class QYUVOpenGLWidget;
+class QLabel;
 class VideoForm : public QWidget
 {
     Q_OBJECT
@@ -29,9 +30,11 @@ class VideoForm : public QWidget
     const QSize &frameSize();
     void resizeSquare();
     void removeBlackRect();
+    void showFPS(bool show);
 
 public slots:
     void onSwitchFullScreen();
+    void updateFPS(quint32 fps);
 
 private:
     void updateStyleSheet(bool vertical);
@@ -68,6 +71,7 @@ public slots:
     QPointer<ToolForm> m_toolForm;
     QPointer<QWidget> m_loadingWidget;
     QPointer<QYUVOpenGLWidget> m_videoWidget;
+    QPointer<QLabel> m_fpsLabel;
 
     //inside member
     QSize m_frameSize;

QtScrcpy/devicemanage/devicemanage.cpp

@@ -76,6 +76,21 @@ bool DeviceManage::staysOnTop(const QString &serial)
     return true;
 }
 
+void DeviceManage::showFPS(const QString &serial, bool show)
+{
+    if (!serial.isEmpty() && m_devices.contains(serial)) {
+        auto it = m_devices.find(serial);
+        if (!it->data()) {
+            return;
+        }
+        if (!it->data()->getVideoForm()) {
+            return;
+        }
+        it->data()->getVideoForm()->showFPS(show);
+    }
+    return;
+}
+
 bool DeviceManage::disconnectDevice(const QString &serial)
 {
     bool ret = false;

QtScrcpy/devicemanage/devicemanage.h

@@ -16,6 +16,7 @@ class DeviceManage : public QObject
     bool connectDevice(Device::DeviceParams params);
     void updateScript(QString script);
     bool staysOnTop(const QString &serial);
+    void showFPS(const QString &serial, bool show);
 
     bool disconnectDevice(const QString &serial);
     void disconnectAllDevice();

QtScrcpy/dialog.cpp

@@ -188,6 +188,7 @@ void Dialog::on_startServerBtn_clicked()
     if (ui->alwaysTopCheck->isChecked()) {
         m_deviceManage.staysOnTop(params.serial);
     }
+    m_deviceManage.showFPS(params.serial, ui->fpsCheck->isChecked());
 }
 
 void Dialog::on_stopServerBtn_clicked()

QtScrcpy/dialog.ui

@@ -208,10 +208,23 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="recordScreenCheck">
+         <item row="1" column="1">
+          <widget class="QCheckBox" name="closeScreenCheck">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
-            <string>record screen</string>
+            <string>screen-off</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QCheckBox" name="framelessCheck">
+           <property name="text">
+            <string>frameless</string>
            </property>
           </widget>
          </item>
@@ -231,16 +244,19 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="closeScreenCheck">
+         <item row="0" column="1">
+          <widget class="QCheckBox" name="notDisplayCheck">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
-            <string>screen-off</string>
+            <string>background record</string>
+           </property>
+           <property name="checkable">
+            <bool>false</bool>
            </property>
           </widget>
          </item>
@@ -260,26 +276,17 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="notDisplayCheck">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="recordScreenCheck">
            <property name="text">
-            <string>background record</string>
-           </property>
-           <property name="checkable">
-            <bool>false</bool>
+            <string>record screen</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="3">
-          <widget class="QCheckBox" name="framelessCheck">
+         <item row="0" column="4">
+          <widget class="QCheckBox" name="fpsCheck">
            <property name="text">
-            <string>frameless</string>
+            <string>show fps</string>
            </property>
           </widget>
          </item>