From a0092014ee12abf06edb1788b189cc7c57336063 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:42:00 +0800
Subject: [PATCH] Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和CapnpProtocol功能初步实现 ........
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp | 255 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 216 insertions(+), 39 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
index 1ca3782..9549e1b 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
@@ -36,45 +36,6 @@
TeleWrapper g_TeleWrapper;
-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);
-uint8_t faceListBuffer[_faceListBufferSize] = {0};
-
-void remoteGetFaceListImage(const RtspFaceView::GetFaceImagesParams::Reader& params, RtspFaceView::GetFaceImagesResults::Builder& results){
- const int cameraIdx = params.getCameraIndex() - 1;
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- std::vector<NativeImgIdx> imgIdxes;
- size_t faceImagesSize = _faceImagesSize;
- memset(_faceImages, 0, _faceImagesSize);
- bool ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, faceImagesSize);
- if (imgIdxes.size() == 0){
- LOG_INFO << "No face image captured" << LOG_ENDL;
- return;
- }
- int imgIdxesSize = imgIdxes.size() * sizeof(NativeImgIdx);
- auto imgIndexData = results.initImgIndexData(imgIdxesSize);
- memcpy(imgIndexData.begin(), imgIdxes.data(), imgIdxesSize);
- auto imgData = results.initImgData(_faceImagesSize);
- memcpy(imgData.begin(), _faceImages, _faceImagesSize);
-}
-
-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);
- size_t faceListBufferSize = sizeof(faceListBuffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
- cameraWrapper.faceCache.getFaceListPb(pBufPB, faceListBufferSize);
- auto buffer = results.initFaceList(faceListBufferSize);
- memcpy(buffer.begin(), pBufPB, faceListBufferSize);
-}
-
-void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results){
- const int cameraIdx = params.getCameraIndex() - 1;
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- cameraWrapper.setFaceLabel(params.getTrackId(),std::wstring((wchar_t*)params.getLabel().begin()));
-}
-
extern "C"
{
@@ -91,6 +52,7 @@
for (size_t i = 0; i < CAMERA_COUNT; i++)
{
g_CameraWrappers[i].cameraIdx = i + 1;
+
g_CameraWrappers[i].pipeLineDecoderDetector = new PipeLine;
g_CameraWrappers[i].pipeLineAnalyzer = new PipeLine;
g_CameraWrappers[i].pipeLineRender = new PipeLine;
@@ -504,6 +466,202 @@
cameraWrapper.releaseFace();
}
+jint
+Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv *env, jclass clazz, jint cameraIdx,
+ jint dbId, jobject faceListPb)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceList" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ // #todo optimize not copy data here, set data to jbyteArray directly
+ // Y channel of YUV420p, packed in protobuf
+ uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT] = {0};
+ size_t buffSize = sizeof(buffer);
+
+ bool ret = false;
+#ifdef USE_ST_SDK
+ uint8_t *pBufPB = buffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
+ buffSize = sizeof(buffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
+ ret = cameraWrapper.faceCache.getFaceListPb(pBufPB, buffSize);
+#endif
+
+ if (!ret)
+ {
+ LOG_INFO << "No face captured" << LOG_ENDL;
+ return 0;
+ }
+
+ LOG_INFO << "Face captured " << LOG_ENDL;
+
+ EVPHeader *evpHeader = new(buffer) EVPHeader;
+ evpHeader->proto = EVPProto::EVPP_PROTOBUF;
+ evpHeader->cmd = FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_PB;
+ evpHeader->size = sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB) + buffSize;
+ buffSize = evpHeader->size;
+
+ FDP_FaceDetectPB *fdpFaceDetectPB = new(buffer + sizeof(EVPHeader)) FDP_FaceDetectPB(dbId, cameraIdx + 1);
+
+ evpHeader->hton();
+ fdpFaceDetectPB->hton();
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/facelist-%d-%d-%u.pb", dbId, cameraIdx, ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(buffer, 1, buffSize, pFile);
+ // fclose(pFile);
+ // if (f > 10)exit(0);
+ //}
+
+ jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
+ jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
+
+ jbyteArray jbaFaceListPb = env->NewByteArray(buffSize);
+ env->SetByteArrayRegion(jbaFaceListPb, 0, buffSize, (const jbyte *) buffer);
+ env->SetObjectField(faceListPb, jfRefByteArray_arr, jbaFaceListPb);
+
+#ifdef ENABLE_DEBUG_SENDFACEDETECT
+ dbgSendFaceDetect(buffer, buffSize);
+#endif
+
+ return buffSize;
+}
+
+jobject
+_Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv *env, jclass clazz, jint cameraIdx,
+ jobject faceImages)
+{
+ LOG_DEBUG << "@@@ _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ std::vector<NativeImgIdx> imgIdxes;
+ size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+ uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
+ memset(_faceImages, 0, _faceImagesSize);
+
+ bool ret = false;
+
+#ifdef USE_ST_SDK
+ ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
+#endif
+
+ if (imgIdxes.size() == 0)
+ {
+ LOG_INFO << "No face image captured" << LOG_ENDL;
+ delete[] _faceImages;
+ return nullptr;
+ }
+
+ jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
+ jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
+
+ jbyteArray jbaFaceImages = env->NewByteArray(_faceImagesSize);
+ LOG_DEBUG << "_faceImagesSize=" << _faceImagesSize << LOG_ENDL;
+ env->SetByteArrayRegion(jbaFaceImages, 0, _faceImagesSize, (const jbyte *) _faceImages);
+ env->SetObjectField(faceImages, jfRefByteArray_arr, jbaFaceImages);
+ delete[] _faceImages;
+
+ jclass jcArrayList = env->FindClass("java/util/ArrayList");
+ jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
+ jmethodID jmArrayList_add = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");
+
+ jclass jcNativeImgIdx = env->FindClass("cn/com/basic/face/util/NativeImgIdx");
+ jmethodID jmNativeImgIdx_ctor = env->GetMethodID(jcNativeImgIdx, "<init>", "()V");
+ jfieldID jfNativeImgIdx_offset = env->GetFieldID(jcNativeImgIdx, "offset", "I");
+ jfieldID jfNativeImgIdx_size = env->GetFieldID(jcNativeImgIdx, "size", "I");
+ jfieldID jfNativeImgIdx_type = env->GetFieldID(jcNativeImgIdx, "type", "I");
+ jfieldID jfNativeImgIdx_width = env->GetFieldID(jcNativeImgIdx, "width", "I");
+ jfieldID jfNativeImgIdx_height = env->GetFieldID(jcNativeImgIdx, "height", "I");
+
+ jobject jobjArrayList_ImgIdxes = env->NewObject(jcArrayList, jmArrayList_ctor);
+
+ for (size_t i = 0; i < imgIdxes.size(); i++)
+ {
+ jobject jobjNativeImgIdx = env->NewObject(jcNativeImgIdx, jmNativeImgIdx_ctor);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_offset, imgIdxes[i].offset);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_size, imgIdxes[i].size);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_type, imgIdxes[i].type);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_width, imgIdxes[i].width);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_height, imgIdxes[i].height);
+
+ env->CallBooleanMethod(jobjArrayList_ImgIdxes, jmArrayList_add, jobjNativeImgIdx);
+
+ LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
+ }
+
+ return jobjArrayList_ImgIdxes;
+}
+
+jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv *env, jclass clazz,
+ jint cameraIdx)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ std::vector<NativeImgIdx> imgIdxes;
+ size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+ uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
+ memset(_faceImages, 0, _faceImagesSize);
+
+ bool ret = false;
+
+#ifdef USE_ST_SDK
+ ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
+#endif
+
+ if (imgIdxes.size() == 0)
+ {
+ LOG_INFO << "No face image captured" << LOG_ENDL;
+ delete[] _faceImages;
+ return nullptr;
+ }
+
+ jclass jcArrayList = env->FindClass("java/util/ArrayList");
+ jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
+ jmethodID jmArrayList_add = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");
+
+ jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
+ jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
+ jfieldID jfNativeImg_st_track_id = env->GetFieldID(jcNativeImg, "st_track_id", "I");
+ jfieldID jfNativeImg_size = env->GetFieldID(jcNativeImg, "size", "I");
+ jfieldID jfNativeImg_type = env->GetFieldID(jcNativeImg, "type", "I");
+ jfieldID jfNativeImg_width = env->GetFieldID(jcNativeImg, "width", "I");
+ jfieldID jfNativeImg_height = env->GetFieldID(jcNativeImg, "height", "I");
+ jfieldID jfNativeImg_image = env->GetFieldID(jcNativeImg, "image", "[B");
+
+ jobject jobjArrayList_Imgs = env->NewObject(jcArrayList, jmArrayList_ctor);
+
+ for (size_t i = 0; i < imgIdxes.size(); i++)
+ {
+ jobject jobjNativeImg = env->NewObject(jcNativeImg, jmNativeImg_ctor);
+ env->SetIntField(jobjNativeImg, jfNativeImg_st_track_id, imgIdxes[i].st_track_id);
+ env->SetIntField(jobjNativeImg, jfNativeImg_size, imgIdxes[i].size);
+ env->SetIntField(jobjNativeImg, jfNativeImg_type, imgIdxes[i].type);
+ env->SetIntField(jobjNativeImg, jfNativeImg_width, imgIdxes[i].width);
+ env->SetIntField(jobjNativeImg, jfNativeImg_height, imgIdxes[i].height);
+
+ jbyteArray jbaFaceImage = env->NewByteArray(imgIdxes[i].size);
+ env->SetByteArrayRegion(jbaFaceImage, 0, imgIdxes[i].size,
+ (const jbyte *) (_faceImages + imgIdxes[i].offset));
+ env->SetObjectField(jobjNativeImg, jfNativeImg_image, jbaFaceImage);
+
+ env->CallBooleanMethod(jobjArrayList_Imgs, jmArrayList_add, jobjNativeImg);
+
+ LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
+ }
+
+ delete[] _faceImages;
+ _faceImages = nullptr;
+ return jobjArrayList_Imgs;
+}
+
void Java_cn_com_basic_face_util_RtspFaceNative_dbgFaceAdd(JNIEnv *env, jclass clazz,
jobject faceImage)
{
@@ -627,4 +785,23 @@
LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_telShutdown" << LOG_ENDL;
g_TeleWrapper.stop();
}
+
+void Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel(JNIEnv *env, jclass clazz, jint cameraIdx, jint stTrackId, jstring label)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+ const jchar* jchars = env->GetStringChars(label, nullptr);
+ std::wstring wstr;
+ int lenth = env->GetStringLength(label);
+
+ for (int i = 0; i < lenth; ++i) {
+ jchar jc = *(jchars + i);
+ wchar_t wt = (wchar_t)jc;
+ wstr.push_back(wt);
+ }
+ env->ReleaseStringChars(label,jchars);
+ cameraWrapper.setFaceLabel(stTrackId, wstr);
+}
} // extern C
--
Gitblit v1.8.0