merge home base

houxiao

2017-08-17 a5fc9f0acaa8b92c8d78f060cd4cdabab2793c62

 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt

@@ -7,6 +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 "armeabi-v7a")

include_directories(
               "${WORKSPACE_PATH}/RtspFace"
@@ -35,14 +36,12 @@

               "${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
@@ -53,7 +52,6 @@
         cpu_sched_test.cpp
         serial.c
         TeleWrapper.cpp
         RemoteMethod.proto.cpp
         AppConfig.cpp

         "${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -64,25 +62,21 @@
         "${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"

@@ -114,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.so"
                 "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
                 "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.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"
@@ -131,6 +126,7 @@

add_library(rtspface_client SHARED
         RtspNativeCodecJNIClient.cpp
         RemoteMethod.capnp.cpp
         RemoteFuncClient.cpp
         RemoteFunc.cpp
         CameraWrapperClient.cpp
@@ -141,7 +137,6 @@
         cpu_sched_test.cpp
         serial.c
         TeleWrapper.cpp
         RemoteMethod.proto.cpp
         AppConfig.cpp

         "${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -151,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"
@@ -164,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"

@@ -197,12 +187,15 @@
                 "${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.so"
                 "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
                 "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
                      "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.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"
                 #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"