From 0727355ae017c0153ee7c643cdd1b0611c81627f Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 13 四月 2017 12:04:00 +0800 Subject: [PATCH] bug fix --- VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 100 +++++++++++++++++++++++++++---------------------- 1 files changed, 55 insertions(+), 45 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp index 249e3cf..69836e8 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp @@ -201,17 +201,18 @@ cameraWrapper.releaseFace(); } -jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb) +jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, 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]; // #todo optimize not copy data here, set data to jbyteArray directly + uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT] = {0}; size_t buffSize = sizeof(buffer); - const size_t arrSize = env->GetArrayLength(faceListPb); + //const size_t arrSize = env->GetArrayLength(faceListPb); bool ret = false; #ifdef USE_ST_SDK @@ -223,69 +224,78 @@ LOG_INFO << "No face captured" << LOG_ENDL; return 0; } - else - { - LOG_INFO << "Face captured " << LOG_ENDL; - buffSize = std::min(buffSize, arrSize); - env->SetByteArrayRegion(faceListPb, 0, buffSize, (const jbyte*)buffer); - return buffSize; - } + LOG_INFO << "Face captured " << LOG_ENDL; + + 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); + return buffSize; } -jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceImages) +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; - uint8_t _faceImages[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT]; - size_t _faceImagesSize = std::min(sizeof(_faceImages), size_t(env->GetArrayLength(faceImages))); + 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; + bool ret = false; #ifdef USE_ST_SDK - //bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize); - ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize); + ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize); #endif - if (imgIdxes.size() < 0) - { - LOG_INFO << "No face image captured" << LOG_ENDL; - return nullptr; - } + if (imgIdxes.size() == 0) + { + LOG_INFO << "No face image captured" << LOG_ENDL; + delete[] _faceImages; + return nullptr; + } - env->SetByteArrayRegion(faceImages, 0, _faceImagesSize, (const jbyte*)_faceImages); + jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray"); + jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr","[B"); + + jbyteArray jbaFaceImages = env->NewByteArray(_faceImagesSize); + 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"); + 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"); + 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); + 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); + 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); - } + env->CallBooleanMethod(jobjArrayList_ImgIdxes , jmArrayList_add , jobjNativeImgIdx); + } - return jobjArrayList_ImgIdxes; + return jobjArrayList_ImgIdxes; } -- Gitblit v1.8.0