From 0607eba0ba964b3178507eabcd234fe7d8a0d860 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 11:06:16 +0800
Subject: [PATCH] capnp server fix bug
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
index 4e272dc..98118da 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
@@ -39,7 +39,7 @@
const size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
uint8_t _faceImages[_faceImagesSize]; // android stack is small
-const size_t _faceListBufferSize = sizeof(MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT*3);
+const size_t _faceListBufferSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT*3;
uint8_t faceListBuffer[_faceListBufferSize] = {0};
void remoteGetFaceListImage(const RtspFaceView::GetFaceImagesParams::Reader& params, RtspFaceView::GetFaceImagesResults::Builder& results){
@@ -50,7 +50,7 @@
memset(_faceImages, 0, _faceImagesSize);
bool ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, faceImagesSize);
if (imgIdxes.size() == 0){
- LOG_INFO << "No face image captured" << LOG_ENDL;
+ LOG_INFO << "No face image captured!!!!!" << LOG_ENDL;
return;
}
int imgIdxesSize = imgIdxes.size() * sizeof(NativeImgIdx);
@@ -58,10 +58,11 @@
memcpy(imgIndexData.begin(), imgIdxes.data(), imgIdxesSize);
auto imgData = results.initImgData(_faceImagesSize);
memcpy(imgData.begin(), _faceImages, _faceImagesSize);
- LOG_ERROR <<"c++ server : remoteGetFaceListImage!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ LOG_ERROR <<"c++ server : remoteGetFaceListImage!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
}
void remoteGetFaceList(const RtspFaceView::GetFaceListParams::Reader& params, RtspFaceView::GetFaceListResults::Builder& results){
+
const int cameraIdx = params.getCameraIndex() - 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
uint8_t *pBufPB = faceListBuffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
@@ -69,11 +70,14 @@
cameraWrapper.faceCache.getFaceListPb(pBufPB, faceListBufferSize);
auto buffer = results.initFaceList(faceListBufferSize);
memcpy(buffer.begin(), pBufPB, faceListBufferSize);
+ results.setFaceList(buffer);
+
}
void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results){
const int cameraIdx = params.getCameraIndex() - 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
+ LOG_DEBUG<<"!!!!lable"<< params.toString().flatten().cStr() <<LOG_ENDL;
cameraWrapper.setFaceLabel(params.getTrackId(),std::wstring((wchar_t*)params.getLabel().begin()));
}
--
Gitblit v1.8.0