From 72505b6ff2ee0342a6950af306da0942718ca0b4 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 15:54:36 +0800
Subject: [PATCH] capnp fix bug
---
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp | 1 +
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 8 ++++----
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp | 5 ++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
index b7502eb..6d3733d 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
@@ -306,6 +306,7 @@
imgIdxes.push_back(imgidx);
totalSize += ctx.lastOutputsRGBBufs[i].buffSize;
+ LOG_ERROR << "!!!!!id ="<<imgidx.st_track_id <<"width="<< imgidx.width <<"height="<< imgidx.height<< LOG_ENDL;
}
memcpy(buffImg, ctx.frameRGB, totalSize);
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
index 3dbb1eb..d171cf2 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
@@ -59,8 +59,7 @@
memcpy(imgIndexData.begin(), imgIdxes.data(), imgIdxesSize);
auto imgData = results.initImgData(_faceImagesSize);
memcpy(imgData.begin(), _faceImages, _faceImagesSize);
- results.setImgData(imgData);
- results.setImgIndexData(imgIndexData);
+
LOG_ERROR <<"c++ server : remoteGetFaceListImage!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
}
@@ -73,7 +72,7 @@
cameraWrapper.faceCache.getFaceListPb(pBufPB, faceListBufferSize);
auto buffer = results.initFaceList(faceListBufferSize);
memcpy(buffer.begin(), pBufPB, faceListBufferSize);
- results.setFaceList(buffer);
+
}
void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results){
diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
index d891430..aa76bcf 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
+++ b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
@@ -97,9 +97,9 @@
//server
- //RtspFaceNative.setLocalIP("192.168.1.94");
+ RtspFaceNative.setLocalIP("192.168.1.116");
//client
- RtspFaceNative.setLocalIP("192.168.1.97");
+ //RtspFaceNative.setLocalIP("192.168.1.97");
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -496,8 +496,8 @@
/** Load jni .so on initialization */
static {
//Select library
- System.loadLibrary("rtspface_client");
- //System.loadLibrary("rtspface_server");
+ //System.loadLibrary("rtspface_client");
+ System.loadLibrary("rtspface_server");
//System.loadLibrary("opencv_java3");
}
--
Gitblit v1.8.0