From 1b4d2718a4864190a47d8b7863f36a9ae0b8055c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 17:38:09 +0800
Subject: [PATCH] optimize
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 523 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 379 insertions(+), 144 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index d3b5233..375c7eb 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -1,7 +1,5 @@
#include "RtspNativeCodecJNI.h"
-#include <PipeLine.h>
-#include <PL_RTSPClient.h>
-#include <PL_AndroidMediaCodecDecoder.h>
+#include "CameraWrapper.h"
#include <logger.h>
#include <Logger/src/logger.hpp>
@@ -12,148 +10,98 @@
#include <pthread.h>
+#include <ev_proto.h>
+#include <face_daemon_proto.h>
+
+#include <stdlib.h>
+
+#include "DebugNetwork.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);
Logger g_logger(logss);
-
-class CameraWrapper
-{
-public:
- PipeLine* pipeLine;
-
- PL_RTSPClient_Config rtspConfig;
- PL_AndroidMediaCodecDecoder_Config amcdConfig;
-
- jmethodID faceCallback;
- ANativeWindow* window;
-
- pthread_t live_daemon_thid;
- bool running;
-
- CameraWrapper() :
- pipeLine(nullptr), rtspConfig(), amcdConfig(), faceCallback(0), window(nullptr),
- live_daemon_thid(0), running(false)
- {
- }
-
- ~CameraWrapper()
- {
- stop();
- delete pipeLine;
- }
-
- bool start()
- {
- LOG_INFO << "CameraWrapper::start" << LOG_ENDL;
-
- running = true;
- int ret = pthread_create(&live_daemon_thid, NULL, CameraWrapper::live_daemon_thd, this);
- if(ret != 0)
- {
- LOGP(ERROR, "pthread_create: %s/n", strerror(ret));
- running = false;
- return false;
- }
-
- return true;
- }
-
- void stop()
- {
- LOG_INFO << "CameraWrapper::stop" << LOG_ENDL;
-
- if (!running)
- return;
-
- running = false;
- pthread_join(live_daemon_thid, NULL);
- }
-
- bool initPl()
- {
- PL_RTSPClient* rtspClient = (PL_RTSPClient*)pipeLine->push_elem("PL_RTSPClient");
- bool ret = rtspClient->init(&rtspConfig);
- if (!ret)
- {
- LOG_ERROR << "rtspClient.init error" << std::endl;
- return false;
- }
-
- PL_AndroidMediaCodecDecoder* amcDecoder = (PL_AndroidMediaCodecDecoder*)pipeLine->push_elem("PL_AndroidMediaCodecDecoder");
- ret = amcDecoder->init(&amcdConfig);
- if (!ret)
- {
- LOG_ERROR << "amcDecoder.init error" << std::endl;
- return false;
- }
-
- return true;
- }
-
- static void* live_daemon_thd(void* arg)
- {
- LOG_INFO << "CameraWrapper::live_daemon_thd start" << LOG_ENDL;
-
- CameraWrapper& cameraWrapper = *(CameraWrapper*)arg;
-
- while(cameraWrapper.running)
- {
- PipeLineElem* last = cameraWrapper.pipeLine->pipe();
- bool ret = cameraWrapper.pipeLine->check_pipe_complete(last);
- LOG_DEBUG << "pipe ret=" << ret << LOG_ENDL;
-
- if (ret)
- {
- PipeMaterial pm;
- last->gain(pm);
- }
- }
-
- LOG_INFO << "CameraWrapper::live_daemon_thd stop, ret=" << LOG_ENDL;
- }
-};
CameraWrapper g_CameraWrappers[CAMERA_COUNT];
extern "C"
{
-void Java_com_example_nativecodec_NativeCodec_init(JNIEnv *env, jclass clazz)
+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);
+#endif
for (size_t i = 0; i < CAMERA_COUNT; i++)
{
+ g_CameraWrappers[i].cameraIdx = i + 1;
+
g_CameraWrappers[i].pipeLine = new PipeLine;
PipeLine& pipeLine(*(g_CameraWrappers[i].pipeLine));
}
}
-// set the surface
-void Java_com_example_nativecodec_NativeCodec_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface)
+void Java_cn_com_basic_face_util_RtspFaceNative_setLocalIP(JNIEnv *env, jclass clazz, jstring ipaddr)
{
- LOG_DEBUG << "@@@ Java_com_example_nativecodec_NativeCodec_setSurface" << LOG_ENDL;
- assert(cameraIdx <= CAMERA_COUNT);
+ 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);
+}
+
+void createHiddenSurface(JNIEnv *env, int cameraIdx)
+{
+ CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ //OutputSurface outputSurface = null;
+ //outputSurface = new OutputSurface(mWidth, mHeight);
+ //outputSurface.getSurface();
+ //outputSurface.release();
+
+ jclass jcOutputSurface = env->FindClass("com/example/nativecodec/OutputSurface");
+ jmethodID jmOutputSurface_ctor = env->GetMethodID(jcOutputSurface, "<init>", "(II)V");
+ jmethodID jmOutputSurface_getSurface = env->GetMethodID(jcOutputSurface, "getSurface", "()Landroid/view/Surface;");
+
+ jobject jobjOutputSurface = env->NewObject(jcOutputSurface , jmOutputSurface_ctor, 1920, 1088);
+ jobject jobjSurface = env->CallObjectMethod(jobjOutputSurface, jmOutputSurface_getSurface);
+ cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, jobjSurface);
+}
+
+// set the surface
+void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
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.windowRender)
{
- 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, surface);
+
+ //createHiddenSurface(env, cameraIdx);
+
+ LOGP(DEBUG, "@@@ setsurface %p", cameraWrapper.windowRender);
}
-jboolean Java_com_example_nativecodec_NativeCodec_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_example_nativecodec_NativeCodec_createPlayer" << LOG_ENDL;
- assert(cameraIdx <= CAMERA_COUNT);
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_createPlayer" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
@@ -172,11 +120,37 @@
{
cameraWrapper.amcdConfig.ak_mime = "video/avc";
- cameraWrapper.amcdConfig.ak_width = 1920;
- cameraWrapper.amcdConfig.ak_height = 1080;
- cameraWrapper.amcdConfig.windowSurface = cameraWrapper.window;
- cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.ak_width = 640;
+ cameraWrapper.amcdConfig.ak_height = 480;
+ cameraWrapper.amcdConfig.windowSurfaceDecode = nullptr; //cameraWrapper.windowDecode;
+ cameraWrapper.amcdConfig.windowSurfaceRender = nullptr;
+ cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = false;
+ cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
+
+#ifndef USE_ST_SDK
+ cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;
+#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.explode_feature_rect_x = 30;
+ cameraWrapper.sftConfig.explode_feature_rect_y = 40;
+ cameraWrapper.sftConfig.doTrackPerFrame = 50;
+ }
bool ret = cameraWrapper.initPl();
if (ret)
@@ -186,57 +160,318 @@
}
// shut down the native media system
-void Java_com_example_nativecodec_NativeCodec_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_example_nativecodec_NativeCodec_shutdown" << LOG_ENDL;
- assert(cameraIdx <= CAMERA_COUNT);
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_shutdown" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
cameraWrapper.stop();
}
-jboolean Java_com_example_nativecodec_NativeCodec_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring func)
+//see: https://github.com/BelledonneCommunications/mediastreamer2/blob/master/src/android/android_mediacodec.cpp
+static int handle_java_exception(JNIEnv *env) {
+ if (env->ExceptionCheck()) {
+ env->ExceptionDescribe();
+ env->ExceptionClear();
+ return -1;
+ }
+ return 0;
+}
+
+static bool _loadClass(JNIEnv *env, const char *className, jclass *_class) {
+ *_class = env->FindClass(className);
+ if(handle_java_exception(env) == -1 || *_class == NULL) {
+ LOGP(ERROR, "Could not load Java class [%s]", className);
+ return false;
+ }
+ return true;
+}
+
+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) {
+ LOGP(ERROR, "Could not get static method %s[%s]", name, sig);
+ return false;
+ }
+ return true;
+}
+
+jboolean Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcName)
{
- LOG_DEBUG << "@@@ Java_com_example_nativecodec_NativeCodec_setFaceCallback" << LOG_ENDL;
- assert(cameraIdx <= CAMERA_COUNT);
+ 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]);
- jclass cls = env->GetObjectClass(clazz);
+ //jclass cls = env->GetObjectClass(clazz);
- const char *utfFunc = env->GetStringUTFChars(func, NULL);
- cameraWrapper.faceCallback = env->GetMethodID(cls, utfFunc, "(II)V"); // Java_FaceCallback_func
- env->ReleaseStringUTFChars(func, utfFunc);
+ // set for multithread callback
+ env->GetJavaVM(&(cameraWrapper.javaVM));
+ cameraWrapper.javaEnv = env;
+
+ std::string _className;
+ {
+ const char *utfFunc = env->GetStringUTFChars(className, NULL);
+ _className = utfFunc;
+ env->ReleaseStringUTFChars(className, utfFunc);
+ }
+ std::string _funcName;
+ {
+ const char *utfFunc = env->GetStringUTFChars(funcName, NULL);
+ _funcName = utfFunc;
+ env->ReleaseStringUTFChars(funcName, utfFunc);
+ }
+
+ _loadClass(env, _className.c_str(), &(cameraWrapper.faceCallbackClazz));
+
+ cameraWrapper.faceCallbackClazz = static_cast<jclass>( env->NewGlobalRef( cameraWrapper.faceCallbackClazz )); //#todo need release?
+
+ _getStaticMethodID(env, cameraWrapper.faceCallbackClazz, _funcName.c_str(), "(II)V", &(cameraWrapper.faceCallbackFunc));
+
+ // call test (sync)
+ cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, 0);
+}
+
+void Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx)
+{
+ 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]);
- // call:
- //env->CallVoidMethod(obj, callback, 5 , 10);
+ cameraWrapper.lockFace();
}
-void Java_com_example_nativecodec_NativeCodec_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx)
+void Java_cn_com_basic_face_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx)
{
- assert(cameraIdx <= CAMERA_COUNT);
+ 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]);
+
+ cameraWrapper.releaseFace();
}
-void Java_com_example_nativecodec_NativeCodec_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx)
+jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jint dbId, jobject faceListPb)
{
- assert(cameraIdx <= CAMERA_COUNT);
+ 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);
+
+ 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;
}
-jboolean Java_com_example_nativecodec_NativeCodec_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb)
+jobject _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jobject faceImages)
{
- assert(cameraIdx <= CAMERA_COUNT);
+ 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;
}
-jboolean Java_com_example_nativecodec_NativeCodec_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceImagesIdx, jbyteArray faceImages)
+jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx)
{
- assert(cameraIdx <= CAMERA_COUNT);
- cameraIdx -= 1;
+ 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_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_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)
+{
+ 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());
+}
}
--
Gitblit v1.8.0