From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp | 404 +++++++++++++++++++++++----------------------------------
1 files changed, 161 insertions(+), 243 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
index 72f5046..afffcb8 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
@@ -10,17 +10,17 @@
#include <media/NdkMediaExtractor.h>
#include <pthread.h>
-
#include <ev_proto.h>
#include <face_daemon_proto.h>
#include <stdlib.h>
+#include <iostream>
#include "DebugNetwork.h"
#include "TeleWrapper.h"
#include "cpu_sched_test.h"
-
+#include "RemoteFuncClient.h"
//#include <mediastreamer2/include/mediastreamer2/msjava.h>
std::stringstream logss;
@@ -36,6 +36,21 @@
TeleWrapper g_TeleWrapper;
+const size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+uint8_t _faceImages[_faceImagesSize]; // android stack is small
+
+//// #todo optimize not copy data here, set data to jbyteArray directly
+////Java_cn_com_basic_face_util_RtspFaceNative_getFaceList
+//// Y channel of YUV420p, packed in protobuf
+static uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT] = {0};
+static size_t buffSize = sizeof(buffer);
+
+void remoteFireFaceCountListener(const RtspFaceDetect::FireFaceCountListenerParams::Reader& params, RtspFaceDetect::FireFaceCountListenerResults::Builder& results){
+ int count = params.getFaceCount();
+ int index = params.getCameraIndex();
+ LOG_INFO <<count<< "+" << index<< LOG_ENDL;
+ g_CameraWrappers[index - 1].fireFaceCount(count);
+}
extern "C"
{
@@ -54,12 +69,16 @@
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));
}
+
g_TeleWrapper.start();
+
+ //capnp server start
+ startRemoteServer();
+
}
void
@@ -75,126 +94,6 @@
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
@@ -320,29 +219,13 @@
cameraWrapper.asvrConfig.outputOriginFrame = true;
cameraWrapper.asvrConfig.outputRenderFrame = true;
cameraWrapper.asvrConfig.scaleToWidth = 0;
- cameraWrapper.asvrConfig.scaleToHeight = 0;
- cameraWrapper.asvrConfig.directlyDisplay = true;
+ cameraWrapper.asvrConfig.scaleToHeight = 0;
+ cameraWrapper.asvrConfig.directlyDisplay = true;
}
- {
- 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;
- cameraWrapper.sftConfig.explode_feature_rect_y = 40;
- cameraWrapper.sftConfig.clamp_feature_rect = true;
- cameraWrapper.sftConfig.doTrackPerFrame = 1;
- //cameraWrapper.sftConfig.license_str = g_stface_license_str;
- cameraWrapper.sftConfig.visionConeAngle = 30.0f;
- cameraWrapper.sftConfig.score_min = 0.4f;
- }
+ cameraWrapper.fontPath = "/data/msyh.ttc";
- cameraWrapper.fontPath = "/data/msyh.ttc";
-
- bool ret = cameraWrapper.initPl();
+ bool ret = cameraWrapper.initPl();
if (ret)
return (cameraWrapper.start() ? JNI_TRUE : JNI_FALSE);
else
@@ -444,6 +327,17 @@
cameraWrapper.cameraIdx, 0);
}
+JNIEXPORT jboolean JNICALL
+Java_cn_com_basic_face_util_RtspFaceNative_addFaceCountListener(JNIEnv *env, jclass type,
+ jint cameraIdx, jstring host_,
+ jint port) {
+ const char *host = env->GetStringUTFChars(host_, 0);
+
+ //TODO
+
+ env->ReleaseStringUTFChars(host_, host);
+}
+
void
Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv *env, jclass clazz, jint cameraIdx)
{
@@ -473,19 +367,47 @@
LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceList" << LOG_ENDL;
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
+ if(cameraIdx <0){
+ 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);
+ // Change to Global variable
+ // 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
+
+// add -----8.11-----calling getfacelist
+ try
+ {
+ LOG_ERROR <<"client : i want getFaceList!!!!!!!!!!!!"<< LOG_ENDL;
+ RtspFaceViewClient* client = getRtspFaceViewClient();
+ RtspFaceView::Client rClient = client->getEzRpcClient()->getMain<RtspFaceView>();
+ //auto& waitScope =client->getEzRpcClient()->getWaitScope();
+ auto& waitScope =client->getWaitScope();
+ auto request = rClient.getFaceListRequest();
+ request.setCameraIndex(cameraIdx+1);
+ auto sendAct = request.send();
+ auto result = sendAct.wait(waitScope);
+ ret = result.getFaceList().size() > 0;
+ LOG_DEBUG << "@@@ getFaceList get data!!!!!!!!!!!!!" << LOG_ENDL;
+ memcpy(pBufPB,result.getFaceList().begin(),result.getFaceList().size());
+ }
+ catch (const kj::Exception& e){
+ LOG_ERROR <<e.getDescription().cStr()<< LOG_ENDL;
+ ret = false;
+ }
+ catch (...)
+ {
+ ret = false;
+ }
+ //-------end-------
+ LOG_ERROR <<"client : i want getFaceList end!!!!!!!!!!!!!"<< LOG_ENDL;
+ //ret = cameraWrapper.faceCache.getFaceListPb(pBufPB, buffSize);
if (!ret)
{
@@ -530,73 +452,6 @@
return buffSize;
}
-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]);
-
- 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)
{
@@ -607,19 +462,48 @@
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);
+
+ //#ps add --------8.11------- calling getfaceimages
+ LOG_ERROR <<"client : i want getFaceImages!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ try
+ {
+ RtspFaceViewClient* client = getRtspFaceViewClient();
+ RtspFaceView::Client rClient = client->getEzRpcClient()->getMain<RtspFaceView>();
+ auto& waitScope =client->getWaitScope();
+
+ auto request = rClient.getFaceImagesRequest();
+ request.setCameraIndex(cameraIdx+1);
+ auto sendAct = request.send();
+ auto result = sendAct.wait(waitScope);
+ if(result.getImgIndexData().size() >0 && result.getImgData().size()>0)
+ {
+ ret =true;
+ LOG_DEBUG << "@@@ getFaceImages get data!!!!!!!" << LOG_ENDL;
+ memcpy(_faceImages,result.getImgData().begin(),result.getImgData().size());
+
+ imgIdxes.resize(result.getImgIndexData().size()/sizeof(NativeImgIdx));
+ memcpy(imgIdxes.data() ,result.getImgIndexData().begin() ,result.getImgIndexData().size());
+ }
+ }
+ catch (const kj::Exception& e)
+ {
+ std::cout << e.getDescription().cStr() << std::endl;
+ ret = false;
+ LOG_ERROR << "Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages try fail" << LOG_ENDL;
+ }
+ LOG_ERROR <<"client : i want getFaceImages end!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ //-------end-------
+ //ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif
if (imgIdxes.size() == 0)
{
LOG_INFO << "No face image captured" << LOG_ENDL;
- delete[] _faceImages;
return nullptr;
}
@@ -656,9 +540,6 @@
LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
}
-
- delete[] _faceImages;
- _faceImages = nullptr;
return jobjArrayList_Imgs;
}
@@ -756,39 +637,40 @@
bool Java_cn_com_basic_face_util_RtspFaceNative_teleCall(JNIEnv *env, jclass clazz, jstring phone)
{
- std::string _phone;
- {
- const char *utfFunc = env->GetStringUTFChars(phone, NULL);
- _phone = utfFunc;
- env->ReleaseStringUTFChars(phone, utfFunc);
- }
+ std::string _phone;
+ {
+ const char *utfFunc = env->GetStringUTFChars(phone, NULL);
+ _phone = utfFunc;
+ env->ReleaseStringUTFChars(phone, utfFunc);
+ }
- const char *phoneNum = _phone.c_str();
- TeleTask task;
- task.command= TeleTask::CALL;
- task.param = phoneNum;
- LOG_INFO << "Java_cn_com_basic_face_util_RtspFaceNative_telCall::jni" << LOG_ENDL;
- //
- g_TeleWrapper.pushTask(task);
+ const char *phoneNum = _phone.c_str();
+ TeleTask task;
+ task.command= TeleTask::CALL;
+ task.param = phoneNum;
+ LOG_INFO << "Java_cn_com_basic_face_util_RtspFaceNative_telCall::jni" << LOG_ENDL;
+ //
+ g_TeleWrapper.pushTask(task);
}
void Java_cn_com_basic_face_util_RtspFaceNative_teleHang(JNIEnv *env, jclass clazz)
{
- TeleTask task;
- task.command =TeleTask::HANGUP;
- //
- g_TeleWrapper.pushTask(task);
+ TeleTask task;
+ task.command =TeleTask::HANGUP;
+ //
+ g_TeleWrapper.pushTask(task);
}
void Java_cn_com_basic_face_util_RtspFaceNative_teleShutdown(JNIEnv *env, jclass clazz)
{
- LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_telShutdown" << LOG_ENDL;
- g_TeleWrapper.stop();
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_telShutdown" << LOG_ENDL;
+ g_TeleWrapper.stop();
}
void Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel(JNIEnv *env, jclass clazz, jint cameraIdx, jint stTrackId, jstring label)
{
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]);
@@ -801,7 +683,43 @@
wchar_t wt = (wchar_t)jc;
wstr.push_back(wt);
}
+
env->ReleaseStringChars(label,jchars);
- cameraWrapper.setFaceLabel(stTrackId, wstr);
+
+ // ps add ------8.11--------- calling setfacelable
+ LOG_ERROR <<"client : i want setFacelable!!!!!!!"<< LOG_ENDL;
+ try
+ {
+// auto& waitScope = getRtspFaceViewClient()->getWaitScope();
+// RtspFaceView::Client& rClient = getRtspFaceViewClient()->getClient();
+
+ RtspFaceViewClient* client = getRtspFaceViewClient();
+ RtspFaceView::Client rClient = client->getEzRpcClient()->getMain<RtspFaceView>();
+ auto& waitScope =client->getWaitScope();
+
+ auto request = rClient.setFaceLabelRequest();
+ request.setCameraIndex(cameraIdx);
+ auto labelData = request.initLabel(wstr.size()*4);
+
+ char temp[100];char temp1[100];
+ memcpy(labelData.begin(), wstr.c_str(), wstr.size()*4);
+
+ memcpy(temp, labelData.begin(), wstr.size()*4);
+
+ memcpy(temp1, request.getLabel().begin(), wstr.size()*4);
+ request.setTrackId(stTrackId);
+
+ const std::wstring &string = std::wstring((wchar_t*)labelData.begin());
+ auto sendAct = request.send();
+ sendAct.wait(waitScope);
+ }
+ catch (const kj::Exception& e)
+ {
+ std::cout << e.getDescription().cStr() << std::endl;
+ return;
+ }
+ LOG_ERROR <<"client : i want setFacelable end!!!!!!!!!!!!!!"<< LOG_ENDL;
+
+ //-------end-------
}
} // extern C
--
Gitblit v1.8.0