From 94e704acde59df60bd42f6f90b94d462d1bfa37c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期日, 23 七月 2017 12:09:41 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 70 +++++++---------------------------
1 files changed, 15 insertions(+), 55 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index db1440e..3174a0b 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -17,8 +17,8 @@
#include <stdlib.h>
#include "DebugNetwork.h"
-#include "TeleWrapper.h"
+#include "cpu_sched_test.h"
//#include <mediastreamer2/include/mediastreamer2/msjava.h>
@@ -31,8 +31,6 @@
CameraWrapper g_CameraWrappers[CAMERA_COUNT];
-TeleWrapper g_TeleWrapper;
-
CaptureCamera g_CaptureCamera;
extern "C"
@@ -41,6 +39,8 @@
void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
{
g_logger.set_level(INFO);
+
+ cpu_sched();
#ifdef USE_ST_SDK
PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
@@ -55,7 +55,6 @@
g_CameraWrappers[i].pipeLineRender = new PipeLine;
//PipeLine& pipeLine(*(g_CameraWrappers[i].pipeLineDecoderDetector));
}
- g_TeleWrapper.start();
}
void
@@ -188,16 +187,14 @@
static void *getSurfaceHolderGetSurface(JNIEnv *env, jobject jobjSurfaceHolder)
{
jclass jcSurfaceHolder = env->FindClass("android/view/SurfaceHolder");
- jmethodID jmSurfaceHolder_getSurface = env->GetMethodID(jcSurfaceHolder, "getSurface",
- "()Landroid/view/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);
@@ -336,7 +333,7 @@
assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
cameraIdx -= 1;
- CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+ CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
cameraWrapper.stop();
}
@@ -480,9 +477,7 @@
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();
@@ -735,54 +730,19 @@
}
-
-
-
-
-bool Java_cn_com_basic_face_util_RtspFaceNative_telCall(JNIEnv *env, jclass clazz, jstring phone)
-{
-
- 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;
- g_TeleWrapper.push(task);
-}
-
-void Java_cn_com_basic_face_util_RtspFaceNative_Hang(JNIEnv *env, jclass clazz)
-{
- TeleTask task;
- task.command =TeleTask::HANGUP;
- g_TeleWrapper.push(task);
-}
-
-void Java_cn_com_basic_face_util_RtspFaceNative_TelShutdown(JNIEnv *env, jclass clazz)
-{
- 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 phoneNumber)
+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]);
- std::string _phoneNumber;
- {
- const char *utfFunc = env->GetStringUTFChars(phoneNumber, NULL);
- _phoneNumber = utfFunc;
- env->ReleaseStringUTFChars(phoneNumber, utfFunc);
- }
-
- cameraWrapper.setFaceLabel(stTrackId, _phoneNumber);
+ const char *utfChars = env->GetStringUTFChars(label, NULL);
+ std::string labelstr(utfChars);
+ std::wstring wlabelstr;
+ wlabelstr.assign(labelstr.begin(), labelstr.end());
+ env->ReleaseStringUTFChars(label, utfChars);
+ cameraWrapper.setFaceLabel(stTrackId, wlabelstr);
}
} // extern C
--
Gitblit v1.8.0