From ad80ce23000b88857d0c012ec7809b1303f47e5c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 04 七月 2017 17:23:30 +0800
Subject: [PATCH] aaaa

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 6fd84d2..df88c9d 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -10,7 +10,9 @@
             RtspNativeCodecJNI.cpp
             CameraWrapper.cpp
             FaceCache.cpp
+            FaceCacheForPLBG.cpp
             DebugNetwork.cpp
+            CaptureCamera.cpp
 
             "D:/workspace/proxy/RtspFace/PipeLine.cpp"
             "D:/workspace/proxy/RtspFace/Logger/src/logger.cc"
@@ -19,9 +21,20 @@
             "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_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/FaceServer/proto_hton_ntoh.cpp"
             "D:/workspace/proxy/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"
+
             )
 
 # Include libraries needed for native-codec-jni lib
@@ -60,18 +73,23 @@
                     "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include"
 
                     "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include"
+
+                    "D:/workspace/proxy/RtspFace/libv4l2cpp/inc"
+                    #"D:/workspace/proxy/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:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libliveMedia.a"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libgroupsock.a"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/arm64-v8a/libBasicUsageEnvironment.a"
+                      "D:/workspace/proxy/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/libyuv/lib/arm64-v8a/libyuv_static.a"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/arm64-v8a/libopencv_java3.so"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/arm64-v8a/libprotobuf.so"
+                      "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/arm64-v8a/libcvface_api.so"
+
+                      #"D:/workspace/proxy/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"

--
Gitblit v1.8.0