From 83e41a2ac316be500a7be633fbf748693151f747 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:09:42 +0800
Subject: [PATCH] 保存第一张i帧作为底图
---
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 4 +
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp | 83 ++++++++++++++++++++++++-----------------
2 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
index 9e8fd7e..e17ee5b 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -143,7 +143,7 @@
*/
void BASICGB28181::FFmpegDecoderJPG::BareFlowDecoderThd(FFmpegDecoderJPG *p_this) {
DBG(p_this->m_camIdx << " BareFlowDecoderThd ok ... gpuIdx is " << p_this->m_gpuIdx);
- while(!p_this->m_running) {
+ while (!p_this->m_running) {
p_this->m_running = true;
// av_register_all();
@@ -167,20 +167,20 @@
int err = av_probe_input_buffer(p_this->ic->pb, &p_this->ic->iformat, nullptr, nullptr, 0, p_this->m_buf_size);
if (err) {
- ERR("av_probe_input_buffer: err======" << err << p_this->m_camIdx);
+ ERR("av_probe_input_buffer: err======" << err << p_this->m_camIdx);
p_this->m_running = false;
continue;
}
err = avformat_open_input(&p_this->ic, "", NULL, NULL);
if (err) {
- ERR("avformat_open_input: err======" << err << p_this->m_camIdx);
+ ERR("avformat_open_input: err======" << err << p_this->m_camIdx);
p_this->m_running = false;
continue;
}
// int err2 = avformat_find_stream_info(ic, nullptr);
err = avformat_find_stream_info(p_this->ic, NULL);
if (err) {
- ERR("avformat_find_stream_info: err======" << err << p_this->m_camIdx);
+ ERR("avformat_find_stream_info: err======" << err << p_this->m_camIdx);
// avformat_close_input(&p_this->ic);
// DBG("avformat_close_input(&p_this->ic);");
p_this->m_running = false;
@@ -198,7 +198,7 @@
p_this->ctx = avcodec_alloc_context3(nullptr);
err = avcodec_parameters_to_context(p_this->ctx, p_this->stream->codecpar);
if (err) {
- ERR("avcodec_parameters_to_context: err======" << err << p_this->m_camIdx);
+ ERR("avcodec_parameters_to_context: err======" << err << p_this->m_camIdx);
// avformat_close_input(&p_this->ic);
// DBG("avformat_close_input(&p_this->ic);");
p_this->m_running = false;
@@ -218,14 +218,14 @@
p_this->codec = p_this->codec_cuvid;
} else {
// return false;
- ERR("codec_cuvid is NULL" << p_this->m_camIdx);
+ ERR("codec_cuvid is NULL" << p_this->m_camIdx);
}
}
}
}
err = avcodec_open2(p_this->ctx, p_this->codec, nullptr);
if (err) {
- ERR("avcodec_open2: err======" << err << p_this->m_camIdx);
+ ERR("avcodec_open2: err======" << err << p_this->m_camIdx);
// avformat_close_input(&p_this->ic);
// DBG("avformat_close_input(&p_this->ic);");
// avcodec_free_context(&p_this->ctx);
@@ -239,7 +239,7 @@
p_this->frame = av_frame_alloc();
unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
usleepTime *= 1000;
- DBG("===open ok, camid: " << p_this->m_camIdx );
+ DBG("===open ok, camid: " << p_this->m_camIdx);
while (p_this->m_running) {
#ifdef TestCode
ClockTimer Test("while time");
@@ -255,7 +255,7 @@
int err6 = avcodec_send_packet(p_this->ctx, &p_this->pkt);
int err7 = avcodec_receive_frame(p_this->ctx, p_this->frame);
if ((err7 == AVERROR(EAGAIN)) || (err5 < 0) || (err6 < 0)) {
- ERR(" err======: err7" << err7 << " err5: " << err5 << " err6: " << err6 << p_this->m_camIdx);
+ ERR(" err======: err7" << err7 << " err5: " << err5 << " err6: " << err6 << p_this->m_camIdx);
usleep(40000);
continue;
}
@@ -267,29 +267,41 @@
// BASICGB28181::avframe_to_cvmat(frame).copyTo(p_this->m_image);
p_this->m_image = std::move(BASICGB28181::avframe_to_cvmat(p_this->frame));
-#ifdef TestCode
- {
- // TestCode 娴嬭瘯浠ｇ爜淇濆瓨鍥剧墖鍒版湰鍦�
- ClockTimer cl("TestCode");
- std::string strNewTime2 = AppUtil::getTimeUSecString();
- cv::putText(p_this->m_image, strNewTime2, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN,
- 5, cv::Scalar(255, 255, 0), 2);
- std::thread test([&](cv::Mat img, std::string strThing) {
- try {
- std::string strNewTime = "tmpDec/";
- strNewTime.append(p_this->m_camIdx + "_").append(strThing).append(".jpg");
- // cv::imwrite(strNewTime, p_this->m_image);
- } catch (std::exception ex) {
- ERR(ex.what());
- }
- }, p_this->m_image, strNewTime2);
- test.detach();
+ if (p_this->m_SnapshotNotSaveRet && (p_this->pkt.flags & AV_PKT_FLAG_KEY)) {
+ try {
+ std::string strNewName = "./";
+ strNewName.append(p_this->m_camIdx).append(".jpg");
+ cv::imwrite(strNewName, p_this->m_image);
+ p_this->m_SnapshotNotSaveRet = false;
+ } catch (std::exception ex) {
+ ERR(ex.what());
+ }
}
+
+
+#ifdef TestCode
+ {
+ // TestCode 娴嬭瘯浠ｇ爜淇濆瓨鍥剧墖鍒版湰鍦�
+ ClockTimer cl("TestCode");
+ std::string strNewTime2 = AppUtil::getTimeUSecString();
+ cv::putText(p_this->m_image, strNewTime2, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN,
+ 5, cv::Scalar(255, 255, 0), 2);
+ std::thread test([&](cv::Mat img, std::string strThing) {
+ try {
+ std::string strNewTime = "tmpDec/";
+ strNewTime.append(p_this->m_camIdx + "_").append(strThing).append(".jpg");
+ // cv::imwrite(strNewTime, p_this->m_image);
+ } catch (std::exception ex) {
+ ERR(ex.what());
+ }
+ }, p_this->m_image, strNewTime2);
+ test.detach();
+ }
#endif
- //#todo send to other thd
+ //#todo send to other thd
#ifdef TestCode
- DBG("emitSigal(\"DecoderImageOK\") begin");
+ DBG("emitSigal(\"DecoderImageOK\") begin");
#endif
//瑙﹀彂淇″彿
gSignalLock.emitSigal(p_this->m_camIdx + "DecoderImageOK");
@@ -438,7 +450,7 @@
bool BASICGB28181::FFmpegDecoderJPG::SaveVideo(std::string path, int64_t lastFrameId) {
std::lock_guard<std::mutex> lock(g_mutex);
- INFO("SaveVideo: " << path << "m_packetsVec.size : " <<m_packetsVec.size());
+ INFO("SaveVideo: " << path << "m_packetsVec.size : " << m_packetsVec.size());
if (!m_packetsVec.empty()) {
startWrite(path.c_str());
int64_t firstKeyFramePts = m_packetsVec[0].m_packet.pts;
@@ -447,7 +459,8 @@
for (const auto &item:m_packetsVec) {
if (item.m_frameId < lastFrameId) {
DBG("item.m_frameId < lastFrameId " << item.m_frameId << " " << lastFrameId);
- conversion(const_cast<AVPacket *> (&item.m_packet), firstKeyFramePts, firstKeyFrameDts, video_st, frame_index);
+ conversion(const_cast<AVPacket *> (&item.m_packet), firstKeyFramePts, firstKeyFrameDts, video_st,
+ frame_index);
frame_index++;
av_write_frame(m_pOutFmtCtx, &item.m_packet);
} else {
@@ -593,13 +606,13 @@
DBG("frame_index==%d\n" << frame_index);
//Write PTS
- AVRational time_base1=inStream->time_base;
+ AVRational time_base1 = inStream->time_base;
//Duration between 2 frames (us)
- int64_t calc_duration=(double)AV_TIME_BASE/av_q2d(inStream->r_frame_rate);
+ int64_t calc_duration = (double) AV_TIME_BASE / av_q2d(inStream->r_frame_rate);
//Parameters
- pkg->pts=(double)(frame_index*calc_duration)/(double)(av_q2d(time_base1)*AV_TIME_BASE);
- pkg->dts=pkg->pts;
- pkg->duration=(double)calc_duration/(double)(av_q2d(time_base1)*AV_TIME_BASE);
+ pkg->pts = (double) (frame_index * calc_duration) / (double) (av_q2d(time_base1) * AV_TIME_BASE);
+ pkg->dts = pkg->pts;
+ pkg->duration = (double) calc_duration / (double) (av_q2d(time_base1) * AV_TIME_BASE);
// DBG("pts:" << pkg->pts);
// DBG("dts:" << pkg->dts);
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
index 235cbed..dcfa1d2 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h
@@ -199,7 +199,8 @@
int stopWrite();
//瀵筽acket鍋氳浆鎹�
- void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream, unsigned long int frame_index = 0);
+ void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream,
+ unsigned long int frame_index = 0);
bool m_bstartWrite = {false};
bool m_bFirstKeyFrame = {false};
@@ -226,6 +227,7 @@
int m_gpuIdx;
int m_fps;
bool m_PackageState;
+ bool m_SnapshotNotSaveRet{true};
std::string m_camIdx;
MyQueue<frameBuffInfo *> m_rtpQueue;
--
Gitblit v1.8.0