~chenshijun/c++.git

			@@ -1167,8 +1167,8 @@
			std::string publish_basepath = rtmpAddr + "cam" + str_uuid;
			DBG("publish_basepath:" << publish_basepath);
			appPref.setStringData("publish.basepath", publish_basepath);
			appPref.setIntData("pulish.width", 640);
			appPref.setIntData("pulish.height", 360);
			appPref.setIntData("pulish.width", 1920);
			appPref.setIntData("pulish.height", 1080);

			if (m_rtmp.find(ip) != m_rtmp.end()) {
			if (m_rtmp[ip].appPC == nullptr) {
			@@ -1220,8 +1220,8 @@
			std::string publish_basepath = rtmpAddr + "cam" + str_uuid;
			DBG("publish_basepath:" << publish_basepath);
			appPref.setStringData("publish.basepath", publish_basepath);
			appPref.setIntData("pulish.width", 640);
			appPref.setIntData("pulish.height", 360);
			appPref.setIntData("pulish.width", 1920);
			appPref.setIntData("pulish.height", 1080);

			if (m_rtmp.find(ip) != m_rtmp.end()) {
			if (m_rtmp[ip].appPC == nullptr) {

			@@ -145,7 +145,8 @@
			* @param p_this
			*/
			void BASICGB28181::FFmpegDecoderJPG::BareFlowDecoderThd(FFmpegDecoderJPG *p_this) {
			DBG(p_this->m_camIdx << " BareFlowDecoderThd ok ... gpuIdx is " << p_this->m_gpuIdx);
			DBG(p_this->m_camIdx << " BareFlowDecoderThd ok ... gpuIdx is " << p_this->m_gpuIdx);
			DBG("p_thisADDR:" << p_this << "p_this->m_running" << p_this->m_running);
			while (!p_this->m_running) {

			p_this->m_running = true;

			@@ -261,7 +261,7 @@
			m_hiredisTool.listRpop(m_camId,imgKey);
			if(imgKey.empty())
			{
			ERR("CamId "<<m_camId<<" No ImgKey");
			// ERR("CamId "<<m_camId<<" No ImgKey");
			return;
			}

			@@ -16,7 +16,7 @@
			auto imageCount = m_redisTool.getSize(m_camId);
			//保证Redis中的图片不要过多
			if (imageCount > M_CAM_PIC_MAX_COUNT) {
			ERR("Too Much Pics In Cam " << m_camId << " Redis ImageCount: " << imageCount );
			//ERR("Too Much Pics In Cam " << m_camId << " Redis ImageCount: " << imageCount );
			return;
			}
			auto item = m_imageQueue.front();

	QiaoJiaSystem/DataManagerServer/http_configserver.cpp	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/StructureApp/AppPipeController.cpp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	QiaoJiaSystem/VideoToImageMulth/RtspImageRedis.cpp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史