504-Software-Development-Group
/
VideoClient98
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复视频流重连bug

Browse Source
zpx
cbwu 2 months ago
parent 07deb10cb4
commit 9cd84530eb
10 changed files with 168 additions and 35 deletions
Show Stats Download Patch File Download Diff File

60
src/video/avpacketqueuemanager.cpp
Unescape Escape View File

@ -95,3 +95,63 @@ bool AVPacketQueueManager::isEmptySeekQueue() {
QMutexLocker locker(&m_seekMutex); QMutexLocker locker(&m_seekMutex);
return m_seekQueue.isEmpty(); return m_seekQueue.isEmpty();
} }
void AVPacketQueueManager::waitForStreamDecoderClosed()
{
if(!m_isDecodeEnd){
m_waitCloseStreamDecoderMutex.lock();
qDebug()<<"waitForStreamDecoderClosed0";
m_condition.wait(&m_waitCloseStreamDecoderMutex);
m_waitCloseStreamDecoderMutex.unlock();
qDebug()<<"waitForStreamDecoderClosed1";
}
}
void AVPacketQueueManager::waitForStreamSaverClosed()
{
if(!m_isStreamSaverEnd){
m_waitCloseStreamSaverMutex.lock();
qDebug()<<"waitForStreamSaverClosed0";
m_condition.wait(&m_waitCloseStreamSaverMutex);
m_waitCloseStreamSaverMutex.unlock();
qDebug()<<"waitForStreamSaverClosed1";
}
}
void AVPacketQueueManager::waitForStreamPusherClosed()
{
if(!m_isStreamPusherEnd){
m_waitCloseStreamPusherMutex.lock();
qDebug()<<"waitForStreamPusherClosed0";
m_condition.wait(&m_waitCloseStreamPusherMutex);
m_waitCloseStreamPusherMutex.unlock();
qDebug()<<"waitForStreamPusherClosed1";
}
}
void AVPacketQueueManager::wakeStreamDecoder()
{
m_waitCloseStreamDecoderMutex.lock();
qDebug()<<"wakeStreamDecoder0";
m_condition.wakeAll();
m_waitCloseStreamDecoderMutex.unlock();
qDebug()<<"wakeStreamDecoder1";
}
void AVPacketQueueManager::wakeStreamSaver()
{
m_waitCloseStreamSaverMutex.lock();
qDebug()<<"wakeStreamSaver0";
m_condition.wakeAll();
m_waitCloseStreamSaverMutex.unlock();
qDebug()<<"wakeStreamSaver1";
}
void AVPacketQueueManager::wakeStreamPusher()
{
m_waitCloseStreamPusherMutex.lock();
m_condition.wakeAll();
qDebug()<<"wakeStreamPusher0";
m_waitCloseStreamPusherMutex.unlock();
qDebug()<<"wakeStreamPusher1";
}

19
src/video/avpacketqueuemanager.h
Unescape Escape View File

@ -3,6 +3,7 @@
#include <QMutex> #include <QMutex>
#include <QQueue> #include <QQueue>
#include <QWaitCondition>
#include "ffmpeginclude.h" #include "ffmpeginclude.h"
@ -29,11 +30,22 @@ public:
bool isEmptySaveQueue(); bool isEmptySaveQueue();
bool isEmptySeekQueue(); bool isEmptySeekQueue();
void waitForStreamDecoderClosed();
void waitForStreamSaverClosed();
void waitForStreamPusherClosed();
void wakeStreamDecoder();
void wakeStreamSaver();
void wakeStreamPusher();
public: public:
std::atomic<bool> m_isSeeking{false}; // 是否正在跳转 std::atomic<bool> m_isSeeking{false}; // 是否正在跳转
std::atomic<bool> m_isReadEnd{false}; std::atomic<bool> m_isReadEnd{false};
std::atomic<bool> m_isDecodeEnd{false}; std::atomic<bool> m_isDecodeEnd{false};
std::atomic<bool> m_isStreamSaverEnd{false};
std::atomic<bool> m_isStreamPusherEnd{false};
std::atomic<bool> m_isPullReconnect{false};
std::atomic<bool> m_isPushReconnect{false};
private: private:
int QUEUECAPACITY = 100; int QUEUECAPACITY = 100;
QQueue<AVPacket*> m_decodeQueue; QQueue<AVPacket*> m_decodeQueue;
@ -44,6 +56,11 @@ private:
QMutex m_saveMutex; // 共享的互斥锁 QMutex m_saveMutex; // 共享的互斥锁
QMutex m_pushMutex; // 共享的互斥锁 QMutex m_pushMutex; // 共享的互斥锁
QMutex m_seekMutex; // 共享的互斥锁 QMutex m_seekMutex; // 共享的互斥锁
private:
QWaitCondition m_condition;
QMutex m_waitCloseStreamDecoderMutex;
QMutex m_waitCloseStreamSaverMutex;
QMutex m_waitCloseStreamPusherMutex;
}; };
#endif // AVPACKETQUEUEMANAGER_H #endif // AVPACKETQUEUEMANAGER_H

17
src/video/decodestream.cpp
Unescape Escape View File

@ -1,6 +1,9 @@
#include "decodestream.h" #include "decodestream.h"
DecodeStream::DecodeStream(QObject *parent) : QObject{parent}, m_playSpeed{1} {} DecodeStream::DecodeStream(QObject *parent) : QObject{parent}, m_playSpeed{1} {
connect(this,&DecodeStream::initStreamDecoderSignal,this,&DecodeStream::init,Qt::BlockingQueuedConnection);
connect(this,&DecodeStream::initUDPStreamDecoderSignal,this,&DecodeStream::initUDPDecodeStream,Qt::BlockingQueuedConnection);
}
bool DecodeStream::init(AVPacketQueueManager *queueManager, bool DecodeStream::init(AVPacketQueueManager *queueManager,
AVFormatContext *formatContext, int videoIndex) { AVFormatContext *formatContext, int videoIndex) {
@ -22,13 +25,14 @@ bool DecodeStream::init(AVPacketQueueManager *queueManager,
if (m_fps <= 0) { if (m_fps <= 0) {
m_fps = 30.0; // 默认帧率 m_fps = 30.0; // 默认帧率
} }
initStatus = initDecoder(formatContext, videoIndex);
return initDecoder(formatContext, videoIndex); return initStatus;
} }
bool DecodeStream::init(AVPacketQueueManager *queueManager) { bool DecodeStream::initUDPDecodeStream(AVPacketQueueManager *queueManager) {
m_queueManager = queueManager; m_queueManager = queueManager;
return initUDPDecoder(); initStatus = initUDPDecoder();
return initStatus;
} }
// 视频解码线程任务 // 视频解码线程任务
@ -142,9 +146,12 @@ void DecodeStream::startDecode() {
} }
free(); free();
m_queueManager->m_isDecodeEnd = true;
m_queueManager->wakeStreamDecoder();
qDebug() << "Decoding Thread End!"; qDebug() << "Decoding Thread End!";
emit decodeEndSignal(); emit decodeEndSignal();
emit sendErrorMessageSignal("视频解码结束!", 1); emit sendErrorMessageSignal("视频解码结束!", 1);
} }
void DecodeStream::changePlaySpeedSlot(double speed) { void DecodeStream::changePlaySpeedSlot(double speed) {

10
src/video/decodestream.h
Unescape Escape View File

@ -18,7 +18,7 @@ public:
DecodeStream(QObject *parent = nullptr); DecodeStream(QObject *parent = nullptr);
bool init(AVPacketQueueManager *queueManager, bool init(AVPacketQueueManager *queueManager,
AVFormatContext *formatContext, int videoIndex); AVFormatContext *formatContext, int videoIndex);
bool init(AVPacketQueueManager *queueManager); bool initUDPDecodeStream(AVPacketQueueManager *queueManager);
void close(); void close();
AVCodecContext *getCodecContext(); AVCodecContext *getCodecContext();
AVCodecParserContext *getParserContext(); AVCodecParserContext *getParserContext();
@ -31,7 +31,11 @@ signals:
void sendErrorMessageSignal(QString message, int type); void sendErrorMessageSignal(QString message, int type);
void updateVideoCurrentTime(int currentTime, int duration); void updateVideoCurrentTime(int currentTime, int duration);
void decodeEndSignal(); void decodeEndSignal();
void initUDPStreamDecoderSignal(AVPacketQueueManager *queueManager);
void initStreamDecoderSignal(AVPacketQueueManager *queueManager,
AVFormatContext *formatContext, int videoIndex);
public:
bool initStatus = false;
private: private:
bool initObject(); // 初始化对象 bool initObject(); // 初始化对象
bool initDecoder(AVFormatContext *inputFormatContext, bool initDecoder(AVFormatContext *inputFormatContext,
@ -44,7 +48,7 @@ private:
bool isValidAVPacket(AVPacket *pkt); bool isValidAVPacket(AVPacket *pkt);
private: private:
bool m_start = true; std::atomic<bool>m_start = true;
int m_videoIndex = 0; int m_videoIndex = 0;
AVFormatContext *m_formatContext = nullptr; AVFormatContext *m_formatContext = nullptr;
AVCodecContext *m_codecContext = nullptr; // 解码器上下文 AVCodecContext *m_codecContext = nullptr; // 解码器上下文

1
src/video/ffmpeginclude.h
Unescape Escape View File

@ -22,7 +22,6 @@ extern "C" {
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QEventLoop> #include <QEventLoop>
// #include "global.h"
#define PRINT_LOG 1 #define PRINT_LOG 1
#define ERROR_LEN 1024 // 异常信息数组长度 #define ERROR_LEN 1024 // 异常信息数组长度

25
src/video/pushstream.cpp
Unescape Escape View File

@ -1,6 +1,8 @@
#include "pushstream.h" #include "pushstream.h"
PushStream::PushStream(QObject *parent) : QObject{parent} {} PushStream::PushStream(QObject *parent) : QObject{parent} {
connect(this,&PushStream::initStreamPusherSignal,this,&PushStream::init,Qt::BlockingQueuedConnection);
}
void PushStream::setRemoteIP(QString url) { void PushStream::setRemoteIP(QString url) {
m_pushStreamIP = url; m_pushStreamIP = url;
@ -8,10 +10,12 @@ void PushStream::setRemoteIP(QString url) {
bool PushStream::init(AVFormatContext *inputFormatCtx, bool PushStream::init(AVFormatContext *inputFormatCtx,
AVPacketQueueManager *queueManager) { AVPacketQueueManager *queueManager) {
qDebug() << "PushStream::init ThreadID:" << QThread::currentThreadId();
// m_pusherQueue = queue; // m_pusherQueue = queue;
m_queueManager = queueManager; m_queueManager = queueManager;
m_inputFormatCtx = inputFormatCtx; m_inputFormatCtx = inputFormatCtx;
m_start = openNetworkStream(inputFormatCtx); m_start = openNetworkStream(inputFormatCtx);
initStatus = m_start;
return m_start; return m_start;
} }
@ -71,7 +75,7 @@ bool PushStream::openNetworkStream(AVFormatContext *inputFormatCtx) {
m_inputTimeBase = m_istream->time_base; m_inputTimeBase = m_istream->time_base;
m_inputFrameRate = m_istream->r_frame_rate; m_inputFrameRate = m_istream->r_frame_rate;
m_outputTimeBase = m_istream->time_base;
// 打开输出文件 // 打开输出文件
if (!(m_outputFormatCtx->flags & AVFMT_NOFILE)) { if (!(m_outputFormatCtx->flags & AVFMT_NOFILE)) {
@ -97,16 +101,24 @@ bool PushStream::openNetworkStream(AVFormatContext *inputFormatCtx) {
// m_InitStatus = true; // m_InitStatus = true;
// startTime = av_gettime_relative(); // startTime = av_gettime_relative();
m_outputTimeBase = m_ostream->time_base;
m_bwriteHeader = true; m_bwriteHeader = true;
m_firstPts = AV_NOPTS_VALUE; m_firstPts = AV_NOPTS_VALUE;
return true; return true;
} }
int PushStream::reconnect(int ret) { int PushStream::reconnect(int ret) {
if(!m_queueManager->m_isPullReconnect) return 0;
if (ret == -10053 || ret == -10054) { if (ret == -10053 || ret == -10054) {
m_queueManager->m_isPushReconnect = true;
m_end = false; m_end = false;
// qDebug() << "m_end:" << m_end; // qDebug() << "m_end:" << m_end;
for (int nRetryCount = 0; nRetryCount < MAXCONNECT; ++nRetryCount) { for (int nRetryCount = 0; nRetryCount < MAXCONNECT; ++nRetryCount) {
if(m_queueManager->m_isPullReconnect) {
break;
}
// 关闭输出 // 关闭输出
if (m_outputFormatCtx && if (m_outputFormatCtx &&
!(m_outputFormatCtx->flags & AVFMT_NOFILE)) { !(m_outputFormatCtx->flags & AVFMT_NOFILE)) {
@ -147,6 +159,8 @@ int PushStream::reconnect(int ret) {
emit sendErrorMessageSignal("重连成功!", 1); emit sendErrorMessageSignal("重连成功!", 1);
m_queueManager->clearPushQueue(); m_queueManager->clearPushQueue();
qDebug() << "重连成功!"; qDebug() << "重连成功!";
m_queueManager->m_isPushReconnect = false;
return ret; return ret;
} }
@ -155,6 +169,7 @@ int PushStream::reconnect(int ret) {
m_start = false; m_start = false;
m_bwriteHeader = false; m_bwriteHeader = false;
emit sendErrorMessageSignal("重连失败，推流停止!", 2); emit sendErrorMessageSignal("重连失败，推流停止!", 2);
m_queueManager->m_isPushReconnect = false;
return -1; return -1;
} }
return 0; return 0;
@ -163,6 +178,7 @@ int PushStream::reconnect(int ret) {
void PushStream::pushStream(int64_t startTime) { void PushStream::pushStream(int64_t startTime) {
qDebug() << "PushStreamThreadID:" << QThread::currentThreadId(); qDebug() << "PushStreamThreadID:" << QThread::currentThreadId();
// m_startTime = startTime; // m_startTime = startTime;
m_queueManager->m_isStreamPusherEnd = false;
while (m_start) { while (m_start) {
AVPacket *inputPacket = m_queueManager->dequeuePushPacket(); AVPacket *inputPacket = m_queueManager->dequeuePushPacket();
if (inputPacket) { if (inputPacket) {
@ -213,7 +229,7 @@ void PushStream::pushStream(int64_t startTime) {
// sleepMsec(40); // sleepMsec(40);
} else { } else {
if (delay < -100000) { if (delay < -100000) {
qDebug() << "delay:" << delay; qDebug() << "push delay:" << delay;
// 滞后100ms以上，丢弃非重要帧 // 滞后100ms以上，丢弃非重要帧
if (!(inputPacket->flags & AV_PKT_FLAG_KEY)) { if (!(inputPacket->flags & AV_PKT_FLAG_KEY)) {
av_packet_unref(inputPacket); av_packet_unref(inputPacket);
@ -262,8 +278,11 @@ void PushStream::pushStream(int64_t startTime) {
if (m_bwriteHeader) av_write_trailer(m_outputFormatCtx); if (m_bwriteHeader) av_write_trailer(m_outputFormatCtx);
free(); free();
m_queueManager->m_isStreamPusherEnd = true;
m_queueManager->wakeStreamPusher();
qDebug() << "Push Stream End!"; qDebug() << "Push Stream End!";
emit sendErrorMessageSignal("推流结束!", 1); emit sendErrorMessageSignal("推流结束!", 1);
} }
void PushStream::free() { void PushStream::free() {

10
src/video/pushstream.h
Unescape Escape View File

@ -18,20 +18,24 @@ public:
* @param url 远端推流地址 * @param url 远端推流地址
*/ */
void setRemoteIP(QString url); void setRemoteIP(QString url);
bool init(AVFormatContext *inputFormatCtx,
AVPacketQueueManager *queueManager);
void close(); void close();
public slots: public slots:
void pushStream(int64_t startTime); void pushStream(int64_t startTime);
bool init(AVFormatContext *inputFormatCtx,
AVPacketQueueManager *queueManager);
signals: signals:
void startPushStreamSignal(int64_t startTime); void startPushStreamSignal(int64_t startTime);
void sendErrorMessageSignal(QString message, int type); void sendErrorMessageSignal(QString message, int type);
void initStreamPusherSignal(AVFormatContext *inputFormatCtx,AVPacketQueueManager *queueManager);
private: private:
bool openNetworkStream(AVFormatContext *inputFormatCtx); bool openNetworkStream(AVFormatContext *inputFormatCtx);
int reconnect(int ret); int reconnect(int ret);
void free(); void free();
public:
bool initStatus = false;
private: private:
// QQueue<AVPacket *> *m_pusherQueue = nullptr; // QQueue<AVPacket *> *m_pusherQueue = nullptr;
AVFormatContext *m_inputFormatCtx = nullptr; // AVFormatContext *m_inputFormatCtx = nullptr; //

30
src/video/readstream.cpp
Unescape Escape View File

@ -105,8 +105,10 @@ bool ReadStream::setStreamDecoder(DecodeStream *decodeStreamer) {
// QMutexLocker locker(&m_mutex); // QMutexLocker locker(&m_mutex);
m_streamDecoder = decodeStreamer; m_streamDecoder = decodeStreamer;
m_queueManager.clearDecodeQueue(); m_queueManager.clearDecodeQueue();
m_decodeStreamFlag = m_streamDecoder->init( // m_decodeStreamFlag = m_streamDecoder->init(
&m_queueManager, m_formatContext, m_videoIndex); // &m_queueManager, m_formatContext, m_videoIndex);
m_streamDecoder->initStreamDecoderSignal(&m_queueManager, m_formatContext, m_videoIndex);
m_decodeStreamFlag = m_streamDecoder->initStatus;
if (m_decodeStreamFlag) emit decodeStreamer->startDecodeSignal(); if (m_decodeStreamFlag) emit decodeStreamer->startDecodeSignal();
return m_decodeStreamFlag; return m_decodeStreamFlag;
} else { } else {
@ -120,9 +122,11 @@ bool ReadStream::setUDPStreamDecoder(DecodeStream *decodeStreamer) {
// QMutexLocker locker(&m_mutex); // QMutexLocker locker(&m_mutex);
m_streamDecoder = decodeStreamer; m_streamDecoder = decodeStreamer;
m_queueManager.clearDecodeQueue(); m_queueManager.clearDecodeQueue();
m_decodeStreamFlag = m_streamDecoder->init(&m_queueManager); // m_decodeStreamFlag = m_streamDecoder->init(&m_queueManager);
// codec_ctx = m_streamDecoder->getCodecContext(); // codec_ctx = m_streamDecoder->getCodecContext();
// parser = m_streamDecoder->getParserContext(); // parser = m_streamDecoder->getParserContext();
m_streamDecoder->initUDPStreamDecoderSignal(&m_queueManager);
m_decodeStreamFlag = m_streamDecoder->initStatus;
if (m_decodeStreamFlag) emit decodeStreamer->startDecodeSignal(); if (m_decodeStreamFlag) emit decodeStreamer->startDecodeSignal();
return m_decodeStreamFlag; return m_decodeStreamFlag;
} else { } else {
@ -138,8 +142,10 @@ bool ReadStream::setStreamSaver(SaveStream *streamSaver, bool isUDP) {
if (isUDP) { if (isUDP) {
m_saveStreamFlag = m_streamSaver->initUDP(&m_queueManager); m_saveStreamFlag = m_streamSaver->initUDP(&m_queueManager);
} else { } else {
m_saveStreamFlag = m_streamSaver->init( // m_saveStreamFlag = m_streamSaver->init(
m_formatContext, &m_queueManager, m_videoIndex); // m_formatContext, &m_queueManager, m_videoIndex);
emit m_streamSaver->initStreamSaverSignal(m_formatContext, &m_queueManager, m_videoIndex);
m_saveStreamFlag = m_streamSaver->initStatus;
} }
return m_saveStreamFlag; return m_saveStreamFlag;
} else { } else {
@ -149,10 +155,13 @@ bool ReadStream::setStreamSaver(SaveStream *streamSaver, bool isUDP) {
} }
bool ReadStream::setStreamPusher(PushStream *streamPusher) { bool ReadStream::setStreamPusher(PushStream *streamPusher) {
qDebug() << "setStreamPusher ThreadID:" << QThread::currentThreadId();
if (streamPusher) { if (streamPusher) {
m_streamPusher = streamPusher; m_streamPusher = streamPusher;
m_queueManager.clearPushQueue(); m_queueManager.clearPushQueue();
m_pushStreamFlag = streamPusher->init(m_formatContext, &m_queueManager); emit streamPusher->initStreamPusherSignal(m_formatContext, &m_queueManager);
// m_pushStreamFlag = streamPusher->init(m_formatContext, &m_queueManager);
m_pushStreamFlag = m_streamPusher->initStatus;
if (m_pushStreamFlag) streamPusher->startPushStreamSignal(0); if (m_pushStreamFlag) streamPusher->startPushStreamSignal(0);
return m_pushStreamFlag; return m_pushStreamFlag;
} else { } else {
@ -471,21 +480,25 @@ void ReadStream::free() {
} }
bool ReadStream::reconnect() { bool ReadStream::reconnect() {
m_queueManager.m_isPullReconnect = true;
m_end = false; m_end = false;
if (m_streamDecoder) { if (m_streamDecoder) {
m_streamDecoder->close(); m_streamDecoder->close();
m_queueManager.waitForStreamDecoderClosed();
} }
if (m_streamSaver) { if (m_streamSaver) {
m_streamSaver->close(); m_streamSaver->close();
m_queueManager.waitForStreamSaverClosed();
} }
if (m_streamPusher) { if (m_streamPusher) {
m_streamPusher->close(); m_streamPusher->close();
m_queueManager.waitForStreamPusherClosed();
} }
qDebug()<<"all closed!";
free(); free();
for (int i = 0; i < MAXRECONNECT; ++i) { for (int i = 0; i < MAXRECONNECT; ++i) {
m_start = openFile(m_pullURL); m_start = openFile(m_pullURL);
if (m_start) { if (m_start) {
emit sendErrorMessageSignal("重连成功!", 1);
if (m_streamDecoder) { if (m_streamDecoder) {
setStreamDecoder(m_streamDecoder); setStreamDecoder(m_streamDecoder);
} }
@ -495,6 +508,8 @@ bool ReadStream::reconnect() {
if (m_streamPusher) { if (m_streamPusher) {
setStreamPusher(m_streamPusher); setStreamPusher(m_streamPusher);
} }
m_queueManager.m_isPullReconnect = false;
emit sendErrorMessageSignal("重连成功!", 1);
return true; return true;
} else { } else {
qDebug() << "reconnect failed:" << QString::number(i + 1); qDebug() << "reconnect failed:" << QString::number(i + 1);
@ -506,6 +521,7 @@ bool ReadStream::reconnect() {
if (m_end) break; if (m_end) break;
} }
emit sendErrorMessageSignal("重连失败!", 2); emit sendErrorMessageSignal("重连失败!", 2);
m_queueManager.m_isPullReconnect = false;
return false; return false;
} }

25
src/video/savestream.cpp
Unescape Escape View File

@ -1,6 +1,8 @@
#include "savestream.h" #include "savestream.h"
SaveStream::SaveStream(QObject *parent) : QObject{parent} {} SaveStream::SaveStream(QObject *parent) : QObject{parent} {
connect(this,&SaveStream::initStreamSaverSignal,this,&SaveStream::init,Qt::BlockingQueuedConnection);
}
bool SaveStream::init(AVFormatContext *formatContext, bool SaveStream::init(AVFormatContext *formatContext,
AVPacketQueueManager *queueManager, int videoIndex) { AVPacketQueueManager *queueManager, int videoIndex) {
@ -13,6 +15,7 @@ bool SaveStream::init(AVFormatContext *formatContext,
if (!m_start) { if (!m_start) {
free(); free();
} }
initStatus = m_start;
return m_start; return m_start;
} }
@ -37,8 +40,10 @@ void SaveStream::close() {
void SaveStream::startSaveStream() { void SaveStream::startSaveStream() {
qDebug() << "SaveStreamThreadID:" << QThread::currentThreadId(); qDebug() << "SaveStreamThreadID:" << QThread::currentThreadId();
if (!m_start) { if (!m_start) {
m_queueManager->m_isStreamSaverEnd = true;
return; return;
} }
m_queueManager->m_isStreamSaverEnd = false;
int frameIndex = 0; int frameIndex = 0;
int64_t dts = 0; int64_t dts = 0;
int64_t dts_last = 0; int64_t dts_last = 0;
@ -101,16 +106,6 @@ void SaveStream::startSaveStream() {
} }
} }
// AVStream *out_stream = m_formatContextSave->streams[0];
// out_stream->start_time = 0;
// m_formatContextSave->start_time = 0;
// int64_t duration_pts = last_pts - first_pts;
// // duration_pts = av_rescale(duration_pts, 1, AV_TIME_BASE);
// m_formatContextSave->duration = duration_pts;
// AVStream *stream = m_formatContextSave->streams[0];
// stream->duration = duration_pts;
// 写入文件尾 // 写入文件尾
if (m_formatContextSave && m_writeHeader) { if (m_formatContextSave && m_writeHeader) {
av_write_trailer(m_formatContextSave); av_write_trailer(m_formatContextSave);
@ -123,6 +118,8 @@ void SaveStream::startSaveStream() {
} }
free(); free();
m_queueManager->m_isStreamSaverEnd = true;
m_queueManager->wakeStreamSaver();
qDebug() << "Save Video End！"; qDebug() << "Save Video End！";
emit sendErrorMessageSignal("视频保存结束!", 1); emit sendErrorMessageSignal("视频保存结束!", 1);
} }
@ -130,8 +127,11 @@ void SaveStream::startSaveStream() {
void SaveStream::startSaveUDPStream() { void SaveStream::startSaveUDPStream() {
qDebug() << "SaveStreamThreadID:" << QThread::currentThreadId(); qDebug() << "SaveStreamThreadID:" << QThread::currentThreadId();
if (!m_start) { if (!m_start) {
m_queueManager->m_isStreamSaverEnd = true;
qDebug()<<"StreamSaver direct return ";
return; return;
} }
m_queueManager->m_isStreamSaverEnd = false;
int frameIndex = 0; int frameIndex = 0;
int64_t pts = 0; int64_t pts = 0;
int64_t dts = 0; int64_t dts = 0;
@ -184,8 +184,11 @@ void SaveStream::startSaveUDPStream() {
} }
free(); free();
m_queueManager->m_isStreamSaverEnd = true;
m_queueManager->wakeStreamSaver();
qDebug() << "视频保存结束！"; qDebug() << "视频保存结束！";
emit sendErrorMessageSignal("视频保存结束!", 1); emit sendErrorMessageSignal("视频保存结束!", 1);
} }
bool SaveStream::openFile(bool isUDP) { bool SaveStream::openFile(bool isUDP) {

6
src/video/savestream.h
Unescape Escape View File

@ -30,12 +30,16 @@ public slots:
signals: signals:
void startSaveStreamSignal(); void startSaveStreamSignal();
void sendErrorMessageSignal(QString message, int type); void sendErrorMessageSignal(QString message, int type);
void initStreamSaverSignal(AVFormatContext *formatContext,
AVPacketQueueManager *queueManager, int videoIndex);
private: private:
bool openFile(bool isUDP = false); bool openFile(bool isUDP = false);
void free(); void free();
bool isValidAVPacket(AVPacket *pkt); bool isValidAVPacket(AVPacket *pkt);
public:
bool initStatus = false;
private: private:
AVFormatContext *m_formatContextSave = nullptr; // 封装上下文 AVFormatContext *m_formatContextSave = nullptr; // 封装上下文
AVFormatContext *m_inputFormatContext = nullptr; AVFormatContext *m_inputFormatContext = nullptr;

Write Preview
Loading…
Cancel
Save