From 23c3323984f984d36248f107a320a8717b430049 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 21 三月 2017 16:23:01 +0800
Subject: [PATCH] bug fix

---
 VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/x86/build.ninja |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/x86/build.ninja b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/x86/build.ninja
index 9bfe644..1aa6975 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/x86/build.ninja
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/x86/build.ninja
@@ -40,6 +40,14 @@
   IN_ABS = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\cpp\RtspNativeCodecJNI.cpp
   OBJECT_DIR = CMakeFiles\rtspface.dir
   OBJECT_FILE_DIR = CMakeFiles\rtspface.dir
+build CMakeFiles/rtspface.dir/CameraWrapper.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
+  DEFINES = -Drtspface_EXPORTS
+  DEP_FILE = CMakeFiles\rtspface.dir\CameraWrapper.cpp.o.d
+  FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti  -std=c++11 -Wall -UNDEBUG -O0 -fno-limit-debug-info -O0 -fno-limit-debug-info  -fPIC
+  INCLUDES = -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/JniHelpers/src/main/cpp -ID:/workspace/proxy/RtspFace -isystem D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include -isystem D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+  IN_ABS = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\src\main\cpp\CameraWrapper.cpp
+  OBJECT_DIR = CMakeFiles\rtspface.dir
+  OBJECT_FILE_DIR = CMakeFiles\rtspface.dir
 build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PipeLine.cpp
   DEFINES = -Drtspface_EXPORTS
   DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PipeLine.cpp.o.d
@@ -72,14 +80,6 @@
   IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidMediaCodecDecoder.cpp
   OBJECT_DIR = CMakeFiles\rtspface.dir
   OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
-build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp
-  DEFINES = -Drtspface_EXPORTS
-  DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_SensetimeFaceTrack.cpp.o.d
-  FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti  -std=c++11 -Wall -UNDEBUG -O0 -fno-limit-debug-info -O0 -fno-limit-debug-info  -fPIC
-  INCLUDES = -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/JniHelpers/src/main/cpp -ID:/workspace/proxy/RtspFace -isystem D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include -isystem D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
-  IN_ABS = D:\workspace\proxy\RtspFace\PL_SensetimeFaceTrack.cpp
-  OBJECT_DIR = CMakeFiles\rtspface.dir
-  OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
 
 # =============================================================================
 # Link build statements for SHARED_LIBRARY target rtspface
@@ -88,10 +88,10 @@
 #############################################
 # Link the shared library D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\x86\librtspface.so
 
-build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/x86/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o | D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a
+build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/x86/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o | D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libliveMedia.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libgroupsock.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libBasicUsageEnvironment.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libUsageEnvironment.a
   LANGUAGE_COMPILE_FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wa,--noexecstack -Wformat -Werror=format-security -fno-exceptions -fno-rtti  -std=c++11 -Wall -UNDEBUG -O0 -fno-limit-debug-info -O0 -fno-limit-debug-info
   LINK_FLAGS = -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Wl,-z,noexecstack -Qunused-arguments -Wl,-z,relro -Wl,-z,now -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Wl,-z,noexecstack -Qunused-arguments -Wl,-z,relro -Wl,-z,now
-  LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libliveMedia.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libgroupsock.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libBasicUsageEnvironment.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/libUsageEnvironment.a -lm "D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_static.a"
+  LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libliveMedia.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libgroupsock.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libBasicUsageEnvironment.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/x86/libUsageEnvironment.a -lm "D:/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/libgnustl_static.a"
   OBJECT_DIR = CMakeFiles\rtspface.dir
   POST_BUILD = cd .
   PRE_LINK = cd .

--
Gitblit v1.8.0