From e15c4888f720b8781260b901ac82d058f8f7c3b5 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 27 三月 2019 14:34:37 +0800
Subject: [PATCH] 移植nsq到项目中，将最短最长时长的参数修改成nsq配置
---
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
index e17ee5b..385b2e5 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -76,8 +76,7 @@
#ifdef TestCode
DBG(" m_rtpQueue.push before ");
#endif
- m_rtpQueue.
- push(info);
+ m_rtpQueue.push(info);
#ifdef TestCode
DBG(" m_rtpQueue.push after ");
#endif
@@ -237,8 +236,8 @@
av_init_packet(&p_this->pkt);
p_this->frame = av_frame_alloc();
- unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
- usleepTime *= 1000;
+// unsigned int usleepTime = (1000 / p_this->m_fps) - 12;
+// usleepTime *= 1000;
DBG("===open ok, camid: " << p_this->m_camIdx);
while (p_this->m_running) {
#ifdef TestCode
--
Gitblit v1.8.0