Fix Minor Bugs in Linux

Fix a small issue that pointer to audio output device in Linux can't de deleted, or it will cause crashes.
zty199 · Mar 12, 2021 · 8ad1fe3 · 8ad1fe3
1 parent c60e54c
commit 8ad1fe3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/UDPMulticast/mainwindow.cpp b/src/UDPMulticast/mainwindow.cpp
@@ -260,7 +260,7 @@ void MainWindow::on_videoFrameChanged(QVideoFrame frame)
 #elif defined Q_OS_LINUX
     image = image.mirrored(false, false);   // 左右/上下镜像
 #endif
-    image.scaled(image.size().boundedTo(QSize(1280, 720)), Qt::KeepAspectRatio, Qt::SmoothTransformation); // 分辨率高于 1080p 则压缩
+    image.scaled(image.size().boundedTo(QSize(1280, 720)), Qt::KeepAspectRatio, Qt::SmoothTransformation); // 分辨率高于 720p 则压缩
 
     // 本地窗口预览
     ui->videoViewer->setPixmap(QPixmap::fromImage(image).scaled(ui->videoViewer->size(), Qt::KeepAspectRatio, Qt::FastTransformation));
@@ -295,9 +295,10 @@ void MainWindow::on_videoFrameChanged(QVideoFrame frame)
             len = UDP_MAX_SIZE;
         }
 
-        if((res = video_socket->writeDatagram(byteArray.data() + sentBytes, len, groupAddress, video_port)) != len)
+        res = video_socket->writeDatagram(byteArray.data() + sentBytes, len, groupAddress, video_port);
+        if(res < 0)
         {
-            qDebug() << "res = " << res << " sentBytes = " << len;
+            qDebug() << "video_socket: Write Datagram Failed!";
             break;
         }
         video_socket->waitForBytesWritten();
@@ -373,9 +374,10 @@ void MainWindow::on_timeOut()
             len = UDP_MAX_SIZE;
         }
 
-        if((res = video_socket->writeDatagram(byteArray.data() + sentBytes, len, groupAddress, video_port)) != len)
+        res = video_socket->writeDatagram(byteArray.data() + sentBytes, len, groupAddress, video_port);
+        if(res < 0)
         {
-            qDebug() << "res = " << res << " sentBytes = " << len;
+            qDebug() << "video_socket: Write Datagram Failed!";
             break;
         }
         video_socket->waitForBytesWritten();
@@ -459,9 +461,10 @@ void MainWindow::on_deviceReadyRead()
             len = UDP_MAX_SIZE;
         }
 
-        if((res = audio_socket->writeDatagram(reinterpret_cast<const char *>(&vp) + sentBytes, len, groupAddress, audio_port)) != len)
+        res = audio_socket->writeDatagram(reinterpret_cast<const char *>(&vp) + sentBytes, len, groupAddress, audio_port);
+        if(res < 0)
         {
-            qDebug() << "res = " << res << " sentBytes = " << len;
+            qDebug() << "audio_socket: Write Datagram Failed!";
             break;
         }
         audio_socket->waitForBytesWritten();

diff --git a/src/UDPReceiver/mainwindow.cpp b/src/UDPReceiver/mainwindow.cpp
@@ -93,6 +93,11 @@ void MainWindow::on_videoReadyRead()
     QByteArray byteArray;
     byteArray.resize(static_cast<int>(video_socket->pendingDatagramSize()));
     res = video_socket->readDatagram(byteArray.data(), video_socket->pendingDatagramSize());
+    if(res < 0)
+    {
+        qDebug() << "video_socket: Read Datagram Failed!";
+        return;
+    }
 
     // 接收到停止信号则清空画面
     if(QString(byteArray) == "Stop")
@@ -171,7 +176,11 @@ void MainWindow::on_cb_device_currentIndexChanged(int index)
         format = info.nearestFormat(this->format);
     }
 
-    delete m_audioOutput;
+    /*
+     * 删除旧音频输出设备并新建设备，
+     * 在 Linux 上会引起程序异常结束，原因未知
+     */
+    // delete m_audioOutput;
     m_audioOutput = new QAudioOutput(info, format, this);
 
     if(flag_audio)
@@ -199,6 +208,11 @@ void MainWindow::on_audioReadyRead()
     QByteArray byteArray;
     byteArray.resize(static_cast<int>(audio_socket->pendingDatagramSize()));
     res = audio_socket->readDatagram(byteArray.data(), audio_socket->pendingDatagramSize());
+    if(res < 0)
+    {
+        qDebug() << "audio_socket: Read Datagram Failed!";
+        return;
+    }
 
     // 接收到开始信号则清空上个数据包并准备写入新的数据包
     if(QString(byteArray) == "Begin")