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/RemoteFuncServer.h | 83 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
index 31a19d5..5cf671e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
@@ -1,37 +1,46 @@
-//
-// Created by pansen on 2017/8/4.
-//
-
-#ifndef RTSPNATIVECODEC_REMOTEMETHODSERVER_H
-#define RTSPNATIVECODEC_REMOTEMETHODSERVER_H
-
-#include <string>
-#include <capnp/ez-rpc.h>
-#include "RemoteMethod.proto.h"
-
-class RtspFaceDetectClient :public RtspFaceDetect::Client{
-public:
- RtspFaceDetectClient();
- ~RtspFaceDetectClient(){};
- ::kj::WaitScope& getWaitScope();
-private:
- capnp::EzRpcClient rpcClient;
-};
-
-void startRemoteServer();
-RtspFaceDetectClient& getRtspFaceDetectClient();
-
-class RtspFaceViewImpl final : public RtspFaceView::Server {
-public:
- virtual ::kj::Promise<void> getFaceList(GetFaceListContext context) override;
-
- virtual ::kj::Promise<void> getFaceImages(GetFaceImagesContext context) override;
-
- virtual ::kj::Promise<void> setFaceLabel(SetFaceLabelContext context) override;
-
-private:
-};
-
-
-
-#endif //RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+//
+// Created by pansen on 2017/8/4.
+//
+
+#ifndef RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+#define RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+
+#include <iostream>
+#include <capnp/ez-rpc.h>
+#include "RemoteMethod.proto.h"
+#include "CameraWrapperServer.h"
+
+const RtspFaceDetectClient& getRtspFaceDetectClient();
+
+class RtspFaceDetectClient{
+public:
+ RtspFaceDetectClient();
+ ~RtspFaceDetectClient();
+
+ void fireFaceCountListener(int cameraIndex, int faceCount);
+
+private:
+ capnp::EzRpcClient rpcClient;
+ RtspFaceDetect::Client client;
+};
+
+class RtspFaceViewImpl final : public RtspFaceView::Server {
+public:
+ RtspFaceViewImpl();
+
+ ~RtspFaceViewImpl();
+
+ virtual ::kj::Promise<void> getFaceList(GetFaceListContext context) override;
+
+
+ virtual ::kj::Promise<void> getFaceImages(GetFaceImagesContext context) override;
+
+ virtual ::kj::Promise<void> setFaceLabel(SetFaceLabelContext context) override ;
+
+private:
+ CameraWrapper cameraWrapper;
+};
+
+
+
+#endif //RTSPNATIVECODEC_REMOTEMETHODSERVER_H
--
Gitblit v1.8.0