From 92873b5f4cc637dcd03ac9d56cf8ec982df10216 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 17 四月 2017 12:29:55 +0800
Subject: [PATCH] decode bug fix
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index cd5f404..0d9f851 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -9,6 +9,7 @@
#include <PipeLine.h>
#include <PL_RTSPClient.h>
#include <PL_AndroidMediaCodecDecoder.h>
+#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
//#include "looper.h"
@@ -24,9 +25,10 @@
PipeLine* pipeLine;
PL_RTSPClient_Config rtspConfig;
- PL_AndroidMediaCodecDecoder_Config amcdConfig;
- SensetimeFaceTrackConfig sftConfig;
-
+ PL_AndroidMediaCodecDecoder_Config amcdConfig;
+ PL_AndroidSurfaceViewRender_Config asvrConfig;
+ SensetimeFaceTrackConfig sftConfig;
+
int cameraIdx;
JavaVM* javaVM;
JNIEnv* javaEnv;
@@ -41,8 +43,8 @@
FaceCache faceCache;
CameraWrapper() :
- pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(),
- cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
+ pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), asvrConfig(),
+ cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
live_daemon_thid(0), running(false),
faceCacheLocked(false), faceCache()
{
--
Gitblit v1.8.0