bug fix for client

houxiao

2017-08-11 eb69d9c33b307bfc2d6c7f46a210f98c5fa306c5

 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"

@@ -43,6 +44,9 @@

add_library(rtspface_server SHARED
         RtspNativeCodecJNIServer.cpp
         RemoteMethod.capnp.cpp
         RemoteFuncServer.cpp
         RemoteFunc.cpp
         CameraWrapperServer.cpp
         FaceCache.cpp
         FaceCacheForPLBG.cpp
@@ -51,10 +55,12 @@
         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"
@@ -69,7 +75,7 @@
         #"${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"
@@ -84,6 +90,7 @@
         "${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,11 +115,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/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"

@@ -125,6 +135,9 @@

add_library(rtspface_client SHARED
         RtspNativeCodecJNIClient.cpp
         RemoteMethod.capnp.cpp
         RemoteFuncClient.cpp
         RemoteFunc.cpp
         CameraWrapperClient.cpp
         FaceCache.cpp
         FaceCacheForPLBG.cpp
@@ -133,6 +146,7 @@
         cpu_sched_test.cpp
         serial.c
         TeleWrapper.cpp
         AppConfig.cpp

         "${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
         "${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -187,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"