From e26a5550539fa0cad91313bf9670df605199a324 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 15 八月 2017 13:55:25 +0800
Subject: [PATCH] capnproto fix bug
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
index 790adad..32b79f4 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
@@ -116,8 +116,6 @@
}
PL_Scale* plScale = (PL_Scale*)pipeLineRender->push_elem("PL_Scale");
- plScaleCfg.toWidth = 640;
- plScaleCfg.toHeight = 480;//#todo move to jni
ret = plScale->init(&plScaleCfg);
if (!ret)
{
@@ -206,11 +204,13 @@
faceLabels.clear();
faceLabels.insert(std::make_pair(st_track_id, label));
+ LOG_ERROR <<"client setFaceLabel : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
}
void CameraWrapper::fireFaceCount(int faceCount)
{
// double check it's all ok
+ LOG_ERROR <<"client fireFaceCount start!!!!!!!!"<< LOG_ENDL;
int getEnvStat = javaVM->GetEnv((void **)&(javaEnv), JNI_VERSION_1_6);
if (getEnvStat == JNI_EDETACHED)
{
@@ -226,6 +226,7 @@
LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
else if (getEnvStat == JNI_ERR)
LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+ LOG_ERROR <<"client fireFaceCount end!!!!!!!!!!!!"<< LOG_ENDL;
javaEnv->CallStaticVoidMethod(faceCallbackClazz, faceCallbackFunc, cameraIdx, faceCount);
@@ -298,7 +299,9 @@
void test_paint(CameraWrapper& cameraWrapper)
{
- cameraWrapper.plplContext.cmds.push_back(PLPLC_WTEXT);
+ //cameraWrapper.plplContext.clear();
+
+ cameraWrapper.plplContext.cmds.push_back(PLPLC_WTEXT);
cameraWrapper.plplContext.params.push_back(100);
cameraWrapper.plplContext.params.push_back(100);
cameraWrapper.plplContext.params.push_back(PLPLType(L"涓枃鏄晩"));
@@ -361,7 +364,7 @@
cameraWrapper.lastAliveTime = time(nullptr);
- pm.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_paint, &(cameraWrapper));
+ //pm.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_paint, &(cameraWrapper));
//#debug
//test_paint(cameraWrapper);
@@ -380,7 +383,7 @@
while(cameraWrapper.running)
{
sleep(10);
-
+ continue;
if (time(nullptr) - cameraWrapper.lastAliveTime > 20)
{
PL_RTSPClient* rtspClient = (PL_RTSPClient*)cameraWrapper.pipeLineDecoderDetector->at(0);
--
Gitblit v1.8.0