From bf74ac0583bc8102654cd04e7389224419f3ba90 Mon Sep 17 00:00:00 2001 From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 27 七月 2017 09:09:31 +0800 Subject: [PATCH] 商汤人脸检测拆分多线程 --- VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 150 ++++++++++++++++++++++++------------------------- 1 files changed, 74 insertions(+), 76 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt index d48088c..56531b0 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt @@ -1,60 +1,57 @@ cmake_minimum_required(VERSION 3.4.1) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -std=c++11 -DUSE_OPENCV -DUSE_ST_SDK -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DUSE_OPENCV -DUSE_ST_SDK -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG") #debug for video only test #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti -Wall -UNDEBUG") #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") - add_library(rtspface SHARED - RtspNativeCodecJNI.cpp - CameraWrapper.cpp - FaceCache.cpp - FaceCacheForPLBG.cpp - DebugNetwork.cpp - CaptureCamera.cpp - cpu_sched_test.cpp - serial.c - TeleWrapper.cpp + RtspNativeCodecJNI.cpp + CameraWrapper.cpp + FaceCache.cpp + FaceCacheForPLBG.cpp + DebugNetwork.cpp + CaptureCamera.cpp + serial.c + cpu_sched_test.cpp + TeleWrapper.cpp - "D:/workspace/proxy/RtspFace/PipeLine.cpp" - "D:/workspace/proxy/RtspFace/Logger/src/logger.cc" - "D:/workspace/proxy/RtspFace/MediaHelper.cpp" - "D:/workspace/proxy/RtspFace/GraphicHelper.cpp" - "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp" - "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp" - "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp" - "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp" - "D:/workspace/proxy/RtspFace/PL_Gainer.cpp" - "D:/workspace/proxy/RtspFace/PL_Scale.cpp" - "D:/workspace/proxy/RtspFace/PL_ColorConv.cpp" - "D:/workspace/proxy/RtspFace/PL_Paint.cpp" - "D:/workspace/proxy/RtspFace/PL_V4L2Source.cpp" - "D:/workspace/proxy/RtspFace/PL_BlockGrouping.cpp" - #"D:/workspace/proxy/RtspFace/PL_Queue.cpp" - #"D:/workspace/proxy/RtspFace/PL_Fork2.cpp" + "D:/Documents/works/RtspFace/PL_Scale.cpp" + "D:/Documents/works/RtspFace/PipeLine.cpp" + "D:/Documents/works/RtspFace/Logger/src/logger.cc" + "D:/Documents/works/RtspFace/MediaHelper.cpp" + "D:/Documents/works/RtspFace/GraphicHelper.cpp" + "D:/Documents/works/RtspFace/PL_RTSPClient.cpp" + "D:/Documents/works/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp" + "D:/Documents/works/RtspFace/PL_AndroidSurfaceViewRender.cpp" + "D:/Documents/works/RtspFace/PL_SensetimeFaceTrackMitiTrd.cpp" + "D:/Documents/works/RtspFace/PL_ColorConv.cpp" + "D:/Documents/works/RtspFace/PL_Gainer.cpp" + "D:/Documents/works/RtspFace/PL_Paint.cpp" + "D:/Documents/works/RtspFace/PL_V4L2Source.cpp" + "D:/Documents/works/RtspFace/PL_BlockGrouping.cpp" + "D:/Documents/works/RtspFace/PL_Queue.cpp" - "D:/workspace/proxy/FaceServer/proto_hton_ntoh.cpp" - "D:/workspace/proxy/FaceServer/PbFaceList.pb.cc" + "D:/Documents/works/FaceServer/proto_hton_ntoh.cpp" + "D:/Documents/works/FaceServer/PbFaceList.pb.cc" - "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2Capture.cpp" - "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2Device.cpp" - "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp" - "D:/workspace/proxy/RtspFace/libv4l2cpp/src/V4l2Output.cpp" + "D:/Documents/works/RtspFace/libv4l2cpp/src/V4l2Capture.cpp" + "D:/Documents/works/RtspFace/libv4l2cpp/src/V4l2Device.cpp" + "D:/Documents/works/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp" + "D:/Documents/works/RtspFace/libv4l2cpp/src/V4l2Output.cpp" - "D:/workspace/proxy/RtspFace/CvUtil/CvxText.cpp" + "D:/Documents/works/RtspFace/CvUtil/CvxText.cpp" - ) + ) # Include libraries needed for native-codec-jni lib target_link_libraries(rtspface - android - log - #ui - mediandk - #OpenMAXAL + android + log + #ui + mediandk + #OpenMAXAL #jnigraphics #EGL #GLESv2 @@ -62,51 +59,52 @@ ) include_directories( - "D:/workspace/proxy/RtspFace" - "D:/workspace/proxy/FaceServer" + "D:/Documents/works/RtspFace" + "D:/Documents/works/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" + #"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" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/include" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/libyuv/include" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/opencv/include" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/protobuf/include" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/st_face/include" - "D:/workspace/proxy/RtspFace/libv4l2cpp/inc" - #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include" + "D:/Documents/works/RtspFace/libv4l2cpp/inc" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2" - ) + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2" + + #"D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include" + ) target_link_libraries(rtspface - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libliveMedia.a" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libgroupsock.a" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libBasicUsageEnvironment.a" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libUsageEnvironment.a" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so" - "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/freetype/lib/armeabi-v7a/libfreetype.so" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/arm64-v8a/libyuv_static.a" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/opencv/lib/arm64-v8a/libopencv_java3.so" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf.so" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/st_face/lib/arm64-v8a/libcvface_api.so" + "D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/freetype/lib/arm64-v8a/libfreetype.so" - #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/armeabi-v7a/libv4l2wrapper.a" + #"D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/arm64-v8a/libv4l2wrapper.a" - #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so" - #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so" - #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so" - #"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/android_sys/libGLESv3.so" - ) + #"D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so" + #"D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so" + #"D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so" + #"D:/Documents/works/VisitFace/RtspNativeCodec/app/libs/android_sys/libGLESv3.so" + ) -- Gitblit v1.8.0