fix: drag ui delay recv video

Author: barry-ran

src/device/device.cpp

@@ -36,14 +36,7 @@ Device::Device(DeviceParams params, QObject *parent) : IDevice(parent), m_params
         }, params.gameScript, this);
     }
 
-    m_stream = new Stream([this](quint8 *buf, qint32 bufSize) -> qint32 {
-        auto videoSocket = m_server->getVideoSocket();
-        if (!videoSocket) {
-            return 0;
-        }
-
-        return videoSocket->subThreadRecvData(buf, bufSize);
-    }, this);
+    m_stream = new Stream(this);
 
     m_server = new Server(this);
     if (m_params.recordFile && !m_params.recordPath.trimmed().isEmpty()) {
@@ -191,7 +184,8 @@ void Device::initSignals()
                     m_decoder->open();
                 }
 
-                // init decoder
+                // init stream
+                m_stream->installVideoSocket(m_server->removeVideoSocket());
                 m_stream->startDecode();
 
                 // recv device msg

src/device/server/server.cpp

@@ -216,9 +216,11 @@ void Server::timerEvent(QTimerEvent *event)
     }
 }
 
-VideoSocket *Server::getVideoSocket()
+VideoSocket* Server::removeVideoSocket()
 {
-    return m_videoSocket;
+    VideoSocket* socket = m_videoSocket;
+    m_videoSocket = Q_NULLPTR;
+    return socket;
 }
 
 QTcpSocket *Server::getControlSocket()
@@ -234,10 +236,6 @@ void Server::stop()
         stopAcceptTimeoutTimer();
     }
 
-    if (m_videoSocket) {
-        m_videoSocket->close();
-        m_videoSocket->deleteLater();
-    }
     if (m_controlSocket) {
         m_controlSocket->close();
         m_controlSocket->deleteLater();

src/device/server/server.h

@@ -60,7 +60,7 @@ class Server : public QObject
     void stop();
     bool isReverse();
     Server::ServerParams getParams();
-    VideoSocket *getVideoSocket();
+    VideoSocket *removeVideoSocket();
     QTcpSocket *getControlSocket();
 
 signals:

src/device/server/videosocket.cpp

@@ -2,80 +2,30 @@
 #include <QDebug>
 #include <QThread>
 
-#include "qscrcpyevent.h"
 #include "videosocket.h"
 
 VideoSocket::VideoSocket(QObject *parent) : QTcpSocket(parent)
 {
-    connect(this, &VideoSocket::readyRead, this, &VideoSocket::onReadyRead);
-    connect(this, &VideoSocket::aboutToClose, this, &VideoSocket::quitNotify);
-    connect(this, &VideoSocket::disconnected, this, &VideoSocket::quitNotify);
 }
 
 VideoSocket::~VideoSocket()
 {
-    quitNotify();
 }
 
 qint32 VideoSocket::subThreadRecvData(quint8 *buf, qint32 bufSize)
 {
-    // this function cant call in main thread
-    Q_ASSERT(QCoreApplication::instance()->thread() != QThread::currentThread());
-    if (m_quit) {
+    if (!buf) {
         return 0;
     }
-    QMutexLocker locker(&m_mutex);
-
-    m_buffer = buf;
-    m_bufferSize = bufSize;
-    m_dataSize = 0;
-
-    // post event
-    VideoSocketEvent *getDataEvent = new VideoSocketEvent();
-    QCoreApplication::postEvent(this, getDataEvent);
-
-    // wait
-    while (!m_recvData) {
-        m_recvDataCond.wait(&m_mutex);
-    }
-
-    m_recvData = false;
-    return m_dataSize;
-}
-
-bool VideoSocket::event(QEvent *event)
-{
-    if (static_cast<QScrcpyEvent::Type>(event->type()) == QScrcpyEvent::VideoSocket) {
-        onReadyRead();
-        return true;
-    }
-    return QTcpSocket::event(event);
-}
-
-void VideoSocket::onReadyRead()
-{
-    QMutexLocker locker(&m_mutex);
-    if (m_buffer && m_bufferSize <= bytesAvailable()) {
-        // recv data
-        qint64 readSize = qMin(bytesAvailable(), (qint64)m_bufferSize);
-        m_dataSize = read((char *)m_buffer, readSize);
+    // this function cant call in main thread
+    Q_ASSERT(QCoreApplication::instance()->thread() != QThread::currentThread());
 
-        m_buffer = Q_NULLPTR;
-        m_bufferSize = 0;
-        m_recvData = true;
-        m_recvDataCond.wakeOne();
+    while (bytesAvailable() < bufSize) {
+        if (!waitForReadyRead(-1)) {
+            return 0;
+        }
     }
-}
 
-void VideoSocket::quitNotify()
-{
-    m_quit = true;
-    QMutexLocker locker(&m_mutex);
-    if (m_buffer) {
-        m_buffer = Q_NULLPTR;
-        m_bufferSize = 0;
-        m_recvData = true;
-        m_dataSize = 0;
-        m_recvDataCond.wakeOne();
-    }
+    // recv data
+    return read((char *)buf, bufSize);
 }

src/device/server/videosocket.h

@@ -1,10 +1,7 @@
 #ifndef VIDEOSOCKET_H
 #define VIDEOSOCKET_H
 
-#include <QEvent>
-#include <QMutex>
 #include <QTcpSocket>
-#include <QWaitCondition>
 
 class VideoSocket : public QTcpSocket
 {
@@ -14,22 +11,6 @@ class VideoSocket : public QTcpSocket
     virtual ~VideoSocket();
 
     qint32 subThreadRecvData(quint8 *buf, qint32 bufSize);
-
-protected:
-    bool event(QEvent *event);
-
-protected slots:
-    void onReadyRead();
-    void quitNotify();
-
-private:
-    QMutex m_mutex;
-    QWaitCondition m_recvDataCond;
-    bool m_recvData = false;
-    quint8 *m_buffer = Q_NULLPTR;
-    qint32 m_bufferSize = 0;
-    qint32 m_dataSize = 0;
-    bool m_quit = false;
 };
 
 #endif // VIDEOSOCKET_H

src/device/stream/stream.cpp

@@ -3,19 +3,25 @@
 
 #include "compat.h"
 #include "stream.h"
+#include "videosocket.h"
 
 #define BUFSIZE 0x10000
 #define HEADER_SIZE 12
 #define NO_PTS UINT64_MAX
 
 typedef qint32 (*ReadPacketFunc)(void *, quint8 *, qint32);
 
-Stream::Stream(std::function<qint32(quint8*, qint32)> recvData, QObject *parent)
+Stream::Stream(QObject *parent)
     : QThread(parent)
-    , m_recvData(recvData)
 {}
 
-Stream::~Stream() {}
+Stream::~Stream() {
+    if (m_videoSocket) {
+        m_videoSocket->close();
+        delete m_videoSocket;
+        m_videoSocket = Q_NULLPTR;
+    }
+}
 
 static void avLogCallback(void *avcl, int level, const char *fmt, va_list vl)
 {
@@ -64,6 +70,12 @@ void Stream::deInit()
     avformat_network_deinit(); // ignore failure
 }
 
+void Stream::installVideoSocket(VideoSocket *videoSocket)
+{
+    videoSocket->moveToThread(this);
+    m_videoSocket = videoSocket;
+}
+
 static quint32 bufferRead32be(quint8 *buf)
 {
     return static_cast<quint32>((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]);
@@ -78,17 +90,17 @@ static quint64 bufferRead64be(quint8 *buf)
 
 qint32 Stream::recvData(quint8 *buf, qint32 bufSize)
 {
-    if (!buf || !m_recvData) {
+    if (!buf || !m_videoSocket) {
         return 0;
     }
 
-    qint32 len = m_recvData(buf, bufSize);
+    qint32 len = m_videoSocket->subThreadRecvData(buf, bufSize);
     return len;
 }
 
 bool Stream::startDecode()
 {
-    if (!m_recvData) {
+    if (!m_videoSocket) {
         return false;
     }
     start();

src/device/stream/stream.h

@@ -10,17 +10,19 @@ extern "C"
 #include "libavformat/avformat.h"
 }
 
+class VideoSocket;
 class Stream : public QThread
 {
     Q_OBJECT
 public:
-    Stream(std::function<qint32(quint8*, qint32)> recvData, QObject *parent = Q_NULLPTR);
+    Stream(QObject *parent = Q_NULLPTR);
     virtual ~Stream();
 
 public:
     static bool init();
     static void deInit();
 
+    void installVideoSocket(VideoSocket* videoSocket);
     bool startDecode();
     void stopDecode();
 
@@ -39,7 +41,7 @@ class Stream : public QThread
     qint32 recvData(quint8 *buf, qint32 bufSize);
 
 private:
-    std::function<qint32(quint8*, qint32)> m_recvData = nullptr;
+    QPointer<VideoSocket> m_videoSocket = Q_NULLPTR;
 
     AVCodecContext *m_codecCtx = Q_NULLPTR;
     AVCodecParserContext *m_parser = Q_NULLPTR;