From 22fe3eb94f8e65ebad5d55b12c371a0b69bfc04a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 10:18:12 +0800
Subject: [PATCH] add release
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 428 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 370 insertions(+), 58 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index e051cd3..fa09ee6 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -10,6 +10,15 @@
#include <pthread.h>
+#include <ev_proto.h>
+#include <face_daemon_proto.h>
+
+#include <stdlib.h>
+
+#include "DebugNetwork.h"
+
+//#include <mediastreamer2/include/mediastreamer2/msjava.h>
+
std::stringstream logss;
//std::fstream logss("/storage/sdcard/log.log", std::fstream::out);
//std::fstream logss("/storage/emulated/0/log.log", std::fstream::out);
@@ -22,10 +31,7 @@
void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
{
- g_logger.set_level(VERBOSE);
-
- PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
- PipeLine::register_global_elem_creator("PL_AndroidMediaCodecDecoder", create_PL_AndroidMediaCodecDecoder);
+ g_logger.set_level(INFO);
#ifdef USE_ST_SDK
PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
@@ -40,8 +46,144 @@
}
}
+void Java_cn_com_basic_face_util_RtspFaceNative_setLocalIP(JNIEnv *env, jclass clazz, jstring ipaddr)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setLocalIP" << LOG_ENDL;
+
+ const char *utf8 = env->GetStringUTFChars(ipaddr, NULL);
+ for (size_t i = 0; i < CAMERA_COUNT; i++)
+ {
+ g_CameraWrappers[i].rtspConfig.receivingInterfaceAddr = utf8;
+ g_CameraWrappers[i].rtspConfig.desiredPortNum = 10056 + i * 4;
+ g_CameraWrappers[i].rtspConfig.requestStreamingOverTcp = true;
+ }
+ env->ReleaseStringUTFChars(ipaddr, utf8);
+}
+
+static jclass _jcOutputSurface = nullptr;
+static jmethodID _jmOutputSurface_ctor = nullptr;
+static jmethodID _jmOutputSurface_getSurface = nullptr;
+static jmethodID _jmOutputSurface_readPixels = nullptr;
+static jmethodID _jmOutputSurface_awaitNewImage = nullptr;
+static jmethodID _jmOutputSurface_drawImage = nullptr;
+static jmethodID _jmOutputSurface_makeCurrent = nullptr;
+
+static jobject _jobjOutputSurface = nullptr;
+static jobject _jobjSurface = nullptr;
+static JNIEnv *_env = nullptr;
+
+void readPixels(void* surface, uint8_t* buf, size_t& maxSize)
+{
+ //ANativeWindow* window = (ANativeWindow*)surface;
+
+ CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
+
+ int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+ if (getEnvStat == JNI_EDETACHED)
+ {
+ //LOG_WARN << "GetEnv: not attached" << std::endl;
+ if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+ LOG_WARN << "Failed to attach" << LOG_ENDL;
+ else
+ getEnvStat = JNI_OK;
+ }
+ else if (getEnvStat == JNI_OK)
+ {
+ }
+ else if (getEnvStat == JNI_EVERSION)
+ LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
+ else if (getEnvStat == JNI_ERR)
+ LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+
+ if (maxSize==0)
+ {
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_makeCurrent);
+ }
+ else
+ {
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_awaitNewImage);
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_drawImage);
+//
+ //jbyteArray jbarrBuffer = (jbyteArray)cameraWrapper.javaEnv->CallObjectMethod(_jobjOutputSurface, _jmOutputSurface_readPixels);
+ //if (jbarrBuffer != nullptr)
+ // cameraWrapper.javaEnv->GetByteArrayRegion(jbarrBuffer, 0, 640 * 480 * 2, (jbyte*)buf);
+ }
+
+ if (cameraWrapper.javaEnv->ExceptionCheck())
+ cameraWrapper.javaEnv->ExceptionDescribe();
+
+ cameraWrapper.javaVM->DetachCurrentThread();
+}
+
+
+/*
+static void* createDecodeSurface()
+{
+ CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
+
+ //OutputSurface outputSurface = null;
+ //outputSurface = new OutputSurface(mWidth, mHeight);
+ //outputSurface.getSurface();
+ //outputSurface.release();
+
+
+ //int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+ //if (getEnvStat == JNI_EDETACHED)
+ //{
+ // //LOG_WARN << "GetEnv: not attached" << std::endl;
+ // if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+ // LOG_WARN << "Failed to attach" << LOG_ENDL;
+ // else
+ // getEnvStat = JNI_OK;
+ //}
+ //else if (getEnvStat == JNI_OK)
+ //{
+ //}
+ //else if (getEnvStat == JNI_EVERSION)
+ // LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
+ //else if (getEnvStat == JNI_ERR)
+ // LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+
+ //void* ret = nullptr;
+ //{
+ // jclass jcOutputSurface = _jcOutputSurface = cameraWrapper.javaEnv->FindClass("com/example/nativecodec/OutputSurface");
+ // _jcOutputSurface = static_cast<jclass>( cameraWrapper.javaEnv->NewGlobalRef( jcOutputSurface ));
+//
+ // jmethodID jmOutputSurface_ctor = _jmOutputSurface_ctor = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "<init>", "(II)V");
+ // jmethodID jmOutputSurface_getSurface = _jmOutputSurface_getSurface = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "getSurface", "()Landroid/view/Surface;");
+ // jmethodID jmOutputSurface_readPixels = _jmOutputSurface_readPixels = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "readPixels", "()[B");
+//
+ // jmethodID jmOutputSurface_awaitNewImage = _jmOutputSurface_awaitNewImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "awaitNewImage", "()V");
+ // jmethodID jmOutputSurface_drawImage = _jmOutputSurface_drawImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "drawImage", "()V");
+ // jmethodID jmOutputSurface_makeCurrent = _jmOutputSurface_makeCurrent = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "makeCurrent", "()V");
+//
+ // jobject jobjOutputSurface = _jobjOutputSurface = cameraWrapper.javaEnv->NewObject(jcOutputSurface , jmOutputSurface_ctor, 1920, 1088);
+ // _jobjOutputSurface = static_cast<jobject>( cameraWrapper.javaEnv->NewGlobalRef( jobjOutputSurface ));
+//
+ // jobject jobjSurface = _jobjSurface = cameraWrapper.javaEnv->CallObjectMethod(jobjOutputSurface, jmOutputSurface_getSurface);
+ // ret = ANativeWindow_fromSurface(cameraWrapper.javaEnv, jobjSurface);
+ // cameraWrapper.amcdConfig.readPixels_callback = readPixels;
+ //}
+
+ //if (cameraWrapper.javaEnv->ExceptionCheck())
+ // cameraWrapper.javaEnv->ExceptionDescribe();
+//
+ //cameraWrapper.javaVM->DetachCurrentThread();
+
+ //return ret;
+}
+*/
+
+static void* getSurfaceHolderGetSurface(JNIEnv* env, jobject jobjSurfaceHolder)
+{
+ jclass jcSurfaceHolder = env->FindClass("android/view/SurfaceHolder");
+ jmethodID jmSurfaceHolder_getSurface = env->GetMethodID(jcSurfaceHolder, "getSurface", "()Landroid/view/Surface;");
+ jobject surface = env->CallObjectMethod(jobjSurfaceHolder, jmSurfaceHolder_getSurface);
+ return surface;
+}
+
// set the surface
-void Java_cn_com_basic_face_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 surfaceRender)
{
LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
@@ -49,14 +191,25 @@
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- // obtain a native window from a Java surface
- if (cameraWrapper.window)
+ // obtain a native windowRender from a Java surface
+ //if (cameraWrapper.windowDecode != nullptr)
+ //{
+ // ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowDecode));
+ // cameraWrapper.windowDecode = NULL;
+ //}
+ //cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceDecoder);
+ //cameraWrapper.windowDecode = getSurfaceHolderGetSurface(env, surfaceDecoder);
+ //cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceDecoder));
+
+ if (cameraWrapper.windowRender != nullptr)
{
- ANativeWindow_release((ANativeWindow*)(cameraWrapper.window));
- cameraWrapper.window = NULL;
+ ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowRender));
+ cameraWrapper.windowRender = NULL;
}
- cameraWrapper.window = ANativeWindow_fromSurface(env, surface);
- LOGP(DEBUG, "@@@ setsurface %p", cameraWrapper.window);
+ cameraWrapper.windowRender = ANativeWindow_fromSurface(env, surfaceRender);
+ //cameraWrapper.windowRender = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
+
+ LOGP(DEBUG, "@@@ setsurface %p,%p", cameraWrapper.windowDecode, cameraWrapper.windowRender);
}
jboolean Java_cn_com_basic_face_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri)
@@ -82,22 +235,39 @@
{
cameraWrapper.amcdConfig.ak_mime = "video/avc";
cameraWrapper.amcdConfig.ak_width = 1920;
- cameraWrapper.amcdConfig.ak_height = 1080;
- cameraWrapper.amcdConfig.windowSurface = cameraWrapper.window = nullptr;//#todo
- cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.ak_height = 1080; // nvida yuv420p,1088; Amlogic yuv420p,1080
+ //cameraWrapper.amcdConfig.windowSurfaceDecode = cameraWrapper.windowDecode; //cameraWrapper.windowDecode;
+ //cameraWrapper.amcdConfig.windowSurfaceRender = cameraWrapper.windowRender; //cameraWrapper.windowRender;
+ cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = false;
cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
+
+ //cameraWrapper.amcdConfig.createSurface_callback = createDecodeSurface;
+ //cameraWrapper.amcdConfig.readPixels_callback = readPixels;
+
#ifndef USE_ST_SDK
- cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;
+cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;//#todo
#endif
}
-
- {
+
+ {
+ cameraWrapper.asvrConfig.windowSurface = cameraWrapper.windowRender;
+ cameraWrapper.asvrConfig.outputOriginFrame = true;
+ cameraWrapper.asvrConfig.outputRenderFrame = true;
+ cameraWrapper.asvrConfig.scaleToWidth = 640;
+ cameraWrapper.asvrConfig.scaleToHeight = 480;
+ }
+
+ {
cameraWrapper.sftConfig.point_size = 21;
cameraWrapper.sftConfig.detect_face_cnt_limit = MAX_FACE;
cameraWrapper.sftConfig.draw_face_rect = false;
cameraWrapper.sftConfig.draw_face_feature_point = false;
- cameraWrapper.sftConfig.generate_face_feature = true;
- }
+ cameraWrapper.sftConfig.generate_face_feature = true;
+ cameraWrapper.sftConfig.explode_feature_rect_x = 30;
+ cameraWrapper.sftConfig.explode_feature_rect_y = 40;
+ cameraWrapper.sftConfig.doTrackPerFrame = 50;
+ }
bool ret = cameraWrapper.initPl();
if (ret)
@@ -117,6 +287,8 @@
cameraWrapper.stop();
}
+
+//#todo remove
//see: https://github.com/BelledonneCommunications/mediastreamer2/blob/master/src/android/android_mediacodec.cpp
static int handle_java_exception(JNIEnv *env) {
if (env->ExceptionCheck()) {
@@ -126,7 +298,7 @@
}
return 0;
}
-
+//#todo remove
static bool _loadClass(JNIEnv *env, const char *className, jclass *_class) {
*_class = env->FindClass(className);
if(handle_java_exception(env) == -1 || *_class == NULL) {
@@ -136,6 +308,7 @@
return true;
}
+//#todo remove
static bool _getStaticMethodID(JNIEnv *env, jclass _class, const char *name, const char *sig, jmethodID *method) {
*method = env->GetStaticMethodID(_class, name, sig);
if(handle_java_exception(env) == -1 || *method == NULL) {
@@ -157,6 +330,8 @@
// set for multithread callback
env->GetJavaVM(&(cameraWrapper.javaVM));
cameraWrapper.javaEnv = env;
+
+ //ms_set_jvm(cameraWrapper.javaVM);
std::string _className;
{
@@ -201,21 +376,23 @@
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, 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]);
-
- // 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
- size_t buffSize = sizeof(buffer);
- const size_t arrSize = env->GetArrayLength(faceListPb);
- bool ret = false;
+ // #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
- ret = cameraWrapper.faceCache.getFaceListPb(buffer, buffSize);
+ 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)
@@ -223,70 +400,205 @@
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;
+
+ 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);
+
+ 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, 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;
+ 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;
- uint8_t _faceImages[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT];
- size_t _faceImagesSize = std::min(sizeof(_faceImages), size_t(env->GetArrayLength(faceImages)));
+ 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
- //bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize);
ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif
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 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");
+ jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
+ jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
+ 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_ImgIdxes = env->NewObject(jcArrayList , jmArrayList_ctor);
+ jobject jobjArrayList_Imgs = 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);
+ jobject jobjNativeImg = env->NewObject(jcNativeImg , jmNativeImg_ctor);
+ 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);
- env->CallBooleanMethod(jobjArrayList_ImgIdxes , jmArrayList_add , jobjNativeImgIdx);
+ 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;
}
- return jobjArrayList_ImgIdxes;
+ delete[] _faceImages;
+ _faceImages = nullptr;
+ return jobjArrayList_Imgs;
}
+void Java_cn_com_basic_face_util_RtspFaceNative_dbgFaceAdd(JNIEnv* env, jclass clazz, jobject faceImage)
+{
+ jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
+ jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
+ 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");
+
+ NativeImgIdx imgidx;
+ imgidx.size = env->GetIntField(faceImage, jfNativeImg_size);
+ imgidx.type = env->GetIntField(faceImage, jfNativeImg_type);
+ imgidx.width = env->GetIntField(faceImage, jfNativeImg_width);
+ imgidx.height = env->GetIntField(faceImage, jfNativeImg_height);
+
+ uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3];
+ size_t buffSize = 0;
+
+ jbyteArray jbaFaceImage = (jbyteArray)env->GetObjectField(faceImage, jfNativeImg_image);
+ env->GetByteArrayRegion(jbaFaceImage, 0, imgidx.size, (jbyte*)buffer);
+
+#ifdef ENABLE_DEBUG_SENDFACEADD
+ dbgSendFaceAdd(imgidx, buffer);
+#endif
+}
+
+jstring Java_cn_com_basic_face_util_RtspFaceNative_dbgGetLog(JNIEnv *env, jclass clazz)
+{
+ return env->NewStringUTF(g_dbgLog.c_str());
+}
+
+//void Java_cn_com_basic_face_util_RtspFaceNative_dbgReadTexture(JNIEnv* env, jclass clazz)
+//{
+// dbgReadTexture();
+//}
}
--
Gitblit v1.8.0