From 2b43077d967c28fe99e1ff2b99f19e1433c710d9 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 17 八月 2017 12:28:36 +0800
Subject: [PATCH] aaaaa

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt |   58 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 95d13b3..f733384 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -7,7 +7,7 @@
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")
 
 set(WORKSPACE_PATH "D:/workspace/proxy")
-set(ARCH "arm64-v8a")
+set(ARCH "armeabi-v7a")
 
 include_directories(
 					"${WORKSPACE_PATH}/RtspFace"
@@ -24,6 +24,7 @@
 					"${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"
 
@@ -35,14 +36,14 @@
 
 					"${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
@@ -51,39 +52,38 @@
 			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_SensetimeFaceTrack.cpp"
 			"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.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_RTSPServer.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
@@ -108,13 +108,14 @@
 					  "${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.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/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+					  "${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/android_sys/libgui.so"
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
@@ -125,6 +126,9 @@
 
 add_library(rtspface_client SHARED
 			RtspNativeCodecJNIClient.cpp
+			RemoteMethod.capnp.cpp
+			RemoteFuncClient.cpp
+			RemoteFunc.cpp
 			CameraWrapperClient.cpp
 			FaceCache.cpp
 			FaceCacheForPLBG.cpp
@@ -133,6 +137,7 @@
 			cpu_sched_test.cpp
 			serial.c
 			TeleWrapper.cpp
+			AppConfig.cpp
 
 			"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
 			"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -141,12 +146,12 @@
 			"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
 			"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
 			"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+			"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.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"
@@ -154,11 +159,6 @@
 
 			"${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"
 
@@ -187,12 +187,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/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+					  "${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/android_sys/libgui.so"
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"

--
Gitblit v1.8.0