From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp | 49 ++++++++++++++-----------------------------------
1 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
index 5d7a9a0..1636105 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
@@ -10,33 +10,14 @@
#include <iostream>
using namespace std;
-//#todo 淇敼鏈嶅姟绾跨▼鏋勯�犲弬鏁颁紶鍏ユ柟寮�
-RemoteServer<RtspFaceViewImpl> remoteServer("192.168.1.94", 8112);
+AppConfig config("data/config.cfg");
+RemoteServer<RtspFaceViewImpl> remoteServer(config.getStringValue("local_ip"), config.getIntValue("local_port"));
+//RemoteServer<RtspFaceViewImpl> remoteServer("192.168.1.97", 8112);
static RtspFaceDetectClient* rtspFaceDetectClient = nullptr;
void startRemoteServer()
{
-;
- AppConfig config;
- config.loadConfig("data/config.cfg");
remoteServer.start();
-// //#todo 璋冪敤浣嶇疆绉诲姩
-// try
-// {
-// RtspFaceDetectClient rtspFaceDetectClient = RtspFaceDetectClient();
-// RtspFaceDetect::Client& rClient = rtspFaceDetectClient.getClient();
-//
-// auto& waitScope = rtspFaceDetectClient.getWaitScope();
-// auto request = rClient.fireFaceCountListenerRequest();
-// auto sendAct = request.send();
-// sendAct.wait(waitScope);
-// }
-// catch (const kj::Exception& e)
-// {
-// cout << e.getDescription().cStr() << endl;
-// return;
-// }
- //#end
}
RtspFaceDetectClient * getRtspFaceDetectClient()
@@ -83,10 +64,8 @@
if (rpcClient == nullptr) {
try
{
- //#todo ip test
- //rpcClient = new capnp::EzRpcClient("192.168.1.89", 8111);
- //client
- rpcClient = new capnp::EzRpcClient("192.168.1.97", 8111);
+ // rpcClient = new capnp::EzRpcClient("192.168.1.97", 8111);
+ rpcClient = new capnp::EzRpcClient(config.getStringValue("server_ip"), config.getIntValue("server_port"));
}
catch (const kj::Exception& e)
{
@@ -100,27 +79,27 @@
::kj::Promise<void> RtspFaceViewImpl::getFaceList(GetFaceListContext context)
{
+ LOG_ERROR <<"getFaceList :start !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
auto results = context.getResults();
remoteGetFaceList(context.getParams(), results);
- context.setResults(results);
- LOG_ERROR <<"getFaceList : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+
return kj::READY_NOW;
}
::kj::Promise<void> RtspFaceViewImpl::getFaceImages(GetFaceImagesContext context)
{
- auto results = context.getResults();
+ auto results = context.getResults();
remoteGetFaceListImage(context.getParams(), results);
- context.setResults(results);
- LOG_ERROR <<"getFaceImages : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ LOG_ERROR <<"getFaceImages : !!!!!!!!!!!!!!"<< LOG_ENDL;
return kj::READY_NOW;
}
::kj::Promise<void> RtspFaceViewImpl::setFaceLabel(SetFaceLabelContext context)
{
- auto results = context.getResults();
- remoteSetFaceLabel(context.getParams(), results);
- context.setResults(results);
- LOG_ERROR <<"setFaceLabel : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ LOG_ERROR <<"setFaceLabel : !!!!!!!!!!!!"<< LOG_ENDL;
+ auto results = context.getResults();
+
+ remoteSetFaceLabel(context.getParams(), results);
+
return kj::READY_NOW;
}
--
Gitblit v1.8.0