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/CameraWrapper.h | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index 8bb9f05..bb8ad6b 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -12,6 +12,7 @@
#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
#include <PL_Paint.h>
+#include <PL_Scale.h>
#include <PL_Queue.h>
//#include "looper.h"
@@ -34,6 +35,7 @@
PL_AndroidMediaCodecDecoder_Config amcdConfig;
PL_AndroidSurfaceViewRender_Config asvrConfig;
SensetimeFaceTrackConfig sftConfig;
+ PL_Scale_Config plScaleCfg;
int cameraIdx;
JavaVM* javaVM;
@@ -53,7 +55,7 @@
PLPLContext plplContext;
- std::map<int, std::string> faceLabels;
+ std::map<int, std::wstring> faceLabels;
CameraWrapper() :
pipeLineDecoderDetector(nullptr), pipeLineAnalyzer(nullptr), pipeLineRender(nullptr), queueFrame(nullptr), rtspConfig(), amcdConfig(), asvrConfig(), sftConfig(),
@@ -73,7 +75,7 @@
void lockFace();
void releaseFace();
- void setFaceLabel(int st_track_id, const std::string& label);
+ void setFaceLabel(int st_track_id, const std::wstring& label);
private:
static void* decoder_thd(void *arg);
--
Gitblit v1.8.0