From 1eb1ffa329352dbbd4c5d6cf3e1ef08272e31957 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 20 七月 2017 13:40:59 +0800
Subject: [PATCH] 缩放和中文字体稳定版，NV12转RGB565功能正常
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 88 ++++++--------------------------------------
1 files changed, 12 insertions(+), 76 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 1e9425e..4b1f6a6 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -19,11 +19,6 @@
#include "DebugNetwork.h"
-extern "C"
-{
-#include "serial.h"
-}
-
//#include <mediastreamer2/include/mediastreamer2/msjava.h>
std::stringstream logss;
@@ -736,94 +731,35 @@
}
-int fd =-1;
-#define PORT "/dev/ttyS4"
-#define BAUD 2400
-static void callNum( char phone)
-{
- switch (phone)
- {
- case '1':
- serialWriteString(fd, "DA");//1
- break;
- case '2':
- serialWriteString(fd, "DB");//2
- break;
- case '3':
- serialWriteString(fd, "DC");//3
- break;
- case '4':
- serialWriteString(fd, "DD");//4
- break;
- case '5':
- serialWriteString(fd, "DE");//5
- break;
- case '6':
- serialWriteString(fd, "DF");//6
- break;
- case '7':
- serialWriteString(fd, "DG");//7
- break;
- case '8':
- serialWriteString(fd, "DH");//8
- break;
- case '9':
- serialWriteString(fd, "DI");//9
- break;
- case '0':
- serialWriteString(fd, "DJ");//0
- break;
- }
-}
+
bool Java_cn_com_basic_face_util_RtspFaceNative_telCall(JNIEnv *env, jclass clazz, jstring phone)
{
- int fd = serialOpen(PORT, BAUD);
- 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(*(phoneNum++));
- }
-
- return false;
}
void Java_cn_com_basic_face_util_RtspFaceNative_Hang(JNIEnv *env, jclass clazz)
{
-
- serialWriteString(fd, "BA");
- serialClose(fd);
}
-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_TelShutdown(JNIEnv *env, jclass clazz)
+{
+}
+
+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