From 92873b5f4cc637dcd03ac9d56cf8ec982df10216 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 17 四月 2017 12:29:55 +0800
Subject: [PATCH] decode bug fix
---
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json | 12
VisitFace/RtspNativeCodec/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml | 2
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 20
VisitFace/RtspNativeCodec/.idea/workspace.xml | 646 +++++++++++++++++++-------------
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt | 4
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 9
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp | 15
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log | 100 ++--
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties | 2
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log | 163 ++++---
VisitFace/RtspNativeCodec/app/build.gradle | 4
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp | 5
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json | 12
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
VisitFace/RtspNativeCodec/app/app.iml | 2
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt | 2
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt | 2
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 12
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock | 0
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties | 2
VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug.ap_ | 0
VisitFace/RtspNativeCodec/app/build/intermediates/manifests/full/debug/AndroidManifest.xml | 2
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log | 100 ++--
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 5
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja | 24 +
VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug-androidTest.ap_ | 0
VisitFace/RtspNativeCodec/release/librtspface.so | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja | 24 +
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt | 4
35 files changed, 703 insertions(+), 470 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin
index dc4c445..40332ad 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin
index 773c49f..c1eb464 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin
index 24df9b8..0e717fc 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock
index 56e89f1..2808f95 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 75a0354..d472663 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index c05fa37..bf54f67 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index ed26a80..b26047b 100644
--- a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
+++ b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index 5b83823..1d1974c 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -10,7 +10,10 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="791a1ca7-972c-421c-af50-d8f452f0c589" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" afterPath="" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" />
@@ -19,9 +22,12 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug-androidTest.ap_" afterPath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug-androidTest.ap_" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug.ap_" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" afterPath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" />
@@ -32,12 +38,28 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/make.sh" afterPath="$PROJECT_DIR$/../../RtspFace/make.sh" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" afterPath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -69,12 +91,14 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="NativeCodec.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
+ <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="153" column="45" selection-start-line="153" selection-start-column="45" selection-end-line="153" selection-end-column="45" />
- <folding />
+ <state relative-caret-position="464">
+ <caret line="87" column="49" selection-start-line="87" selection-start-column="49" selection-end-line="87" selection-end-column="49" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -82,56 +106,31 @@
<file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="497">
- <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="145">
- <caret line="270" column="0" selection-start-line="270" selection-start-column="0" selection-end-line="270" selection-end-column="0" />
+ <state relative-caret-position="472">
+ <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RtspNativeCodecJNI.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
+ <file leaf-file-name="PL_AndroidMediaCodecDecoder.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="513">
- <caret line="31" column="110" selection-start-line="31" selection-start-column="103" selection-end-line="31" selection-end-column="110" />
+ <state relative-caret-position="554">
+ <caret line="76" column="0" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="23" />
+ <folding>
+ <element signature="e#0#40#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PL_SensetimeFaceTrack.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="532">
+ <caret line="263" column="48" selection-start-line="263" selection-start-column="48" selection-end-line="263" selection-end-column="48" />
<folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CameraWrapper.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-76">
- <caret line="84" column="5" selection-start-line="84" selection-start-column="5" selection-end-line="84" selection-end-column="5" />
- <folding>
- <element signature="e#0#26#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CameraWrapper.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="95">
- <caret line="5" column="27" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="27" />
- <folding>
- <element signature="e#131#153#0" expanded="true" />
- <element signature="e#303#341#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -139,30 +138,62 @@
<file leaf-file-name="FaceCache.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="405">
- <caret line="256" column="47" selection-start-line="256" selection-start-column="47" selection-end-line="256" selection-end-column="47" />
- <folding>
- <element signature="e#0#22#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="jni.h" pinned="false" current-in-tab="false">
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="587" column="0" selection-start-line="587" selection-start-column="0" selection-end-line="587" selection-end-column="0" />
+ <state relative-caret-position="382">
+ <caret line="165" column="54" selection-start-line="165" selection-start-column="54" selection-end-line="165" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="MaterialBuffer.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
+ <file leaf-file-name="NativeCodec.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="418">
- <caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
+ <state relative-caret-position="544">
+ <caret line="198" column="44" selection-start-line="198" selection-start-column="44" selection-end-line="198" selection-end-column="44" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="MediaHelper.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="652">
+ <caret line="37" column="35" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="35" />
+ <folding>
+ <element signature="e#50#83#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="NdkMediaFormat.h" pinned="false" current-in-tab="false">
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaFormat.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1976">
+ <caret line="104" column="42" selection-start-line="104" selection-start-column="19" selection-end-line="104" selection-end-column="42" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PL_AndroidSurfaceViewRender.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="97">
+ <caret line="212" column="50" selection-start-line="212" selection-start-column="50" selection-end-line="212" selection-end-column="50" />
+ <folding>
+ <element signature="e#0#40#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="native_window.h" pinned="false" current-in-tab="false">
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/android/native_window.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="608">
+ <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
<folding />
</state>
</provider>
@@ -1498,7 +1529,7 @@
</option>
<option name="modificationStamps">
<map>
- <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4473780982058" />
+ <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4474141319873" />
</map>
</option>
<option name="projectBuildClasspath">
@@ -1860,26 +1891,29 @@
<option value="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/MyGLSurfaceView.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
<option value="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
<option value="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
<option value="$PROJECT_DIR$/build.gradle" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
<option value="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
<option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
<option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
+ <option value="$PROJECT_DIR$/app/build.gradle" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
</list>
</option>
</component>
@@ -1917,12 +1951,17 @@
<panes>
<pane id="PackagesPane" />
<pane id="Scratches" />
+ <pane id="AndroidView" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RtspNativeCodec" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -1947,6 +1986,92 @@
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="nativecodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="util" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspFaceNative.java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -2032,6 +2157,10 @@
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="nativecodec" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -2064,11 +2193,14 @@
<option name="myItemId" value="util" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspFaceNative.java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
- <pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2079,7 +2211,7 @@
<property name="android.project.structure.last.selected" value="app" />
<property name="android.project.structure.proportion" value="0.15" />
<property name="show.do.not.ask.upgrade.gradle.plugin" value="2.2.3" />
- <property name="device.picker.selection" value="015d2109845c1607" />
+ <property name="device.picker.selection" value="30bffbe57d22" />
</component>
<component name="RunManager" selected="Android App.app">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
@@ -2464,24 +2596,24 @@
<editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36479843" sideWeight="0.64806867" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28318584" sideWeight="0.36748928" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29301867" sideWeight="0.33530042" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2920354" sideWeight="0.68937767" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4914163" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29301867" sideWeight="0.33530042" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45427728" sideWeight="0.6732833" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4892704" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4978678" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36479843" sideWeight="0.48933902" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29301867" sideWeight="0.35139486" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25107297" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29301867" sideWeight="0.66469955" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29301867" sideWeight="0.64860517" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -2509,93 +2641,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="411" />
+ <option name="time" value="525" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-95">
- <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/unknown_field_set.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="169">
- <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/MediaSession.hh">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="196">
- <caret line="198" column="10" selection-start-line="198" selection-start-column="10" selection-end-line="198" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/MyGLSurfaceView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1231">
- <caret line="73" column="6" selection-start-line="73" selection-start-column="6" selection-end-line="73" selection-end-column="6" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/arena.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="177" column="55" selection-start-line="177" selection-start-column="55" selection-end-line="177" selection-end-column="55" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/live555/include/groupsock/GroupsockHelper.hh">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider editor-type-id="android-manifest">
- <state />
- </provider>
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="11" column="66" selection-start-line="11" selection-start-column="66" selection-end-line="11" selection-end-column="66" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1881">
- <caret line="99" column="0" selection-start-line="99" selection-start-column="0" selection-end-line="99" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaFormat.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="142">
- <caret line="85" column="19" selection-start-line="85" selection-start-column="19" selection-end-line="85" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaCodec.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="250">
- <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
@@ -2670,7 +2720,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="1362" column="9" selection-start-line="1362" selection-start-column="9" selection-end-line="1362" selection-end-column="9" />
- <folding />
</state>
</provider>
</entry>
@@ -2678,35 +2727,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="110" column="46" selection-start-line="110" selection-start-column="46" selection-end-line="110" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="248">
- <caret line="96" column="81" selection-start-line="96" selection-start-column="81" selection-end-line="96" selection-end-column="81" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="238" column="19" selection-start-line="238" selection-start-column="19" selection-end-line="238" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.cc">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="33" column="23" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="23" />
</state>
</provider>
</entry>
@@ -2743,10 +2763,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-626">
<caret line="108" column="22" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
- <folding>
- <element signature="e#3564#3565#0" expanded="false" />
- <element signature="e#3623#3624#0" expanded="false" />
- </folding>
</state>
</provider>
</entry>
@@ -2761,7 +2777,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="814" column="0" selection-start-line="814" selection-start-column="0" selection-end-line="814" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -2776,14 +2791,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12388">
<caret line="652" column="0" selection-start-line="652" selection-start-column="0" selection-end-line="652" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1768">
- <caret line="119" column="4" selection-start-line="119" selection-start-column="4" selection-end-line="119" selection-end-column="4" />
</state>
</provider>
</entry>
@@ -2791,7 +2798,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="31" column="62" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="62" />
- <folding />
</state>
</provider>
</entry>
@@ -2799,7 +2805,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
- <folding />
</state>
</provider>
</entry>
@@ -2819,92 +2824,207 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="380">
- <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
+ <state relative-caret-position="225">
+ <caret line="587" column="0" selection-start-line="587" selection-start-column="0" selection-end-line="587" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.cc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="230">
+ <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="589">
+ <caret line="31" column="110" selection-start-line="31" selection-start-column="103" selection-end-line="31" selection-end-column="110" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="95">
- <caret line="5" column="27" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="27" />
- <folding>
- <element signature="e#131#153#0" expanded="true" />
- <element signature="e#303#341#0" expanded="true" />
- </folding>
+ <state relative-caret-position="529">
+ <caret line="45" column="78" selection-start-line="45" selection-start-column="78" selection-end-line="45" selection-end-column="78" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="347">
+ <caret line="62" column="19" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="344">
+ <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="260">
+ <caret line="112" column="0" selection-start-line="112" selection-start-column="0" selection-end-line="116" selection-end-column="38" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
- <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
+ <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/H264VideoRTPSource.hh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="836">
+ <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
+ <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/Base64.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="153" column="45" selection-start-line="153" selection-start-column="45" selection-end-line="153" selection-end-column="45" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="587" column="0" selection-start-line="587" selection-start-column="0" selection-end-line="587" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="513">
- <caret line="31" column="110" selection-start-line="31" selection-start-column="103" selection-end-line="31" selection-end-column="110" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="405">
- <caret line="256" column="47" selection-start-line="256" selection-start-column="47" selection-end-line="256" selection-end-column="47" />
+ <state relative-caret-position="456">
+ <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding>
- <element signature="e#0#22#0" expanded="true" />
+ <element signature="e#964#985#0" expanded="true" />
</folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="100">
+ <caret line="212" column="59" selection-start-line="212" selection-start-column="59" selection-end-line="212" selection-end-column="59" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaCodec.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="969">
+ <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-76">
- <caret line="84" column="5" selection-start-line="84" selection-start-column="5" selection-end-line="84" selection-end-column="5" />
+ <state relative-caret-position="1140">
+ <caret line="60" column="68" selection-start-line="60" selection-start-column="68" selection-end-line="60" selection-end-column="68" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaFormat.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1976">
+ <caret line="104" column="42" selection-start-line="104" selection-start-column="19" selection-end-line="104" selection-end-column="42" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/android/native_window.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="608">
+ <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="145">
- <caret line="270" column="0" selection-start-line="270" selection-start-column="0" selection-end-line="270" selection-end-column="0" />
+ <state relative-caret-position="464">
+ <caret line="87" column="49" selection-start-line="87" selection-start-column="49" selection-end-line="87" selection-end-column="49" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="97">
+ <caret line="212" column="50" selection-start-line="212" selection-start-column="50" selection-end-line="212" selection-end-column="50" />
+ <folding>
+ <element signature="e#0#40#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="382">
+ <caret line="165" column="54" selection-start-line="165" selection-start-column="54" selection-end-line="165" selection-end-column="54" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="652">
+ <caret line="37" column="35" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="35" />
+ <folding>
+ <element signature="e#50#83#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="532">
+ <caret line="263" column="48" selection-start-line="263" selection-start-column="48" selection-end-line="263" selection-end-column="48" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="554">
+ <caret line="76" column="0" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="23" />
+ <folding>
+ <element signature="e#0#40#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="544">
+ <caret line="198" column="44" selection-start-line="198" selection-start-column="44" selection-end-line="198" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="497">
- <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="472">
+ <caret line="59" column="31" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="31" />
+ <folding />
</state>
</provider>
</entry>
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps
index ad6d3cf..52fb882 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
index c1e7e30..2b9ec32 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
@@ -1,73 +1,92 @@
# ninja log v5
-24 776 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-30 818 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-818 1617 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-3 439 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-1188 1557 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-15 1223 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-14 734 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-13 1988 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-19 1647 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-4 1188 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-4 1189 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1189 1545 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1171 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1171 1521 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 645 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-6 717 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-9 753 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-5 1014 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-717 1400 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-645 1508 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-10 1623 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-4 1781 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-753 2891 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-2891 3246 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 641 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-5 748 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-6 877 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-10 1104 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-877 1498 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-7 1580 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-748 1587 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-8 1781 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-641 2769 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-2769 3118 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-7 712 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-8 859 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-6 872 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-6 1236 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-712 1364 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-5 1630 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-859 1639 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-4 1815 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-873 2908 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-2908 3254 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 449 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-449 809 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 436 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-436 855 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 447 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-6 1173 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1174 1529 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1178 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1178 1531 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 1189 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1189 1550 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1255 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1255 1604 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 1178 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1178 1532 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-5 524 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-3 1322 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1322 1713 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-5 548 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-6 681 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-6 765 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-7 1281 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-765 1572 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-681 1594 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-8 1649 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-3 1826 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-548 2872 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-2872 3254 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+2 592 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
+4 766 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
+1 846 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+5 1523 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+766 2342 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+593 2444 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+0 2517 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+2342 2619 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o e5f79bab03d05ada
+3 2647 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+1523 2777 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+846 3832 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+3832 4266 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 542 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+3 1644 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+1644 1999 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 419 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+419 769 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 467 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+4 1682 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+1682 2036 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 530 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+530 883 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+14 603 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+603 955 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 550 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+3 1682 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+1682 2033 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 423 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+423 770 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 347 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+347 697 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 377 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+377 720 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+13 508 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+5 563 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+563 1193 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+21 843 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+4 2094 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+2094 2498 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 678 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+678 1193 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 409 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+409 819 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 575 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+575 964 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 477 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+477 922 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+17 456 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+4 520 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+521 917 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+5 452 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+16 522 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+522 913 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 494 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+494 1151 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 518 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+518 920 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 2136 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+2137 2532 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 1245 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+1245 1633 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+4 2221 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+2222 2612 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 585 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+585 983 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+3 700 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
+20 745 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
+15 778 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+33 1421 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+700 1681 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+11 1802 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+778 1843 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+27 1914 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+1421 1984 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+1681 2010 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o e5f79bab03d05ada
+745 3036 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+3036 3430 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+5 675 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+675 1066 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
+17 764 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
+27 848 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
+4 883 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+13 1480 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+883 1828 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+849 1869 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+1480 1925 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o e5f79bab03d05ada
+32 1930 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+20 2018 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+1829 2269 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o edca9b4a8d892a0a
+764 3171 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+3171 3576 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 774045ca0234f4ff
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt
index 467d6ce..90f25f4 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt
@@ -18,7 +18,7 @@
ANDROID_ABI:UNINITIALIZED=armeabi-v7a
//No help, variable specified on the command line.
-ANDROID_NATIVE_API_LEVEL:UNINITIALIZED=22
+ANDROID_NATIVE_API_LEVEL:UNINITIALIZED=21
//No help, variable specified on the command line.
ANDROID_NDK:UNINITIALIZED=D:\Android\adk\ndk-bundle
@@ -202,7 +202,7 @@
Project_SOURCE_DIR:STATIC=D:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp
//Dependencies for the target
-rtspface_LIB_DEPENDS:STATIC=general;android;general;log;general;mediandk;general;OpenMAXAL;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so;
+rtspface_LIB_DEPENDS:STATIC=general;android;general;log;general;mediandk;general;OpenMAXAL;general;jnigraphics;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so;
########################
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log
index cc0be42..5f56ac1 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log
@@ -29,17 +29,17 @@
Determining if the C compiler works passed with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_ab3be"
-[1/2] Building C object CMakeFiles/cmTC_ab3be.dir/testCCompiler.c.o
-[2/2] Linking C executable cmTC_ab3be
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_d07f6"
+[1/2] Building C object CMakeFiles/cmTC_d07f6.dir/testCCompiler.c.o
+[2/2] Linking C executable cmTC_d07f6
Detecting C compiler ABI info compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_ebc74"
-[1/2] Building C object CMakeFiles/cmTC_ebc74.dir/CMakeCCompilerABI.c.o
-[2/2] Linking C executable cmTC_ebc74
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_415a5"
+[1/2] Building C object CMakeFiles/cmTC_415a5.dir/CMakeCCompilerABI.c.o
+[2/2] Linking C executable cmTC_415a5
Using built-in specs.
COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-gcc.exe
COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
@@ -49,17 +49,17 @@
gcc version 4.9.x 20150123 (prerelease) (GCC)
COMPILER_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/
LIBRARY_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/;D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
-COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_ebc74' '-mtls-dialect=gnu'
- D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccpHr0Wh.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_ebc74 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_ebc74.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
+COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_415a5' '-mtls-dialect=gnu'
+ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccz6yauK.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_415a5 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_415a5.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
Parsed C implicit link information from above output:
link line regex: [^( *|.*[/\])(arm-linux-androideabi-ld\.exe|([^/\]+-)?ld|collect2)[^/\]*( |$)]
ignore line: [Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp]
ignore line: []
- ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_ebc74"]
- ignore line: [[1/2] Building C object CMakeFiles/cmTC_ebc74.dir/CMakeCCompilerABI.c.o]
- ignore line: [[2/2] Linking C executable cmTC_ebc74]
+ ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_415a5"]
+ ignore line: [[1/2] Building C object CMakeFiles/cmTC_415a5.dir/CMakeCCompilerABI.c.o]
+ ignore line: [[2/2] Linking C executable cmTC_415a5]
ignore line: [Using built-in specs.
]
ignore line: [COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-gcc.exe
]
ignore line: [COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
]
@@ -76,13 +76,13 @@
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/]
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/]
ignore line: [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
]
- ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_ebc74' '-mtls-dialect=gnu'
]
- link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccpHr0Wh.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_ebc74 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_ebc74.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
+ ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_415a5' '-mtls-dialect=gnu'
]
+ link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccz6yauK.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_415a5 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_415a5.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe] ==> ignore
arg [-plugin] ==> ignore
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll] ==> ignore
arg [-plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe] ==> ignore
- arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempccpHr0Wh.res] ==> ignore
+ arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempccz6yauK.res] ==> ignore
arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
arg [-plugin-opt=-pass-through=-lc] ==> ignore
arg [-plugin-opt=-pass-through=-ldl] ==> ignore
@@ -99,7 +99,7 @@
arg [-znow] ==> ignore
arg [-pie] ==> ignore
arg [-o] ==> ignore
- arg [cmTC_ebc74] ==> ignore
+ arg [cmTC_415a5] ==> ignore
arg [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o] ==> ignore
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb]
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb]
@@ -127,7 +127,7 @@
arg [-znow] ==> ignore
arg [--gc-sections] ==> ignore
arg [-znocopyreloc] ==> ignore
- arg [CMakeFiles/cmTC_ebc74.dir/CMakeCCompilerABI.c.o] ==> ignore
+ arg [CMakeFiles/cmTC_415a5.dir/CMakeCCompilerABI.c.o] ==> ignore
arg [-lgcc] ==> lib [gcc]
arg [-lc] ==> lib [c]
arg [-ldl] ==> lib [dl]
@@ -151,9 +151,9 @@
Detecting C [-std=c11] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_4eac4"
-[1/2] Building C object CMakeFiles/cmTC_4eac4.dir/feature_tests.c.o
-[2/2] Linking C executable cmTC_4eac4
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_02082"
+[1/2] Building C object CMakeFiles/cmTC_02082.dir/feature_tests.c.o
+[2/2] Linking C executable cmTC_02082
Feature record: C_FEATURE:1c_function_prototypes
@@ -165,9 +165,9 @@
Detecting C [-std=c99] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_78f7c"
-[1/2] Building C object CMakeFiles/cmTC_78f7c.dir/feature_tests.c.o
-[2/2] Linking C executable cmTC_78f7c
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_9ee0c"
+[1/2] Building C object CMakeFiles/cmTC_9ee0c.dir/feature_tests.c.o
+[2/2] Linking C executable cmTC_9ee0c
Feature record: C_FEATURE:1c_function_prototypes
@@ -179,9 +179,9 @@
Detecting C [-std=c90] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_cdfb2"
-[1/2] Building C object CMakeFiles/cmTC_cdfb2.dir/feature_tests.c.o
-[2/2] Linking C executable cmTC_cdfb2
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_02eda"
+[1/2] Building C object CMakeFiles/cmTC_02eda.dir/feature_tests.c.o
+[2/2] Linking C executable cmTC_02eda
Feature record: C_FEATURE:1c_function_prototypes
@@ -191,17 +191,17 @@
Determining if the CXX compiler works passed with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_0ef65"
-[1/2] Building CXX object CMakeFiles/cmTC_0ef65.dir/testCXXCompiler.cxx.o
-[2/2] Linking CXX executable cmTC_0ef65
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_3f13c"
+[1/2] Building CXX object CMakeFiles/cmTC_3f13c.dir/testCXXCompiler.cxx.o
+[2/2] Linking CXX executable cmTC_3f13c
Detecting CXX compiler ABI info compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_943a6"
-[1/2] Building CXX object CMakeFiles/cmTC_943a6.dir/CMakeCXXCompilerABI.cpp.o
-[2/2] Linking CXX executable cmTC_943a6
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_2fbcc"
+[1/2] Building CXX object CMakeFiles/cmTC_2fbcc.dir/CMakeCXXCompilerABI.cpp.o
+[2/2] Linking CXX executable cmTC_2fbcc
Using built-in specs.
COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-g++.exe
COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
@@ -211,17 +211,17 @@
gcc version 4.9.x 20150123 (prerelease) (GCC)
COMPILER_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/
LIBRARY_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/;D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
-COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_943a6' '-mtls-dialect=gnu'
- D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\cc6QHxmz.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_943a6 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_943a6.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
+COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_2fbcc' '-mtls-dialect=gnu'
+ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccsQXVcL.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_2fbcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_2fbcc.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
Parsed CXX implicit link information from above output:
link line regex: [^( *|.*[/\])(arm-linux-androideabi-ld\.exe|([^/\]+-)?ld|collect2)[^/\]*( |$)]
ignore line: [Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp]
ignore line: []
- ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_943a6"]
- ignore line: [[1/2] Building CXX object CMakeFiles/cmTC_943a6.dir/CMakeCXXCompilerABI.cpp.o]
- ignore line: [[2/2] Linking CXX executable cmTC_943a6]
+ ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_2fbcc"]
+ ignore line: [[1/2] Building CXX object CMakeFiles/cmTC_2fbcc.dir/CMakeCXXCompilerABI.cpp.o]
+ ignore line: [[2/2] Linking CXX executable cmTC_2fbcc]
ignore line: [Using built-in specs.
]
ignore line: [COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-g++.exe
]
ignore line: [COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
]
@@ -238,13 +238,13 @@
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/]
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/]
ignore line: [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
]
- ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_943a6' '-mtls-dialect=gnu'
]
- link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\cc6QHxmz.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_943a6 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_943a6.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
+ ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_2fbcc' '-mtls-dialect=gnu'
]
+ link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccsQXVcL.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_2fbcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_2fbcc.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe] ==> ignore
arg [-plugin] ==> ignore
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll] ==> ignore
arg [-plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe] ==> ignore
- arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempcc6QHxmz.res] ==> ignore
+ arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempccsQXVcL.res] ==> ignore
arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
arg [-plugin-opt=-pass-through=-lc] ==> ignore
arg [-plugin-opt=-pass-through=-ldl] ==> ignore
@@ -261,7 +261,7 @@
arg [-znow] ==> ignore
arg [-pie] ==> ignore
arg [-o] ==> ignore
- arg [cmTC_943a6] ==> ignore
+ arg [cmTC_2fbcc] ==> ignore
arg [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o] ==> ignore
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb]
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb]
@@ -289,7 +289,7 @@
arg [-znow] ==> ignore
arg [--gc-sections] ==> ignore
arg [-znocopyreloc] ==> ignore
- arg [CMakeFiles/cmTC_943a6.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore
+ arg [CMakeFiles/cmTC_2fbcc.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore
arg [-lstdc++] ==> lib [stdc++]
arg [-lm] ==> lib [m]
arg [-lgcc] ==> lib [gcc]
@@ -315,9 +315,9 @@
Detecting CXX [-std=c++14] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_1e155"
-[1/2] Building CXX object CMakeFiles/cmTC_1e155.dir/feature_tests.cxx.o
-[2/2] Linking CXX executable cmTC_1e155
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_138bf"
+[1/2] Building CXX object CMakeFiles/cmTC_138bf.dir/feature_tests.cxx.o
+[2/2] Linking CXX executable cmTC_138bf
Feature record: CXX_FEATURE:0cxx_aggregate_default_initializers
@@ -382,9 +382,9 @@
Detecting CXX [-std=c++11] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_83078"
-[1/2] Building CXX object CMakeFiles/cmTC_83078.dir/feature_tests.cxx.o
-[2/2] Linking CXX executable cmTC_83078
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_45baf"
+[1/2] Building CXX object CMakeFiles/cmTC_45baf.dir/feature_tests.cxx.o
+[2/2] Linking CXX executable cmTC_45baf
Feature record: CXX_FEATURE:0cxx_aggregate_default_initializers
@@ -449,9 +449,9 @@
Detecting CXX [-std=c++98] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_4a804"
-[1/2] Building CXX object CMakeFiles/cmTC_4a804.dir/feature_tests.cxx.o
-[2/2] Linking CXX executable cmTC_4a804
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_aa1ad"
+[1/2] Building CXX object CMakeFiles/cmTC_aa1ad.dir/feature_tests.cxx.o
+[2/2] Linking CXX executable cmTC_aa1ad
Feature record: CXX_FEATURE:0cxx_aggregate_default_initializers
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json
index 1c39324..2cc585c 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json
@@ -58,6 +58,12 @@
{
"flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/MediaHelper.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
+ },
+
+ {
+ "flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -fPIC -c ",
"src" : "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp",
"workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
},
@@ -70,6 +76,12 @@
{
"flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
+ },
+
+ {
+ "flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -fPIC -c ",
"src" : "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp",
"workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a"
}
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja
index aef2abe..72a6c57 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja
@@ -92,6 +92,16 @@
OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\Logger\src
TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.pdb
+build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/MediaHelper.cpp
+ DEFINES = -Drtspface_EXPORTS
+ DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\MediaHelper.cpp.o.d
+ FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -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/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+ IN_ABS = D:\workspace\proxy\RtspFace\MediaHelper.cpp
+ OBJECT_DIR = CMakeFiles\rtspface.dir
+ OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
+ TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
+ TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.pdb
build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_RTSPClient.cpp
DEFINES = -Drtspface_EXPORTS
DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_RTSPClient.cpp.o.d
@@ -108,6 +118,16 @@
FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -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/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidMediaCodecDecoder.cpp
+ OBJECT_DIR = CMakeFiles\rtspface.dir
+ OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
+ TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
+ TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.pdb
+build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp
+ DEFINES = -Drtspface_EXPORTS
+ DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_AndroidSurfaceViewRender.cpp.o.d
+ FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0 -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/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+ IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidSurfaceViewRender.cpp
OBJECT_DIR = CMakeFiles\rtspface.dir
OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
@@ -130,10 +150,10 @@
#############################################
# Link the shared library D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.so
-build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/FaceCache.cpp.o CMakeFiles/rtspface.dir/PbFaceList.pb.cc.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/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/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
+build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/FaceCache.cpp.o CMakeFiles/rtspface.dir/PbFaceList.pb.cc.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/MediaHelper.cpp.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_AndroidSurfaceViewRender.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o | 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/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
LANGUAGE_COMPILE_FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -O0 -O0
LINK_FLAGS = -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
- LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL 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/libyuv/lib/armeabi-v7a/libyuv_static.a -lopencv_java3 -lprotobuf -lcvface_api -lm "D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a"
+ LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL -ljnigraphics 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/libyuv/lib/armeabi-v7a/libyuv_static.a -lopencv_java3 -lprotobuf -lcvface_api -lm "D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a"
LINK_PATH = -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a
OBJECT_DIR = CMakeFiles\rtspface.dir
POST_BUILD = cd .
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt
index cb3df3d..605ad14 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt
@@ -9,7 +9,7 @@
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_MAKE_PROGRAM=D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe
-DCMAKE_TOOLCHAIN_FILE=D:\Android\adk\ndk-bundle\build\cmake\android.toolchain.cmake
--DANDROID_NATIVE_API_LEVEL=22
+-DANDROID_NATIVE_API_LEVEL=21
-DANDROID_PLATFORM=android-22
-DANDROID_TOOLCHAIN=gcc
-DANDROID_STL=gnustl_static
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt
index 58ab1b2..79bbc94 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt
@@ -18,7 +18,7 @@
ANDROID_ABI:UNINITIALIZED=armeabi-v7a
//No help, variable specified on the command line.
-ANDROID_NATIVE_API_LEVEL:UNINITIALIZED=22
+ANDROID_NATIVE_API_LEVEL:UNINITIALIZED=21
//No help, variable specified on the command line.
ANDROID_NDK:UNINITIALIZED=D:\Android\adk\ndk-bundle
@@ -202,7 +202,7 @@
Project_SOURCE_DIR:STATIC=D:/workspace/proxy/VisitFace/RtspNativeCodec/app/src/main/cpp
//Dependencies for the target
-rtspface_LIB_DEPENDS:STATIC=general;android;general;log;general;mediandk;general;OpenMAXAL;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so;
+rtspface_LIB_DEPENDS:STATIC=general;android;general;log;general;mediandk;general;OpenMAXAL;general;jnigraphics;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so;general;D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so;
########################
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log
index 9a9bf7c..037df05 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log
@@ -29,17 +29,17 @@
Determining if the C compiler works passed with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_ac7fa"
-[1/2] Building C object CMakeFiles/cmTC_ac7fa.dir/testCCompiler.c.o
-[2/2] Linking C executable cmTC_ac7fa
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_a723a"
+[1/2] Building C object CMakeFiles/cmTC_a723a.dir/testCCompiler.c.o
+[2/2] Linking C executable cmTC_a723a
Detecting C compiler ABI info compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_d583a"
-[1/2] Building C object CMakeFiles/cmTC_d583a.dir/CMakeCCompilerABI.c.o
-[2/2] Linking C executable cmTC_d583a
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_a71eb"
+[1/2] Building C object CMakeFiles/cmTC_a71eb.dir/CMakeCCompilerABI.c.o
+[2/2] Linking C executable cmTC_a71eb
Using built-in specs.
COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-gcc.exe
COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
@@ -49,17 +49,17 @@
gcc version 4.9.x 20150123 (prerelease) (GCC)
COMPILER_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/
LIBRARY_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/;D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
-COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_d583a' '-mtls-dialect=gnu'
- D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccDgmolg.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_d583a D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_d583a.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
+COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_a71eb' '-mtls-dialect=gnu'
+ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\cc2TQZty.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_a71eb D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_a71eb.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
Parsed C implicit link information from above output:
link line regex: [^( *|.*[/\])(arm-linux-androideabi-ld\.exe|([^/\]+-)?ld|collect2)[^/\]*( |$)]
ignore line: [Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp]
ignore line: []
- ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_d583a"]
- ignore line: [[1/2] Building C object CMakeFiles/cmTC_d583a.dir/CMakeCCompilerABI.c.o]
- ignore line: [[2/2] Linking C executable cmTC_d583a]
+ ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_a71eb"]
+ ignore line: [[1/2] Building C object CMakeFiles/cmTC_a71eb.dir/CMakeCCompilerABI.c.o]
+ ignore line: [[2/2] Linking C executable cmTC_a71eb]
ignore line: [Using built-in specs.
]
ignore line: [COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-gcc.exe
]
ignore line: [COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
]
@@ -76,13 +76,13 @@
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/]
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/]
ignore line: [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
]
- ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_d583a' '-mtls-dialect=gnu'
]
- link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccDgmolg.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_d583a D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_d583a.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
+ ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_a71eb' '-mtls-dialect=gnu'
]
+ link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\cc2TQZty.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_a71eb D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_a71eb.dir/CMakeCCompilerABI.c.o -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe] ==> ignore
arg [-plugin] ==> ignore
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll] ==> ignore
arg [-plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe] ==> ignore
- arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempccDgmolg.res] ==> ignore
+ arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempcc2TQZty.res] ==> ignore
arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
arg [-plugin-opt=-pass-through=-lc] ==> ignore
arg [-plugin-opt=-pass-through=-ldl] ==> ignore
@@ -99,7 +99,7 @@
arg [-znow] ==> ignore
arg [-pie] ==> ignore
arg [-o] ==> ignore
- arg [cmTC_d583a] ==> ignore
+ arg [cmTC_a71eb] ==> ignore
arg [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o] ==> ignore
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb]
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb]
@@ -127,7 +127,7 @@
arg [-znow] ==> ignore
arg [--gc-sections] ==> ignore
arg [-znocopyreloc] ==> ignore
- arg [CMakeFiles/cmTC_d583a.dir/CMakeCCompilerABI.c.o] ==> ignore
+ arg [CMakeFiles/cmTC_a71eb.dir/CMakeCCompilerABI.c.o] ==> ignore
arg [-lgcc] ==> lib [gcc]
arg [-lc] ==> lib [c]
arg [-ldl] ==> lib [dl]
@@ -151,9 +151,9 @@
Detecting C [-std=c11] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_a3893"
-[1/2] Building C object CMakeFiles/cmTC_a3893.dir/feature_tests.c.o
-[2/2] Linking C executable cmTC_a3893
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_8b7f3"
+[1/2] Building C object CMakeFiles/cmTC_8b7f3.dir/feature_tests.c.o
+[2/2] Linking C executable cmTC_8b7f3
Feature record: C_FEATURE:1c_function_prototypes
@@ -165,9 +165,9 @@
Detecting C [-std=c99] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_bae39"
-[1/2] Building C object CMakeFiles/cmTC_bae39.dir/feature_tests.c.o
-[2/2] Linking C executable cmTC_bae39
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_2dd39"
+[1/2] Building C object CMakeFiles/cmTC_2dd39.dir/feature_tests.c.o
+[2/2] Linking C executable cmTC_2dd39
Feature record: C_FEATURE:1c_function_prototypes
@@ -179,9 +179,9 @@
Detecting C [-std=c90] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_54c5f"
-[1/2] Building C object CMakeFiles/cmTC_54c5f.dir/feature_tests.c.o
-[2/2] Linking C executable cmTC_54c5f
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_c7462"
+[1/2] Building C object CMakeFiles/cmTC_c7462.dir/feature_tests.c.o
+[2/2] Linking C executable cmTC_c7462
Feature record: C_FEATURE:1c_function_prototypes
@@ -191,17 +191,17 @@
Determining if the CXX compiler works passed with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_a4d66"
-[1/2] Building CXX object CMakeFiles/cmTC_a4d66.dir/testCXXCompiler.cxx.o
-[2/2] Linking CXX executable cmTC_a4d66
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_f5962"
+[1/2] Building CXX object CMakeFiles/cmTC_f5962.dir/testCXXCompiler.cxx.o
+[2/2] Linking CXX executable cmTC_f5962
Detecting CXX compiler ABI info compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_eec28"
-[1/2] Building CXX object CMakeFiles/cmTC_eec28.dir/CMakeCXXCompilerABI.cpp.o
-[2/2] Linking CXX executable cmTC_eec28
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_4874b"
+[1/2] Building CXX object CMakeFiles/cmTC_4874b.dir/CMakeCXXCompilerABI.cpp.o
+[2/2] Linking CXX executable cmTC_4874b
Using built-in specs.
COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-g++.exe
COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
@@ -211,17 +211,17 @@
gcc version 4.9.x 20150123 (prerelease) (GCC)
COMPILER_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/
LIBRARY_PATH=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/;D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/;D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
-COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_eec28' '-mtls-dialect=gnu'
- D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\cc6mLJlu.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_eec28 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_eec28.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
+COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_4874b' '-mtls-dialect=gnu'
+ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccJP0dKv.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_4874b D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_4874b.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
Parsed CXX implicit link information from above output:
link line regex: [^( *|.*[/\])(arm-linux-androideabi-ld\.exe|([^/\]+-)?ld|collect2)[^/\]*( |$)]
ignore line: [Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp]
ignore line: []
- ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_eec28"]
- ignore line: [[1/2] Building CXX object CMakeFiles/cmTC_eec28.dir/CMakeCXXCompilerABI.cpp.o]
- ignore line: [[2/2] Linking CXX executable cmTC_eec28]
+ ignore line: [Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_4874b"]
+ ignore line: [[1/2] Building CXX object CMakeFiles/cmTC_4874b.dir/CMakeCXXCompilerABI.cpp.o]
+ ignore line: [[2/2] Linking CXX executable cmTC_4874b]
ignore line: [Using built-in specs.
]
ignore line: [COLLECT_GCC=D:\Android\adk\ndk-bundle\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-g++.exe
]
ignore line: [COLLECT_LTO_WRAPPER=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe
]
@@ -238,13 +238,13 @@
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/]
ignore line: [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/]
ignore line: [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/
]
- ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_eec28' '-mtls-dialect=gnu'
]
- link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\cc6mLJlu.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_eec28 D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_eec28.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
+ ignore line: [COLLECT_GCC_OPTIONS='-g' '-D' 'ANDROID' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-g' '-D' 'ANDROID' '-ffunction-sections' '-funwind-tables' '-fstack-protector-strong' '-march=armv7-a' '-mfloat-abi=softfp' '-mfpu=vfpv3-d16' '-mthumb' '-Wformat=1' '-Werror=format-security' '-pie' '-fPIE' '-v' '-o' 'cmTC_4874b' '-mtls-dialect=gnu'
]
+ link line: [ D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe -plugin D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll -plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe -plugin-opt=-fresolution=C:\Users\houxiao\AppData\Local\Temp\ccJP0dKv.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-ldl -plugin-opt=-pass-through=-lgcc --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm --eh-frame-hdr -dynamic-linker /system/bin/linker -X -m armelf_linux_eabi -z noexecstack -z relro -z now -pie -o cmTC_4874b D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc -LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib -LD:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc --build-id --warn-shared-textrel --fatal-warnings --fix-cortex-a8 --no-undefined -z noexecstack -z relro -z now --gc-sections -z nocopyreloc CMakeFiles/cmTC_4874b.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc -lc -ldl -lgcc D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtend_android.o
]
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/collect2.exe] ==> ignore
arg [-plugin] ==> ignore
arg [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/liblto_plugin-0.dll] ==> ignore
arg [-plugin-opt=D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../libexec/gcc/arm-linux-androideabi/4.9.x/lto-wrapper.exe] ==> ignore
- arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempcc6mLJlu.res] ==> ignore
+ arg [-plugin-opt=-fresolution=C:UsershouxiaoAppDataLocalTempccJP0dKv.res] ==> ignore
arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
arg [-plugin-opt=-pass-through=-lc] ==> ignore
arg [-plugin-opt=-pass-through=-ldl] ==> ignore
@@ -261,7 +261,7 @@
arg [-znow] ==> ignore
arg [-pie] ==> ignore
arg [-o] ==> ignore
- arg [cmTC_eec28] ==> ignore
+ arg [cmTC_4874b] ==> ignore
arg [D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/lib/crtbegin_dynamic.o] ==> ignore
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb]
arg [-LD:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb] ==> dir [D:/Android/adk/ndk-bundle/toolchains/arm-linux-androideabi-4.9/prebuilt/windows-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/lib/armv7-a/thumb]
@@ -289,7 +289,7 @@
arg [-znow] ==> ignore
arg [--gc-sections] ==> ignore
arg [-znocopyreloc] ==> ignore
- arg [CMakeFiles/cmTC_eec28.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore
+ arg [CMakeFiles/cmTC_4874b.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore
arg [-lstdc++] ==> lib [stdc++]
arg [-lm] ==> lib [m]
arg [-lgcc] ==> lib [gcc]
@@ -315,9 +315,9 @@
Detecting CXX [-std=c++14] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_91ada"
-[1/2] Building CXX object CMakeFiles/cmTC_91ada.dir/feature_tests.cxx.o
-[2/2] Linking CXX executable cmTC_91ada
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_72388"
+[1/2] Building CXX object CMakeFiles/cmTC_72388.dir/feature_tests.cxx.o
+[2/2] Linking CXX executable cmTC_72388
Feature record: CXX_FEATURE:0cxx_aggregate_default_initializers
@@ -382,9 +382,9 @@
Detecting CXX [-std=c++11] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_bb2cf"
-[1/2] Building CXX object CMakeFiles/cmTC_bb2cf.dir/feature_tests.cxx.o
-[2/2] Linking CXX executable cmTC_bb2cf
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_7cfed"
+[1/2] Building CXX object CMakeFiles/cmTC_7cfed.dir/feature_tests.cxx.o
+[2/2] Linking CXX executable cmTC_7cfed
Feature record: CXX_FEATURE:0cxx_aggregate_default_initializers
@@ -449,9 +449,9 @@
Detecting CXX [-std=c++98] compiler features compiled with the following output:
Change Dir: D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeTmp
-Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_47508"
-[1/2] Building CXX object CMakeFiles/cmTC_47508.dir/feature_tests.cxx.o
-[2/2] Linking CXX executable cmTC_47508
+Run Build Command:"D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe" "cmTC_dcd6d"
+[1/2] Building CXX object CMakeFiles/cmTC_dcd6d.dir/feature_tests.cxx.o
+[2/2] Linking CXX executable cmTC_dcd6d
Feature record: CXX_FEATURE:0cxx_aggregate_default_initializers
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json
index 1e64eb5..9d774cb 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json
@@ -58,6 +58,12 @@
{
"flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/MediaHelper.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a"
+ },
+
+ {
+ "flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -fPIC -c ",
"src" : "D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp",
"workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a"
},
@@ -70,6 +76,12 @@
{
"flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -fPIC -c ",
+ "src" : "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp",
+ "workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a"
+ },
+
+ {
+ "flags" : " --sysroot=D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm -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\\libyuv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\opencv\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\protobuf\\include -ID:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\libs\\st_face\\include -ID:\\workspace\\proxy\\RtspFace -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\libs\\armeabi-v7a\\include -isystem D:\\Android\\adk\\ndk-bundle\\sources\\cxx-stl\\gnu-libstdc++\\4.9\\include\\backward -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -fPIC -c ",
"src" : "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp",
"workingDirectory" : "D:/workspace/proxy/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a"
}
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja
index d7f2009..241eaaa 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja
@@ -92,6 +92,16 @@
OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\Logger\src
TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\release\obj\armeabi-v7a\librtspface.pdb
+build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/MediaHelper.cpp
+ DEFINES = -Drtspface_EXPORTS
+ DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\MediaHelper.cpp.o.d
+ FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -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/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+ IN_ABS = D:\workspace\proxy\RtspFace\MediaHelper.cpp
+ OBJECT_DIR = CMakeFiles\rtspface.dir
+ OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
+ TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
+ TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\release\obj\armeabi-v7a\librtspface.pdb
build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_RTSPClient.cpp
DEFINES = -Drtspface_EXPORTS
DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_RTSPClient.cpp.o.d
@@ -108,6 +118,16 @@
FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -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/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidMediaCodecDecoder.cpp
+ OBJECT_DIR = CMakeFiles\rtspface.dir
+ OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
+ TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
+ TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\release\obj\armeabi-v7a\librtspface.pdb
+build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp
+ DEFINES = -Drtspface_EXPORTS
+ DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_AndroidSurfaceViewRender.cpp.o.d
+ FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG -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/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+ IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidSurfaceViewRender.cpp
OBJECT_DIR = CMakeFiles\rtspface.dir
OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
@@ -130,10 +150,10 @@
#############################################
# Link the shared library D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\release\obj\armeabi-v7a\librtspface.so
-build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/release/obj/armeabi-v7a/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/FaceCache.cpp.o CMakeFiles/rtspface.dir/PbFaceList.pb.cc.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/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/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
+build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/release/obj/armeabi-v7a/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/FaceCache.cpp.o CMakeFiles/rtspface.dir/PbFaceList.pb.cc.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/MediaHelper.cpp.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_AndroidSurfaceViewRender.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o | 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/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
LANGUAGE_COMPILE_FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG -Os -DNDEBUG -Os -DNDEBUG
LINK_FLAGS = -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
- LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL 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/libyuv/lib/armeabi-v7a/libyuv_static.a -lopencv_java3 -lprotobuf -lcvface_api -lm "D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a"
+ LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL -ljnigraphics 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/libyuv/lib/armeabi-v7a/libyuv_static.a -lopencv_java3 -lprotobuf -lcvface_api -lm "D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a"
LINK_PATH = -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a
OBJECT_DIR = CMakeFiles\rtspface.dir
POST_BUILD = cd .
diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt
index f645fbc..55d1b9e 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt
@@ -9,7 +9,7 @@
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_MAKE_PROGRAM=D:\Android\adk\cmake\3.6.3155560\bin\ninja.exe
-DCMAKE_TOOLCHAIN_FILE=D:\Android\adk\ndk-bundle\build\cmake\android.toolchain.cmake
--DANDROID_NATIVE_API_LEVEL=22
+-DANDROID_NATIVE_API_LEVEL=21
-DANDROID_PLATFORM=android-22
-DANDROID_TOOLCHAIN=gcc
-DANDROID_STL=gnustl_static
diff --git a/VisitFace/RtspNativeCodec/app/app.iml b/VisitFace/RtspNativeCodec/app/app.iml
index ab3d316..6b80c23 100644
--- a/VisitFace/RtspNativeCodec/app/app.iml
+++ b/VisitFace/RtspNativeCodec/app/app.iml
@@ -110,7 +110,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
- <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+ <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
diff --git a/VisitFace/RtspNativeCodec/app/build.gradle b/VisitFace/RtspNativeCodec/app/build.gradle
index 925d761..779f933 100644
--- a/VisitFace/RtspNativeCodec/app/build.gradle
+++ b/VisitFace/RtspNativeCodec/app/build.gradle
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 22
+ compileSdkVersion 21
buildToolsVersion '25.0.2'
defaultConfig {
applicationId 'com.example.nativecodec'
- minSdkVersion 22
+ minSdkVersion 21
targetSdkVersion 22
ndk {
//abiFilters 'armeabi-v7a', 'x86' , 'x86_64', 'armeabi' , 'arm64-v8a'
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 2a48d5f..8798af4 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Thu Apr 13 12:02:18 CST 2017
+#Mon Apr 17 12:28:45 CST 2017
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index d3e6411..5b9ab4d 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 13 12:02:18 CST 2017
+#Mon Apr 17 12:28:44 CST 2017
D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi\\ic_launcher.png
D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi\\ic_launcher.png
D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi\\ic_launcher.png
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml b/VisitFace/RtspNativeCodec/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
index 82561e5..0e175dd 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.nativecodec.test">
- <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="22" />
+ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="22" />
<application>
<uses-library android:name="android.test.runner" />
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/manifests/full/debug/AndroidManifest.xml b/VisitFace/RtspNativeCodec/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
index f039497..ac01107 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
@@ -3,7 +3,7 @@
package="com.example.nativecodec" >
<uses-sdk
- android:minSdkVersion="22"
+ android:minSdkVersion="21"
android:targetSdkVersion="22" />
<uses-feature android:glEsVersion="0x00020000" />
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug-androidTest.ap_ b/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug-androidTest.ap_
index 6ee1d5e..b85c09b 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug-androidTest.ap_
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug-androidTest.ap_
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug.ap_ b/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug.ap_
index 28833dd..6f1b3d0 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug.ap_
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/res/resources-debug.ap_
Binary files differ
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index e9c54d0..e59e4a2 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -14,9 +14,11 @@
"D:/workspace/proxy/RtspFace/PipeLine.cpp"
"D:/workspace/proxy/RtspFace/Logger/src/logger.cc"
+ "D:/workspace/proxy/RtspFace/MediaHelper.cpp"
"D:/workspace/proxy/RtspFace/PL_RTSPClient.cpp"
"D:/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp"
- "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"
+ "D:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+ "D:/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp"
)
# Include libraries needed for native-codec-jni lib
@@ -24,7 +26,10 @@
android
log
mediandk
- OpenMAXAL)
+ OpenMAXAL
+ #gui
+ jnigraphics
+ )
include_directories("D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include"
"D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment"
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
index 20290c2..c3e980a 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.cpp
@@ -37,6 +37,11 @@
bool CameraWrapper::initPl()
{
+ PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
+ PipeLine::register_global_elem_creator("PL_AndroidMediaCodecDecoder", create_PL_AndroidMediaCodecDecoder);
+ PipeLine::register_global_elem_creator("PL_AndroidSurfaceViewRender", create_PL_AndroidSurfaceViewRender);
+ PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
+
PL_RTSPClient* rtspClient = (PL_RTSPClient*)pipeLine->push_elem("PL_RTSPClient");
bool ret = rtspClient->init(&rtspConfig);
if (!ret)
@@ -47,12 +52,20 @@
PL_AndroidMediaCodecDecoder* amcDecoder = (PL_AndroidMediaCodecDecoder*)pipeLine->push_elem("PL_AndroidMediaCodecDecoder");
ret = amcDecoder->init(&amcdConfig);
- if (!ret)
+ if (!ret)
{
LOG_ERROR << "amcDecoder.init error" << LOG_ENDL;
return false;
}
+ PL_AndroidSurfaceViewRender* asvRender = (PL_AndroidSurfaceViewRender*)pipeLine->push_elem("PL_AndroidSurfaceViewRender");
+ ret = asvRender->init(&asvrConfig);
+ if (!ret)
+ {
+ LOG_ERROR << "asvRender.init error" << LOG_ENDL;
+ return false;
+ }
+
#ifdef USE_ST_SDK
PL_SensetimeFaceTrack* sfTrack = (PL_SensetimeFaceTrack*)pipeLine->push_elem("PL_SensetimeFaceTrack");
ret = sfTrack->init(&sftConfig);
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index cd5f404..0d9f851 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -9,6 +9,7 @@
#include <PipeLine.h>
#include <PL_RTSPClient.h>
#include <PL_AndroidMediaCodecDecoder.h>
+#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
//#include "looper.h"
@@ -24,9 +25,10 @@
PipeLine* pipeLine;
PL_RTSPClient_Config rtspConfig;
- PL_AndroidMediaCodecDecoder_Config amcdConfig;
- SensetimeFaceTrackConfig sftConfig;
-
+ PL_AndroidMediaCodecDecoder_Config amcdConfig;
+ PL_AndroidSurfaceViewRender_Config asvrConfig;
+ SensetimeFaceTrackConfig sftConfig;
+
int cameraIdx;
JavaVM* javaVM;
JNIEnv* javaEnv;
@@ -41,8 +43,8 @@
FaceCache faceCache;
CameraWrapper() :
- pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(),
- cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
+ pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), asvrConfig(),
+ cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
live_daemon_thid(0), running(false),
faceCacheLocked(false), faceCache()
{
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
index d5c6e89..f06edef 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
@@ -161,8 +161,9 @@
for (int i = 0; i < ctx.faceFeatures.size(); i++)
{
const FaceRect& faceRect(ctx.faceFeatures[i].rect);
- cv::Mat roiMat(yMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
- size_t s = roiMat.total() * roiMat.elemSize();
+ cv::Mat roiMat1(yMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
+ cv::Mat roiMat(roiMat1.clone()); // #todo copy data should be avoid!!!!
+ size_t s = roiMat.total() * roiMat.elemSize();
PbFaceList_FaceListImage pbFaceListImage;
pbFaceListImage.set_idx(i);
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 69836e8..c3bf7ce 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -23,9 +23,6 @@
void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
{
g_logger.set_level(VERBOSE);
-
- PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
- PipeLine::register_global_elem_creator("PL_AndroidMediaCodecDecoder", create_PL_AndroidMediaCodecDecoder);
#ifdef USE_ST_SDK
PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
@@ -79,13 +76,21 @@
cameraWrapper.rtspConfig.args = nullptr;
}
+ {
+ cameraWrapper.asvrConfig.windowSurface = cameraWrapper.window;
+ cameraWrapper.asvrConfig.outputOriginFrame = true;
+ cameraWrapper.asvrConfig.outputRenderFrame = true;
+ }
+
{
cameraWrapper.amcdConfig.ak_mime = "video/avc";
- cameraWrapper.amcdConfig.ak_width = 1920;
- cameraWrapper.amcdConfig.ak_height = 1080;
- cameraWrapper.amcdConfig.windowSurface = cameraWrapper.window = nullptr;//#todo
+ cameraWrapper.amcdConfig.ak_width = 640;
+ cameraWrapper.amcdConfig.ak_height = 480;
+ cameraWrapper.amcdConfig.windowSurface = nullptr; // cameraWrapper.window
cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
+ cameraWrapper.amcdConfig.renderFromOutputBuffIdx = false;//true
+ cameraWrapper.amcdConfig.renderFromOutputBuff = false;
#ifndef USE_ST_SDK
cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = true;
#endif
@@ -97,7 +102,8 @@
cameraWrapper.sftConfig.draw_face_rect = false;
cameraWrapper.sftConfig.draw_face_feature_point = false;
cameraWrapper.sftConfig.generate_face_feature = true;
- }
+ cameraWrapper.sftConfig.doTrackPerFrame = 50;
+ }
bool ret = cameraWrapper.initPl();
if (ret)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
index 2775aac..bc184a0 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
+++ b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
@@ -17,6 +17,7 @@
package com.example.nativecodec;
import android.app.Activity;
+import android.graphics.PixelFormat;
import android.graphics.SurfaceTexture;
import android.os.Bundle;
import android.util.Log;
@@ -191,7 +192,7 @@
//mCreated = createStreamingMediaPlayer(getResources().getAssets(), mSourceString);
//#todo ok
- mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
+ mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
//mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
//mCreated = createPlayer(1, "rtsp://192.168.1.56:8554");
@@ -337,6 +338,7 @@
void useAsSinkForNative() {
Surface s = mSurfaceHolder.getSurface();
Log.i("@@@", "setting surface " + s);
+ //mSurfaceHolder1.setFormat(PixelFormat.RGBA_8888);
RtspFaceNative.setSurface(1, s);
}
@@ -358,6 +360,7 @@
void useAsSinkForNative() {
SurfaceTexture st = mMyGLSurfaceView.getSurfaceTexture();
Surface s = new Surface(st);
+ //setEGLConfigChooser(8, 8, 8, 8, 0, 0);
RtspFaceNative.setSurface(2, s);
s.release();
}
diff --git a/VisitFace/RtspNativeCodec/release/librtspface.so b/VisitFace/RtspNativeCodec/release/librtspface.so
index 88ac938..9656ae5 100644
--- a/VisitFace/RtspNativeCodec/release/librtspface.so
+++ b/VisitFace/RtspNativeCodec/release/librtspface.so
Binary files differ
--
Gitblit v1.8.0