pans
2017-08-18 72505b6ff2ee0342a6950af306da0942718ca0b4
capnp fix bug

git-svn-id: http://192.168.1.226/svn/proxy@1028 454eff88-639b-444f-9e54-f578c98de674
3个文件已修改
14 ■■■■ 已修改文件
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
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){
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");
    }