fix: 隐藏吊舱拉流tcp和udp切换方式(tcp方式会导致吊舱拉流中断)

PayloadAPP.pro

@@ -14,7 +14,7 @@ QMAKE_PROJECT_DEPTH = 0
 # QMAKE_LFLAGS += /MANIFESTUAC:\"level=\'requireAdministrator\' uiAccess=\'false\'\"
 
 #程序版本
-VERSION = 1.0.0.1009
+VERSION = 1.0.0.1010
 #程序版本
 QMAKE_TARGET_COMPANY = "HTSDFP"
 

Src/GDDC/gddcSet.cpp

@@ -9,6 +9,9 @@ GDDCSet::GDDCSet(QWidget *parent) : QWidget(parent), ui(new Ui::GDDCSet) {
   initWindow();
   initParam();
   initUDPSocket();
+
+  ui->label_3->setVisible(false);
+  ui->comboBox_streamType->setVisible(false);
 }
 
 GDDCSet::~GDDCSet() { delete ui; }

Src/GDDC/gddcSet.ui

@@ -32,10 +32,13 @@
     <set>Qt::AlignCenter</set>
    </property>
    <widget class="QLabel" name="label_3">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>510</x>
-      <y>60</y>
+      <y>30</y>
       <width>51</width>
       <height>21</height>
      </rect>
@@ -45,14 +48,20 @@
     </property>
    </widget>
    <widget class="QComboBox" name="comboBox_streamType">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>560</x>
-      <y>60</y>
+      <y>30</y>
       <width>61</width>
       <height>23</height>
      </rect>
     </property>
+    <property name="frame">
+     <bool>true</bool>
+    </property>
    </widget>
    <widget class="QLabel" name="label_4">
     <property name="geometry">
@@ -85,7 +94,7 @@
      <rect>
       <x>80</x>
       <y>60</y>
-      <width>301</width>
+      <width>421</width>
       <height>23</height>
      </rect>
     </property>
@@ -170,7 +179,7 @@
      <rect>
       <x>80</x>
       <y>100</y>
-      <width>411</width>
+      <width>421</width>
       <height>23</height>
      </rect>
     </property>
@@ -207,9 +216,9 @@
    <widget class="QSpinBox" name="uavIDSpinBox">
     <property name="geometry">
      <rect>
-      <x>570</x>
+      <x>560</x>
       <y>100</y>
-      <width>51</width>
+      <width>61</width>
       <height>23</height>
      </rect>
     </property>
@@ -226,7 +235,7 @@
    <widget class="QLabel" name="label_16">
     <property name="geometry">
      <rect>
-      <x>390</x>
+      <x>510</x>
       <y>60</y>
       <width>51</width>
       <height>21</height>
@@ -239,7 +248,7 @@
    <widget class="QComboBox" name="comboBox_streamSource">
     <property name="geometry">
      <rect>
-      <x>440</x>
+      <x>560</x>
       <y>60</y>
       <width>61</width>
       <height>23</height>

Src/Video/cffmpeg_decode.cpp

@@ -69,21 +69,31 @@ bool Cffmpeg_decode::open_input_file() {
   //========================解码============================
   AVDictionary *avdic = NULL;
   // 如果设置失败，则设置UDP传输
-  if (m_rtsp_transport == "udp")
+  // if (m_rtsp_transport == "udp")
-    av_dict_set(&avdic, "rtsp_transport", "udp", 0);
+  //   av_dict_set(&avdic, "rtsp_transport", "udp", 0);
-  else
+  // else
-    av_dict_set(&avdic, "rtsp_transport", "tcp", 0);
+  //   av_dict_set(&avdic, "rtsp_transport", "tcp",
+  //   0);//注：设置tcp会导致吊舱拉流中断
+  // av_dict_set(&avdic, "rtsp_transport", "udp", 0);
   // 设置缓存大小，1080p可将值调大
-  av_dict_set(&avdic, "buffer_size", "4096000", 0);
+  av_dict_set(&avdic, "buffer_size", "2048000", 0);
   // 设置超时断开连接时间，单位微秒//listen_timeout
   // av_dict_set(&avdic, "listen_timeout", "200000", 0);
-  av_dict_set(&avdic, "stimeout", "3000000", 0); // 设置超时3秒
+  av_dict_set(&avdic, "stimeout", "5000000", 0); // 设置超时5秒
   av_dict_set(&avdic, "max_delay", "300000", 0); // 设置最大时延300ms
   av_dict_set(&avdic, "tune", "zerolatency", 0); // 实时编码
   av_dict_set(&avdic, "preset", "faster", 0);    // ultrafast
   av_dict_set(&avdic, "threads", "auto", 0);     // 自动开启线程数
 
+  // av_dict_set(&avdic, "rtsp_flags", "prefer_tcp", 0); // 保持TCP连接
+  // av_dict_set(&avdic, "timeout", "500000", 0);     // 超时时间设置为500ms
+  // av_dict_set(&avdic, "probesize", "50000000", 0); // 增加探针大小，1MB
+  // av_dict_set(&avdic, "analyzeduration", "5000000", 0); //
+  // 增加分析持续时间，5秒
+
+  // 打开输入流之前，设置非阻塞模式
   inputFormatCtx->flags |= AVFMT_FLAG_NONBLOCK;
+  // inputFormatCtx->probesize = 50000000;
 
   // 打开输入流
   if (avformat_open_input(&inputFormatCtx, _url.toUtf8().data(), NULL, &avdic) <
@@ -186,8 +196,17 @@ void Cffmpeg_decode::run() {
   // 推流使用
   firstDts = AV_NOPTS_VALUE; // 初始化第一帧的DTS
   startTime = av_gettime();
+  int ret11 = 0;
   // 读取数据包
-  while (av_read_frame(inputFormatCtx, inputPacket) >= 0) {
+  while ((ret11 = av_read_frame(inputFormatCtx, inputPacket)) >= 0) {
+    // ret = av_read_frame(inputFormatCtx, inputPacket);
+    // if (ret < 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
+    //   qDebug() << "ret:" << QString::number(ret);
+    //   av_packet_unref(inputPacket);
+    //   frm_cnt++;
+    //   continue;
+    // }
+
     if (IsstopPlay) {
       qDebug() << "video play stop";
       break;
@@ -295,6 +314,9 @@ void Cffmpeg_decode::run() {
   if (m_saveVideoFlag) {
     saveDone();
   }
+  if (ret11 == AVERROR_EOF && errno == 0) {
+    qDebug() << "ret:";
+  }
   // QCoreApplication::processEvents();
   qDebug() << "All video play done";
 }

Src/Video/ffmpegpushstream.cpp

@@ -26,6 +26,7 @@ int FFmpegPushStream::openNetworkStream(AVFormatContext *inputFormatCtx) {
   }
   // 复制流信息
   for (unsigned int i = 0; i < inputFormatCtx->nb_streams; ++i) {
+    // AVStream *stream = inputFormatCtx->streams[i];
     if (inputFormatCtx->streams[i]->codecpar->codec_type ==
         AVMEDIA_TYPE_VIDEO) {
       AVStream *inputStream = inputFormatCtx->streams[i];

global.cpp

@@ -2,7 +2,7 @@
 
 global::global() {}
 
-QString g_SoftwareVersion = "版本号：V1.0.0.1009";
+QString g_SoftwareVersion = "版本号：V1.0.0.1010";
 
 QColor g_themeColor(51, 51, 51);
 QString g_PushBtnStyle = /**正常情况下样式**/