From 142117991fae65646bc5dd59d96c4a5c5e8559ca Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 14:54:25 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
index b80108e..ff81d66 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
@@ -10,7 +10,7 @@
#include <PL_BlockGrouping.h>
#include <PL_ColorConv.h>
#include <PL_AndroidMediaCodecEncoder.h>
-#include <PL_RTSPServer.h>
+#include <PL_RTSPServer2.h>
CameraWrapper::~CameraWrapper()
{
stop();
@@ -104,7 +104,7 @@
PipeLine::register_global_elem_creator("PL_V4L2Source", create_PL_V4L2Source);
PipeLine::register_global_elem_creator("PL_BlockGrouping", create_PL_BlockGrouping);
PipeLine::register_global_elem_creator("PL_AndroidMediaCodecEncoder", create_PL_AndroidMediaCodecEncoder);
- PipeLine::register_global_elem_creator("PL_RTSPServer", create_PL_RTSPServer);
+ PipeLine::register_global_elem_creator("PL_RTSPServer2", create_PL_RTSPServer2);
bool ret = initPl_DecoderPl();
if (!ret)
@@ -169,8 +169,8 @@
return false;
}
- PL_RTSPServer* plRtspServer = (PL_RTSPServer*)pipeLineRender->push_elem("PL_RTSPServer");
- RTSPServerConfig rtspServerConfig;
+ PL_RTSPServer2* plRtspServer = (PL_RTSPServer2*)pipeLineRender->push_elem("PL_RTSPServer2");
+ RTSPServer2Config rtspServerConfig;
//rtspServerConfig.syncDeliverFrame = false;
ret = plRtspServer->init(&rtspServerConfig);
if (!ret)
@@ -380,14 +380,17 @@
return false;
cameraWrapper.faceCache.cachePm(*pm);
//remote call start, 涓轰簡淇濊瘉閫氱敤鎬э紝鏈皢浠ヤ笅姝ラ灏佸叆RtspFaceDetectClient
- RtspFaceDetectClient &client = getRtspFaceDetectClient();
- auto request = client.fireFaceCountListenerRequest();
+ RtspFaceDetectClient* client = getRtspFaceDetectClient();
+ if (client == nullptr)
+ return false;
+
+ auto request = client->fireFaceCountListenerRequest();
request.setCameraIndex(cameraWrapper.cameraIdx);
request.setFaceCount(cameraWrapper.faceCache.getFaceCount(*pm));
auto sendAct = request.send();
- sendAct.wait(client.getWaitScope());
+ sendAct.wait(client->getWaitScope());
//remote call end
- return false;
+ return true;
}
void test_paint(CameraWrapper& cameraWrapper)
--
Gitblit v1.8.0