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/release/x86_64/android_gradle_build.json | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64/android_gradle_build.json b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64/android_gradle_build.json
index 1d2abed..bc0dc54 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64/android_gradle_build.json
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64/android_gradle_build.json
@@ -2,37 +2,67 @@
{
"buildFiles" :
[
- "D:/workspace/googlesamples-android-ndk/native-codec/app/src/main/cpp/CMakeLists.txt"
+ "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt"
],
"cleanCommands" :
[
- "D:\\adk\\cmake\\3.6.3155560\\bin\\cmake.exe --build D:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\.externalNativeBuild\\cmake\\release\\x86_64 --target clean"
+ "D:\\adk\\cmake\\3.6.3155560\\bin\\cmake.exe --build D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\.externalNativeBuild\\cmake\\release\\x86_64 --target clean"
],
- "cppFileExtensions" : [ "cpp" ],
+ "cppFileExtensions" : [ "cc", "cpp" ],
"libraries" :
{
- "native-codec-jni-Release-x86_64" :
+ "rtspface-Release-x86_64" :
{
"abi" : "x86_64",
- "artifactName" : "native-codec-jni",
- "buildCommand" : "D:\\adk\\cmake\\3.6.3155560\\bin\\cmake.exe --build D:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\.externalNativeBuild\\cmake\\release\\x86_64 --target native-codec-jni",
+ "artifactName" : "rtspface",
+ "buildCommand" : "D:\\adk\\cmake\\3.6.3155560\\bin\\cmake.exe --build D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\.externalNativeBuild\\cmake\\release\\x86_64 --target rtspface",
"buildType" : "release",
"files" :
[
{
- "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Dnative_codec_jni_EXPORTS -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\BasicUsageEnvironment -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\groupsock -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\liveMedia -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\UsageEnvironment -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
- "src" : "D:/workspace/googlesamples-android-ndk/native-codec/app/src/main/cpp/looper.cpp",
- "workingDirectory" : "D:/workspace/googlesamples-android-ndk/native-codec/app/.externalNativeBuild/cmake/release/x86_64"
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
},
{
- "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Dnative_codec_jni_EXPORTS -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\BasicUsageEnvironment -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\groupsock -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\liveMedia -ID:\\workspace\\googlesamples-android-ndk\\native-codec\\app\\libs\\live555\\include\\UsageEnvironment -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
- "src" : "D:/workspace/googlesamples-android-ndk/native-codec/app/src/main/cpp/native-codec-jni.cpp",
- "workingDirectory" : "D:/workspace/googlesamples-android-ndk/native-codec/app/.externalNativeBuild/cmake/release/x86_64"
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
+ },
+
+ {
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/PipeLine.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
+ },
+
+ {
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/Logger/src/logger.cc",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
+ },
+
+ {
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
+ },
+
+ {
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
+ },
+
+ {
+ "flags" : " -target x86_64-none-linux-android -gcc-toolchain D:/adk/ndk-bundle/toolchains/x86_64-4.9/prebuilt/windows-x86_64 --sysroot=D:/adk/ndk-bundle/platforms/android-21/arch-x86_64 -Drtspface_EXPORTS -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_64\\include -isystem D:\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -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 -O2 -DNDEBUG -O2 -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/x86_64"
}
],
- "output" : "D:/workspace/googlesamples-android-ndk/native-codec/app/build/intermediates/cmake/release/obj/x86_64/libnative-codec-jni.so",
+ "output" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/release/obj/x86_64/librtspface.so",
"toolchain" : "364317101"
}
},
--
Gitblit v1.8.0