From 2734a21a6a355d42fa40fe80624940f8e663a5cc Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 12 四月 2017 14:11:14 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 82 +++++++++++++++++++++++++---------------
1 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 46a4e73..e051cd3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -20,7 +20,7 @@
extern "C"
{
-void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
+void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
{
g_logger.set_level(VERBOSE);
@@ -41,9 +41,9 @@
}
// set the surface
-void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface)
+void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setSurface" << LOG_ENDL;
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
@@ -59,9 +59,9 @@
LOGP(DEBUG, "@@@ setsurface %p", cameraWrapper.window);
}
-jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri)
+jboolean Java_cn_com_basic_face_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_createPlayer" << LOG_ENDL;
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_createPlayer" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
@@ -107,9 +107,9 @@
}
// shut down the native media system
-void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_shutdown(JNIEnv* env, jclass clazz, jint cameraIdx)
+void Java_cn_com_basic_face_util_RtspFaceNative_shutdown(JNIEnv* env, jclass clazz, jint cameraIdx)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_shutdown" << LOG_ENDL;
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_shutdown" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
@@ -145,9 +145,9 @@
return true;
}
-jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcName)
+jboolean Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcName)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setFaceCallback" << LOG_ENDL;
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
@@ -181,9 +181,9 @@
cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, 0);
}
-void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx)
+void Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_lockFace" << LOG_ENDL;
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_lockFace" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
@@ -191,9 +191,9 @@
cameraWrapper.lockFace();
}
-void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx)
+void Java_cn_com_basic_face_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_releaseFace" << LOG_ENDL;
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_releaseFace" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
@@ -201,9 +201,9 @@
cameraWrapper.releaseFace();
}
-jint Java_com_bsk_zhangbo_demoforbsk_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, jbyteArray faceListPb)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceList" << LOG_ENDL;
+ 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]);
@@ -233,39 +233,59 @@
}
}
-jint Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages)
+jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceImages)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
+ 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]);
- size_t count = 0;
- int _faceImagesIdx[MAX_FACE] = {-1};
+ std::vector<NativeImgIdx> imgIdxes;
uint8_t _faceImages[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT];
- size_t _faceImagesSize = sizeof(_faceImages);
+ size_t _faceImagesSize = std::min(sizeof(_faceImages), size_t(env->GetArrayLength(faceImages)));
+
bool ret = false;
- const size_t faceImagesIdxArrSize = env->GetArrayLength(faceImagesIdx); // count of int
- const size_t faceImagesArrSize = env->GetArrayLength(faceImages);
-
#ifdef USE_ST_SDK
- ret = cameraWrapper.faceCache.getFaceListImage(_faceImagesIdx, count, _faceImages, _faceImagesSize);
+ //bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize);
+ ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif
- if (!ret && count > 0)
+ if (imgIdxes.size() == 0)
{
LOG_INFO << "No face image captured" << LOG_ENDL;
- return 0;
+ return nullptr;
}
- int _faceImagesIdxCount = std::min(count, faceImagesIdxArrSize);
- env->SetIntArrayRegion(faceImagesIdx, 0, _faceImagesIdxCount, (const jint*)_faceImagesIdx);
-
- _faceImagesSize = std::min(_faceImagesSize, faceImagesArrSize);
env->SetByteArrayRegion(faceImages, 0, _faceImagesSize, (const jbyte*)_faceImages);
- return count;
+ 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);
+ }
+
+ return jobjArrayList_ImgIdxes;
}
--
Gitblit v1.8.0