[merge]合并拉流与域名更改

Src/Video/cffmpeg_decode.cpp

@@ -80,11 +80,11 @@ bool Cffmpeg_decode::open_input_file() {
   //   0);//注：设置tcp会导致吊舱拉流中断
   // av_dict_set(&avdic, "rtsp_transport", "udp", 0);
   // 设置缓存大小，1080p可将值调大
-  av_dict_set(&avdic, "buffer_size", "2048000", 0);
+  av_dict_set(&avdic, "buffer_size", "4096000", 0);
   // 设置超时断开连接时间，单位微秒//listen_timeout
   // av_dict_set(&avdic, "listen_timeout", "200000", 0);
   av_dict_set(&avdic, "stimeout", "5000000", 0); // 设置超时5秒
-  av_dict_set(&avdic, "max_delay", "300000", 0); // 设置最大时延300ms
+  // 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);     // 自动开启线程数
@@ -93,11 +93,13 @@ bool Cffmpeg_decode::open_input_file() {
 
   // av_dict_set(&avdic, "reconnect", "1", 0); // 开启自动重连
   // av_dict_set(&avdic, "reconnect_streamed", "1", 0); // 对于流媒体自动重连
-  // av_dict_set(&avdic, "reconnect_delay_max", "5", 0); // 最大重连延时 5 秒
+  av_dict_set(&avdic, "reconnect_delay_max", "5",
+              0); // 最大重连延时 5 秒f'f'f'f'f'f'f'f'f'f'f
   // 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); //
+  // av_dict_set(&avdic, "keepalive", "1", 0);
   // 增加分析持续时间，5秒
 
   // 打开输入流之前，设置非阻塞模式

Src/Video/ffmpegpushstream.cpp

@@ -9,6 +9,7 @@ FFmpegPushStream::FFmpegPushStream(QObject *parent) : QObject{parent} {}
 void FFmpegPushStream::setRemoteIP(QString url) { pushStreamIP = url; }
 
 int FFmpegPushStream::openNetworkStream(AVFormatContext *inputFormatCtx) {
+  mInitStatus = false;
   if (pushStreamIP.isEmpty())
     return -1;
 
@@ -67,10 +68,34 @@ int FFmpegPushStream::openNetworkStream(AVFormatContext *inputFormatCtx) {
   }
   mInitStatus = true;
   this->inputFormatCtx = inputFormatCtx;
-  startTime = av_gettime_relative();
+  // startTime = av_gettime_relative();
   return 1;
 }
 
+int FFmpegPushStream::reconnect(int ret) {
+  if (ret == AVERROR(EPIPE) || ret == AVERROR(ECONNRESET)) {
+    // int nRetryCount = 0;
+    for (int nRetryCount = 0; nRetryCount < MAXCONNECT; ++nRetryCount) {
+      // 关闭输出
+      if (outputFormatCtx && !(outputFormatCtx->flags & AVFMT_NOFILE)) {
+        avio_close(outputFormatCtx->pb);
+      }
+      // Try to reconnect
+      ret = avformat_write_header(outputFormatCtx, nullptr);
+      if (ret < 0) {
+        qDebug() << "Failed to reconnect" << QString::number(nRetryCount + 1);
+        // nRetryCount++;
+        av_usleep(5 * 1000000);
+      } else {
+        mInitStatus = true;
+        return ret;
+      }
+    }
+    mInitStatus = false;
+    return -1;
+  }
+}
+
 /**
  * @brief 推流
  * @param pkt: 未解码帧
@@ -81,11 +106,16 @@ int FFmpegPushStream::openNetworkStream(AVFormatContext *inputFormatCtx) {
  */
 int FFmpegPushStream::pushStream(AVPacket *pkt, int frm_cnt, int64_t startTime,
                                  int64_t firstDts) {
-  if (!mInitStatus)
+  // qDebug() << "receive packet";
+  if (!mInitStatus) {
+    av_packet_unref(pkt);
     return -1;
+  }
 
-  if (pkt->dts <= 0)
+  if (pkt->dts <= 0) {
+    av_packet_unref(pkt);
     return -1;
+  }
   // qDebug() << "******推流" << QString::number(frm_cnt++);
   int inputStreamIndex = pkt->stream_index;
   int outputStreamIndex = 0;
@@ -115,8 +145,8 @@ int FFmpegPushStream::pushStream(AVPacket *pkt, int frm_cnt, int64_t startTime,
   auto now_time = av_gettime() - startTime; // 获取差值
   int64_t delay = streamTime - now_time;
   if (delay > 0) {
-    // qDebug() << "****************sleep time:" << QString::number(delay /
+    qDebug() << "****************PushStream sleep time:"
-    // 1000);
+             << QString::number(delay / 1000);
     av_usleep(delay);
   }
 
@@ -137,6 +167,7 @@ int FFmpegPushStream::pushStream(AVPacket *pkt, int frm_cnt, int64_t startTime,
       (int64_t)av_rescale_q(pkt->duration, istream_base, ostream_base);
   pkt->pos = -1;
   if (pkt->pts < pkt->dts) {
+    av_packet_unref(pkt);
     return 1;
   }
 
@@ -144,6 +175,14 @@ int FFmpegPushStream::pushStream(AVPacket *pkt, int frm_cnt, int64_t startTime,
   pkt->stream_index = 0;
   int ret = av_interleaved_write_frame(outputFormatCtx, pkt);
   if (ret < 0) {
+    // if (ret == -10053) {
+    //   qDebug() << "网络不稳定";
+    // }
+    // if (ret == AVERROR(EPIPE) || ret == AVERROR(ECONNRESET)) {
+    //   qDebug() << "网络不稳定1";
+    // }
+    // reconnect(ret);
+    av_packet_unref(pkt);
     return ret;
   }
   // 数据包写入成功，现在可以释放pkt

Src/Video/ffmpegpushstream.h

@@ -23,11 +23,15 @@ private:
   QString pushStreamIP; // 推流地址
   bool mInitStatus = false;
   int64_t startTime;
+  int MAXCONNECT = 12;
 public slots:
   int pushStream(AVPacket *pkt, int frm_cnt, int64_t startTime,
                  int64_t firstDts);
   void stopPush();
   int openNetworkStream(AVFormatContext *inputFormatCtx);
+
+private:
+  int reconnect(int ret);
 };
 
 #endif // FFMPEGPUSHSTREAM_H

global.cpp

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