From d9da6cb3e69c630f8c2cccfc4703b29c3498269e Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期二, 19 三月 2019 18:06:50 +0800
Subject: [PATCH] 增加erl节点的端口配置
---
QiaoJiaSystem/FaceSearchServer/main.cpp | 3 ++-
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/main.cpp b/QiaoJiaSystem/FaceSearchServer/main.cpp
index 06d46ae..238090d 100644
--- a/QiaoJiaSystem/FaceSearchServer/main.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/main.cpp
@@ -27,7 +27,8 @@
assert("t_value.size()");
}
appPref.setIntData("RpcFSPort", atoi(argv[1]));
- appPref.setIntData("thread.max", atoi(argv[2]));//绾跨▼姹犲ぇ灏�
+ appPref.setIntData("ErlNodePort", atoi(argv[2]));
+ appPref.setIntData("thread.max", atoi(argv[3]));//绾跨▼姹犲ぇ灏�
appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
index e17ee5b..c99555a 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -237,8 +237,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