From a05971bb73cced9426e11e26708a3f3cd2c3fc17 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 17:02:07 +0800
Subject: [PATCH] add release
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 163 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 122 insertions(+), 41 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 6a3dcf0..2e93c7a 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,10 +41,10 @@
}
// 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;
- assert(cameraIdx <= CAMERA_COUNT);
+ 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]);
@@ -59,10 +59,10 @@
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;
- 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]);
@@ -83,8 +83,9 @@
cameraWrapper.amcdConfig.ak_mime = "video/avc";
cameraWrapper.amcdConfig.ak_width = 1920;
cameraWrapper.amcdConfig.ak_height = 1080;
- cameraWrapper.amcdConfig.windowSurface = cameraWrapper.window;
+ cameraWrapper.amcdConfig.windowSurface = cameraWrapper.window = nullptr;//#todo
cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
+ cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
#ifndef USE_ST_SDK
cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;
#endif
@@ -93,8 +94,8 @@
{
cameraWrapper.sftConfig.point_size = 21;
cameraWrapper.sftConfig.detect_face_cnt_limit = MAX_FACE;
- cameraWrapper.sftConfig.draw_face_rect = true;
- cameraWrapper.sftConfig.draw_face_feature_point = true;
+ cameraWrapper.sftConfig.draw_face_rect = false;
+ cameraWrapper.sftConfig.draw_face_feature_point = false;
cameraWrapper.sftConfig.generate_face_feature = true;
}
@@ -106,63 +107,111 @@
}
// 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;
- 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_bsk_zhangbo_demoforbsk_util_RtspFaceNative_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_bsk_zhangbo_demoforbsk_util_RtspFaceNative_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_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_FaceCallback_func
- env->ReleaseStringUTFChars(func, utfFunc);
-
- // call:
- //env->CallVoidMethod(obj, callback, 5 , 10);
+ // 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_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;
- assert(cameraIdx <= CAMERA_COUNT);
+ 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]);
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;
- 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();
}
-jboolean 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;
- 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]);
// Y channel of YUV420p, packed in protobuf
- uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT];
- size_t buffSize = sizeof(buffer);
+ 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;
#ifdef USE_ST_SDK
@@ -172,19 +221,51 @@
if (!ret)
{
LOG_INFO << "No face captured" << LOG_ENDL;
- return JNI_FALSE;
+ return 0;
}
-
- uint8_t* _faceListPb = (uint8_t*)faceListPb;
- LOG_DEBUG << _faceListPb[0] << " "<< _faceListPb[1] << " "<< _faceListPb[2] << " " <<LOG_ENDL;
+ else
+ {
+ LOG_INFO << "Face captured " << LOG_ENDL;
+
+ buffSize = std::min(buffSize, arrSize);
+ env->SetByteArrayRegion(faceListPb, 0, buffSize, (const jbyte*)buffer);
+ return buffSize;
+ }
}
-jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages)
+jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages)
{
- LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
- 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]);
+
+ size_t count = 0;
+ int _faceImagesIdx[MAX_FACE] = {-1};
+ uint8_t _faceImages[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT];
+ size_t _faceImagesSize = sizeof(_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);
+#endif
+
+ if (!ret && count > 0)
+ {
+ LOG_INFO << "No face image captured" << LOG_ENDL;
+ return 0;
+ }
+
+ 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;
}
--
Gitblit v1.8.0