From 4db189a6ec2bd6b575d7f35011de063bdfe73456 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 七月 2017 14:57:03 +0800
Subject: [PATCH] support st_track_id
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 552 +++++++++++++++++++++++++++++-------------------------
1 files changed, 296 insertions(+), 256 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 902077f..d25de07 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -17,7 +17,13 @@
#include <stdlib.h>
#include "DebugNetwork.h"
+
+
+extern "C"
+{
#include "serial.h"
+}
+
//#include <mediastreamer2/include/mediastreamer2/msjava.h>
std::stringstream logss;
@@ -36,24 +42,25 @@
void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
{
- g_logger.set_level(INFO);
+ g_logger.set_level(INFO);
#ifdef USE_ST_SDK
- PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
+ 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;
+
+ for (size_t i = 0; i < CAMERA_COUNT; i++)
+ {
+ g_CameraWrappers[i].cameraIdx = i + 1;
g_CameraWrappers[i].pipeLineDecoderDetector = new PipeLine;
g_CameraWrappers[i].pipeLineAnalyzer = new PipeLine;
g_CameraWrappers[i].pipeLineRender = new PipeLine;
- //PipeLine& pipeLine(*(g_CameraWrappers[i].pipeLineDecoderDetector));
- }
+ //PipeLine& pipeLine(*(g_CameraWrappers[i].pipeLineDecoderDetector));
+ }
}
-void Java_cn_com_basic_face_util_RtspFaceNative_setLocalIP(JNIEnv *env, jclass clazz, jstring ipaddr)
+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;
@@ -79,13 +86,14 @@
//static jobject _jobjSurface = nullptr;
//static JNIEnv *_env = nullptr;
-void readPixels(void* surface, uint8_t* buf, size_t& maxSize)
+void readPixels(void *surface, uint8_t *buf, size_t &maxSize)
{
//ANativeWindow* window = (ANativeWindow*)surface;
- CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
+ CameraWrapper &cameraWrapper(g_CameraWrappers[0]);
- int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+ int getEnvStat = cameraWrapper.javaVM->GetEnv((void **) &(cameraWrapper.javaEnv),
+ JNI_VERSION_1_6);
if (getEnvStat == JNI_EDETACHED)
{
//LOG_WARN << "GetEnv: not attached" << std::endl;
@@ -93,20 +101,17 @@
LOG_WARN << "Failed to attach" << LOG_ENDL;
else
getEnvStat = JNI_OK;
- }
- else if (getEnvStat == JNI_OK)
+ } else if (getEnvStat == JNI_OK)
{
- }
- else if (getEnvStat == JNI_EVERSION)
+ } 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)
+ if (maxSize == 0)
{
//cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_makeCurrent);
- }
- else
+ } else
{
//cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_awaitNewImage);
//cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_drawImage);
@@ -181,27 +186,30 @@
}
*/
-static void* getSurfaceHolderGetSurface(JNIEnv* env, jobject jobjSurfaceHolder)
+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;
+ 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 surfaceRender)
+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);
- cameraIdx -= 1;
-
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
+ 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 windowRender from a Java surface
if (cameraWrapper.windowDecode != nullptr)
{
- ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowDecode));
+ ANativeWindow_release((ANativeWindow *) (cameraWrapper.windowDecode));
cameraWrapper.windowDecode = NULL;
}
cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceRender);
@@ -209,68 +217,73 @@
//cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
if (cameraWrapper.windowRender != nullptr)
- {
- ANativeWindow_release((ANativeWindow*)(cameraWrapper.windowRender));
+ {
+ ANativeWindow_release((ANativeWindow *) (cameraWrapper.windowRender));
cameraWrapper.windowRender = NULL;
}
cameraWrapper.windowRender = ANativeWindow_fromSurface(env, surfaceRender);
cameraWrapper.asvrConfig.windowSurface = cameraWrapper.windowRender; // support reset
//cameraWrapper.windowRender = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
- LOGP(DEBUG, "@@@ setsurface %p,%p", cameraWrapper.windowDecode, cameraWrapper.windowRender);
+ 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)
+jboolean
+Java_cn_com_basic_face_util_RtspFaceNative_createPlayer(JNIEnv *env, jclass clazz, jint cameraIdx,
+ jstring uri)
{
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]);
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
- int w=0,h=0;//#todo
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
- {
- const char *utf8Uri = env->GetStringUTFChars(uri, NULL);
- cameraWrapper.rtspConfig.rtspURL = utf8Uri;
- env->ReleaseStringUTFChars(uri, utf8Uri);
+ int w = 0, h = 0;//#todo
- if(cameraWrapper.rtspConfig.rtspURL.find("/main/") != std::string::npos || cameraWrapper.rtspConfig.rtspURL.find("subtype=0") != std::string::npos)//#todo temp use
+ {
+ const char *utf8Uri = env->GetStringUTFChars(uri, NULL);
+ cameraWrapper.rtspConfig.rtspURL = utf8Uri;
+ env->ReleaseStringUTFChars(uri, utf8Uri);
+
+ if (cameraWrapper.rtspConfig.rtspURL.find("/main/") != std::string::npos ||
+ cameraWrapper.rtspConfig.rtspURL.find("subtype=0") != std::string::npos)//#todo temp use
{
- w=1920;h=1080;
- }
- else if (cameraWrapper.rtspConfig.rtspURL.find("/h264/") != std::string::npos && cameraWrapper.rtspConfig.rtspURL.find("/sub/") != std::string::npos)
+ w = 1920;
+ h = 1080;
+ } else if (cameraWrapper.rtspConfig.rtspURL.find("/h264/") != std::string::npos &&
+ cameraWrapper.rtspConfig.rtspURL.find("/sub/") != std::string::npos)
{
- w=640;h=480;
- }
- else if (cameraWrapper.rtspConfig.rtspURL.find("/h264_2") != std::string::npos)
+ w = 640;
+ h = 480;
+ } else if (cameraWrapper.rtspConfig.rtspURL.find("/h264_2") != std::string::npos)
{
- w=800;h=600;
- }
- else if (cameraWrapper.rtspConfig.rtspURL.find("/h264") != std::string::npos)
+ w = 800;
+ h = 600;
+ } else if (cameraWrapper.rtspConfig.rtspURL.find("/h264") != std::string::npos)
{
- w = 1920;h = 1080;
- }
- else if (cameraWrapper.rtspConfig.rtspURL.find("subtype=2") != std::string::npos)
+ w = 1920;
+ h = 1080;
+ } else if (cameraWrapper.rtspConfig.rtspURL.find("subtype=2") != std::string::npos)
{
- w=1280;h=720;
- }
- else
+ w = 1280;
+ h = 720;
+ } else
{
- w=640;h=480;
+ w = 640;
+ h = 480;
}
cameraWrapper.rtspConfig.progName = "RtspNativeCodec";
- cameraWrapper.rtspConfig.aux = true; // ffmpeg need aux, but live555 not
- cameraWrapper.rtspConfig.verbosityLevel = 1;
- cameraWrapper.rtspConfig.tunnelOverHTTPPortNum = 0;
+ cameraWrapper.rtspConfig.aux = true; // ffmpeg need aux, but live555 not
+ cameraWrapper.rtspConfig.verbosityLevel = 1;
+ cameraWrapper.rtspConfig.tunnelOverHTTPPortNum = 0;
cameraWrapper.rtspConfig.args = nullptr;
- }
+ }
- {
- cameraWrapper.amcdConfig.ak_mime = "video/avc";
- cameraWrapper.amcdConfig.ak_width = w;
- cameraWrapper.amcdConfig.ak_height = h; // nvida yuv420p,1088; Amlogic yuv420p,1080; RK3288 NV12
+ {
+ cameraWrapper.amcdConfig.ak_mime = "video/avc";
+ cameraWrapper.amcdConfig.ak_width = w;
+ cameraWrapper.amcdConfig.ak_height = h; // nvida yuv420p,1088; Amlogic yuv420p,1080; RK3288 NV12
//cameraWrapper.amcdConfig.windowSurfaceDecode = cameraWrapper.windowDecode; //cameraWrapper.windowDecode;
//cameraWrapper.amcdConfig.windowSurfaceRender = cameraWrapper.windowRender; //cameraWrapper.windowRender;
cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
@@ -281,9 +294,9 @@
//cameraWrapper.amcdConfig.readPixels_callback = readPixels;
#ifndef USE_ST_SDK
-cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;//#todo
+ cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;//#todo
#endif
- }
+ }
{
cameraWrapper.asvrConfig.windowSurface = cameraWrapper.windowRender;
@@ -294,10 +307,10 @@
}
{
- 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.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_point = false;
cameraWrapper.sftConfig.explode_feature_rect_x = 30;
@@ -309,29 +322,32 @@
cameraWrapper.sftConfig.score_min = 0.2f;
}
- bool ret = cameraWrapper.initPl();
- if (ret)
- return (cameraWrapper.start() ? JNI_TRUE : JNI_FALSE);
- else
- return JNI_FALSE;
+ bool ret = cameraWrapper.initPl();
+ if (ret)
+ return (cameraWrapper.start() ? JNI_TRUE : JNI_FALSE);
+ else
+ return JNI_FALSE;
}
// shut down the native media system
-void Java_cn_com_basic_face_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_cn_com_basic_face_util_RtspFaceNative_shutdown" << LOG_ENDL;
- assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
- cameraIdx -= 1;
-
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- cameraWrapper.stop();
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+ 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()) {
+static int handle_java_exception(JNIEnv *env)
+{
+ if (env->ExceptionCheck())
+ {
env->ExceptionDescribe();
env->ExceptionClear();
return -1;
@@ -339,9 +355,11 @@
return 0;
}
//#todo remove
-static bool _loadClass(JNIEnv *env, const char *className, jclass *_class) {
+static bool _loadClass(JNIEnv *env, const char *className, jclass *_class)
+{
*_class = env->FindClass(className);
- if(handle_java_exception(env) == -1 || *_class == NULL) {
+ if (handle_java_exception(env) == -1 || *_class == NULL)
+ {
LOGP(ERROR, "Could not load Java class [%s]", className);
return false;
}
@@ -349,21 +367,27 @@
}
//#todo remove
-static bool _getStaticMethodID(JNIEnv *env, jclass _class, const char *name, const char *sig, jmethodID *method) {
+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) {
+ 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)
+jboolean Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback(JNIEnv *env, jclass clazz,
+ jint cameraIdx,
+ jstring className,
+ jstring funcName)
{
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]);
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
//jclass cls = env->GetObjectClass(clazz);
@@ -388,68 +412,78 @@
_loadClass(env, _className.c_str(), &(cameraWrapper.faceCallbackClazz));
- cameraWrapper.faceCallbackClazz = static_cast<jclass>( env->NewGlobalRef( cameraWrapper.faceCallbackClazz )); //#todo need release?
+ cameraWrapper.faceCallbackClazz = static_cast<jclass>( env->NewGlobalRef(
+ cameraWrapper.faceCallbackClazz)); //#todo need release?
- _getStaticMethodID(env, cameraWrapper.faceCallbackClazz, _funcName.c_str(), "(II)V", &(cameraWrapper.faceCallbackFunc));
+ _getStaticMethodID(env, cameraWrapper.faceCallbackClazz, _funcName.c_str(), "(II)V",
+ &(cameraWrapper.faceCallbackFunc));
- // call test (sync)
- cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, 0);
+ // 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)
+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]);
-
- cameraWrapper.lockFace();
+ 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_cn_com_basic_face_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_cn_com_basic_face_util_RtspFaceNative_releaseFace" << LOG_ENDL;
- assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
- cameraIdx -= 1;
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
-
- cameraWrapper.releaseFace();
+ 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();
}
-jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jint dbId, jobject 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]);
+ 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};
+ // 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);
+ 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;
- }
+
+ if (!ret)
+ {
+ LOG_INFO << "No face captured" << LOG_ENDL;
+ return 0;
+ }
LOG_INFO << "Face captured " << LOG_ENDL;
- EVPHeader* evpHeader = new (buffer) EVPHeader;
+ 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, cameraIdx + 1);
+ FDP_FaceDetectPB *fdpFaceDetectPB = new(buffer + sizeof(EVPHeader)) FDP_FaceDetectPB(dbId,
+ cameraIdx +
+ 1);
evpHeader->hton();
fdpFaceDetectPB->hton();
@@ -465,10 +499,10 @@
//}
jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
- jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr","[B");
+ jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
jbyteArray jbaFaceListPb = env->NewByteArray(buffSize);
- env->SetByteArrayRegion(jbaFaceListPb, 0, buffSize, (const jbyte*)buffer);
+ env->SetByteArrayRegion(jbaFaceListPb, 0, buffSize, (const jbyte *) buffer);
env->SetObjectField(faceListPb, jfRefByteArray_arr, jbaFaceListPb);
#ifdef ENABLE_DEBUG_SENDFACEDETECT
@@ -478,81 +512,84 @@
return buffSize;
}
-jobject _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jobject 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]);
+ 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;
+ 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
+ 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
- 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;
- delete[] _faceImages;
- return nullptr;
- }
+ 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");
+ 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->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);
- LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
- }
+ LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
+ }
- return jobjArrayList_ImgIdxes;
+ return jobjArrayList_ImgIdxes;
}
-jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx)
+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]);
+ 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
+ uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
memset(_faceImages, 0, _faceImagesSize);
bool ret = false;
@@ -570,31 +607,34 @@
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_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");
+ jfieldID jfNativeImg_st_track_id = env->GetFieldID(jcNativeImg, "st_track_id", "I");
+ 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);
+ jobject jobjArrayList_Imgs = env->NewObject(jcArrayList, jmArrayList_ctor);
- for(size_t i = 0 ; i < imgIdxes.size(); i++)
+ for (size_t i = 0; i < imgIdxes.size(); i++)
{
- jobject jobjNativeImg = env->NewObject(jcNativeImg , jmNativeImg_ctor);
+ jobject jobjNativeImg = env->NewObject(jcNativeImg, jmNativeImg_ctor);
+ env->SetIntField(jobjNativeImg, jfNativeImg_st_track_id, imgIdxes[i].st_track_id);
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->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);
+ env->CallBooleanMethod(jobjArrayList_Imgs, jmArrayList_add, jobjNativeImg);
LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
}
@@ -604,17 +644,20 @@
return jobjArrayList_Imgs;
}
-void Java_cn_com_basic_face_util_RtspFaceNative_dbgFaceAdd(JNIEnv* env, jclass clazz, jobject faceImage)
+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");
+ jfieldID jfNativeImg_st_track_id = env->GetFieldID(jcNativeImg, "st_track_id", "I");
+ 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.st_track_id = env->GetIntField(faceImage, jfNativeImg_st_track_id);
imgidx.size = env->GetIntField(faceImage, jfNativeImg_size);
imgidx.type = env->GetIntField(faceImage, jfNativeImg_type);
imgidx.width = env->GetIntField(faceImage, jfNativeImg_width);
@@ -623,8 +666,8 @@
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);
+ jbyteArray jbaFaceImage = (jbyteArray) env->GetObjectField(faceImage, jfNativeImg_image);
+ env->GetByteArrayRegion(jbaFaceImage, 0, imgidx.size, (jbyte *) buffer);
#ifdef ENABLE_DEBUG_SENDFACEADD
dbgSendFaceAdd(imgidx, buffer);
@@ -641,7 +684,8 @@
// dbgReadTexture();
//}
-void Java_cn_com_basic_face_util_RtspFaceNative_dbgSetStfaceLicense(JNIEnv *env, jclass clazz, jstring lic)
+void Java_cn_com_basic_face_util_RtspFaceNative_dbgSetStfaceLicense(JNIEnv *env, jclass clazz,
+ jstring lic)
{
LOG_WARN << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_dbgSetStfaceLicense" << LOG_ENDL;
@@ -652,17 +696,19 @@
//LOG_ERROR << g_stface_license_str << LOG_ERROR;
}
-void Java_cn_com_basic_face_util_RtspFaceNative_setCaptureSurface(JNIEnv *env, jclass clazz, jobject surfaceCapture)
+void Java_cn_com_basic_face_util_RtspFaceNative_setCaptureSurface(JNIEnv *env, jclass clazz,
+ jobject surfaceCapture)
{
if (g_CaptureCamera.windowRender != nullptr)
{
- ANativeWindow_release((ANativeWindow*)(g_CaptureCamera.windowRender));
+ ANativeWindow_release((ANativeWindow *) (g_CaptureCamera.windowRender));
g_CaptureCamera.windowRender = NULL;
}
g_CaptureCamera.windowRender = ANativeWindow_fromSurface(env, surfaceCapture);
}
-bool Java_cn_com_basic_face_util_RtspFaceNative_startCapturePlayer(JNIEnv *env, jclass clazz, jstring uri)
+bool Java_cn_com_basic_face_util_RtspFaceNative_startCapturePlayer(JNIEnv *env, jclass clazz,
+ jstring uri)
{
std::string _uri;
{
@@ -685,99 +731,93 @@
}
-jobject Java_cn_com_basic_face_util_RtspFaceNative_getCaptureImages(JNIEnv* env, jclass clazz)
+jobject Java_cn_com_basic_face_util_RtspFaceNative_getCaptureImages(JNIEnv *env, jclass clazz)
{
}
-}
-
-
-void Delay(unsigned int nDelay)
+static void callNum(int fd, char phone)
{
- unsigned int i,j,k;
- for ( i=0;i<nDelay;i++ )
- for ( j=0;j<6144;j++ )
- k++;
-}
-
-void callNum(int fd,char phone)
-{
- switch ( phone)
+ switch (phone)
{
case '1':
- serialWriteString(fd,"DA");//1
+ serialWriteString(fd, "DA");//1
break;
case '2':
- serialWriteString(fd,"DB");//2
+ serialWriteString(fd, "DB");//2
break;
case '3':
- serialWriteString(fd,"DC");//3
+ serialWriteString(fd, "DC");//3
break;
case '4':
- serialWriteString(fd,"DD");//4
+ serialWriteString(fd, "DD");//4
break;
case '5':
- serialWriteString(fd,"DE");//5
+ serialWriteString(fd, "DE");//5
break;
case '6':
- serialWriteString(fd,"DF");//6
+ serialWriteString(fd, "DF");//6
break;
case '7':
- serialWriteString(fd,"DG");//7
+ serialWriteString(fd, "DG");//7
break;
case '8':
- serialWriteString(fd,"DH");//8
+ serialWriteString(fd, "DH");//8
break;
case '9':
- serialWriteString(fd,"DI");//9
+ serialWriteString(fd, "DI");//9
break;
case '0':
- serialWriteString(fd,"DJ");//0
+ serialWriteString(fd, "DJ");//0
break;
}
}
-void call(const char * phone)
+bool Java_cn_com_basic_face_util_RtspFaceNative_telCall(JNIEnv *env, jclass clazz, jstring phone)
{
- int fd = serialOpen("/dev/ttyS1",2400);
- serialWriteString(fd,"AA");
- Delay(10000);
- while (*phone)
- {
- Delay(10000);
- callNum(fd,*(phone++));
- }
+ int fd = serialOpen("/dev/ttyS4", 2400);
+ serialWriteString(fd, "AA");
+ sleep(1);
+
+ std::string _phone;
+ {
+ const char *utfFunc = env->GetStringUTFChars(phone, NULL);
+ _phone = utfFunc;
+ env->ReleaseStringUTFChars(phone, utfFunc);
+ }
+
+ const char *phoneNum = _phone.c_str();
+
+ while (*phoneNum)
+ {
+ sleep(1);
+ callNum(fd, *(phoneNum++));
+ }
+
+ return false;
}
-
-char* jstringTostring(JNIEnv* env, jstring jstr)
+void Java_cn_com_basic_face_util_RtspFaceNative_Hang(JNIEnv *env, jclass clazz)
{
-char* rtn = NULL;
-jclass clsstring = env->FindClass("java/lang/String");
-jstring strencode = env->NewStringUTF("utf-8");
-jmethodID mid = env->GetMethodID(clsstring, "getBytes", "(Ljava/lang/String;)[B");
-jbyteArray barr= (jbyteArray)env->CallObjectMethod(jstr, mid, strencode);
-jsize alen = env->GetArrayLength(barr);
-jbyte* ba = env->GetByteArrayElements(barr, JNI_FALSE);
-if (alen > 0)
-{
-rtn = (char*)malloc(alen + 1);
-
-memcpy(rtn, ba, alen);
-rtn[alen] = 0;
-}
-env->ReleaseByteArrayElements(barr, ba, 0);
-return rtn;
+ int fd = serialOpen("/dev/ttyS4", 2400);
+ serialWriteString(fd, "BA");
}
-void Java_cn_com_basic_face_util_RtspFaceNative_telCall(JNIEnv* env, jclass clazz,jstring phone)
- {
- call(jstringTostring(phone));
- }
+void Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel(JNIEnv *env, jclass clazz, jint cameraIdx, jint stTrackId, jstring phoneNumber)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
- void Java_cn_com_basic_face_util_RtspFaceNative_Hang(JNIEnv* env, jclass clazz)
- {
- int fd = serialOpen("/dev/ttyS1",2400);
- serialWriteString(fd,"BA");
- }
\ No newline at end of file
+ std::string _phoneNumber;
+ {
+ const char *utfFunc = env->GetStringUTFChars(phoneNumber, NULL);
+ _phoneNumber = utfFunc;
+ env->ReleaseStringUTFChars(phoneNumber, utfFunc);
+ }
+
+ cameraWrapper.setFaceLabel(stTrackId, _phoneNumber);
+}
+
+} // extern C
--
Gitblit v1.8.0