From a0092014ee12abf06edb1788b189cc7c57336063 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:42:00 +0800
Subject: [PATCH] Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和CapnpProtocol功能初步实现 ........
---
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
index 75f482b..bff5df3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
@@ -5,24 +5,32 @@
#ifndef RTSPNATIVECODEC_REMOTEMETHODCLIENT_H
#define RTSPNATIVECODEC_REMOTEMETHODCLIENT_H
-#include <string>
+#include <iostream>
#include <capnp/ez-rpc.h>
#include "RemoteMethod.proto.h"
#include "CameraWrapperServer.h"
-void startRemoteServer();
-class RtspFaceViewClient : RtspFaceView::Client{
+
+const RtspFaceView::Client getRtspFaceViewClient();
+
+class RtspFaceViewClient{
public:
RtspFaceViewClient();
- ~RtspFaceViewClient(){};
- ::kj::WaitScope& getWaitScope();
+ ~RtspFaceViewClient();
+
+ RtspFaceView::GetFaceListResults::Reader getFaceList(int cameraIndex);
+ RtspFaceView::GetFaceListResults::Reader getFaceImages(int cameraIndex);
+ void setFaceLable(int cameraIndex,int trackId,std::string label);
+
private:
capnp::EzRpcClient rpcClient;
+ RtspFaceDetect::Client client;
};
-
-const RtspFaceViewClient& getRtspFaceViewClient();
class RtspFaceDetectImpl final : public RtspFaceDetect::Server{
public:
+ RtspFaceDetectImpl();
+ ~RtspFaceDetectImpl();
+
virtual ::kj::Promise<void> fireFaceCountListener(FireFaceCountListenerContext context) override ;
};
--
Gitblit v1.8.0