development-history/proxy.git

			@@ -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,35 +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_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
			@@ -104,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"
			@@ -121,6 +126,9 @@

			add_library(rtspface_client SHARED
			RtspNativeCodecJNIClient.cpp
			RemoteMethod.capnp.cpp
			RemoteFuncClient.cpp
			RemoteFunc.cpp
			CameraWrapperClient.cpp
			FaceCache.cpp
			FaceCacheForPLBG.cpp
			@@ -129,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"
			@@ -137,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"
			@@ -150,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"

			@@ -183,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"