From eb69d9c33b307bfc2d6c7f46a210f98c5fa306c5 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 11 八月 2017 14:31:01 +0800
Subject: [PATCH] bug fix for client
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 182 +++++++++++++++++++++++++++++++++++----------
1 files changed, 140 insertions(+), 42 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 8511bca..a28d2d7 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -9,9 +9,45 @@
set(WORKSPACE_PATH "D:/workspace/proxy")
set(ARCH "armeabi-v7a")
-add_library(rtspface SHARED
- RtspNativeCodecJNI.cpp
- CameraWrapper.cpp
+include_directories(
+ "${WORKSPACE_PATH}/RtspFace"
+ "${WORKSPACE_PATH}/FaceServer"
+
+ #"D:/workspace/libhardware-android-5.1.1_r38/include"
+ #"D:/workspace/core-android-5.1.1_r38/include"
+ #"D:/workspace/native-android-5.1.1_r38/include"
+ #"D:/workspace/core-android-5.1.1_r38/libsync/include"
+ #"D:/workspace/native-android-5.1.1_r38/opengl/include"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/include/json"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/opencv/include"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/include"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/include"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/include"
+
+ "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/inc"
+ #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2"
+ )
+
+add_library(rtspface_server SHARED
+ RtspNativeCodecJNIServer.cpp
+ RemoteMethod.capnp.cpp
+ RemoteFuncServer.cpp
+ RemoteFunc.cpp
+ CameraWrapperServer.cpp
FaceCache.cpp
FaceCacheForPLBG.cpp
DebugNetwork.cpp
@@ -19,6 +55,98 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
+ AppConfig.cpp
+
+ "${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
+ "${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
+ "${WORKSPACE_PATH}/RtspFace/MediaHelper.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PreAllocBufferQueue.cpp"
+ "${WORKSPACE_PATH}/RtspFace/GraphicHelper.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_Gainer.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_Scale.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_ColorConv.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_Paint.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_V4L2Source.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_BlockGrouping.cpp"
+ #"${WORKSPACE_PATH}/RtspFace/PL_Queue.cpp"
+ #"${WORKSPACE_PATH}/RtspFace/PL_Fork2.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecEncoder.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_RTSPServer2.cpp"
+
+ "${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
+ "${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
+
+ "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Capture.cpp"
+ "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Device.cpp"
+ "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp"
+ "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Output.cpp"
+
+ "${WORKSPACE_PATH}/RtspFace/CvUtil/CvxText.cpp"
+
+ "${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.cpp"
+ "${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveRTSPServer.cpp"
+ "${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp"
+ "${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/H264FramedSource.cpp"
+ )
+
+# Include libraries needed for native-codec-jni lib
+target_link_libraries(rtspface_server
+ android
+ log
+ #ui
+ mediandk
+ #OpenMAXAL
+ #jnigraphics
+ #EGL
+ #GLESv2
+ #GLESv3
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libliveMedia.a"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libgroupsock.a"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libBasicUsageEnvironment.a"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libUsageEnvironment.a"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/${ARCH}/libyuv_static.a"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/opencv/lib/${ARCH}/libopencv_java3.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/${ARCH}/libprotobuf.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
+
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-async-0.7-dev.so"
+
+ #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+
+ #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
+ #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
+ #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
+ #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libGLESv3.so"
+ )
+
+
+add_library(rtspface_client SHARED
+ RtspNativeCodecJNIClient.cpp
+ RemoteMethod.capnp.cpp
+ RemoteFuncClient.cpp
+ RemoteFunc.cpp
+ CameraWrapperClient.cpp
+ FaceCache.cpp
+ FaceCacheForPLBG.cpp
+ DebugNetwork.cpp
+ CaptureCamera.cpp
+ cpu_sched_test.cpp
+ serial.c
+ TeleWrapper.cpp
+ AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -36,7 +164,7 @@
"${WORKSPACE_PATH}/RtspFace/PL_BlockGrouping.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Queue.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Fork2.cpp"
- "${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecEncoder.cpp"
+ #"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecEncoder.cpp"
"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
"${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
@@ -51,7 +179,7 @@
)
# Include libraries needed for native-codec-jni lib
-target_link_libraries(rtspface
+target_link_libraries(rtspface_client
android
log
#ui
@@ -61,41 +189,7 @@
#EGL
#GLESv2
#GLESv3
- )
-include_directories(
- "${WORKSPACE_PATH}/RtspFace"
- "${WORKSPACE_PATH}/FaceServer"
-
- #"D:/workspace/libhardware-android-5.1.1_r38/include"
- #"D:/workspace/core-android-5.1.1_r38/include"
- #"D:/workspace/native-android-5.1.1_r38/include"
- #"D:/workspace/core-android-5.1.1_r38/libsync/include"
- #"D:/workspace/native-android-5.1.1_r38/opengl/include"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/opencv/include"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/include"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/include"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/include"
-
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/inc"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
-
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2"
- )
-
-target_link_libraries(rtspface
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libliveMedia.a"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libgroupsock.a"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/lib/${ARCH}/libBasicUsageEnvironment.a"
@@ -107,10 +201,14 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.6.1.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.6.1.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.6.1.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-async-0.7-dev.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
--
Gitblit v1.8.0