From 2734a21a6a355d42fa40fe80624940f8e663a5cc Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 12 四月 2017 14:11:14 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0
VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 4
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock | 0
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties | 2
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 2
VisitFace/RtspNativeCodec/.idea/workspace.xml | 177 +++++++++++++++--------------
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin | 0
VisitFace/RtspNativeCodec/release/app-debug49.apk | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps | 0
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 | 143 ++++++++---------------
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0
14 files changed, 147 insertions(+), 183 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin
index 77fc8ab..6d6ed02 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 aec9815..6bb559f 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 ae47c67..18c66f5 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 8f5625a..f2179fb 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.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 989148e..e5d0081 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 bd5b535..735cfe3 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 54f8f0c..600e64e 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -10,12 +10,10 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="791a1ca7-972c-421c-af50-d8f452f0c589" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" />
<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" />
@@ -32,13 +30,9 @@
<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/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
<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/src/main/cpp/FaceCache.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
<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" />
</list>
<ignored path="RtspNativeCodec.iws" />
@@ -74,18 +68,18 @@
<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="931">
- <caret line="201" column="61" selection-start-line="201" selection-start-column="61" selection-end-line="201" selection-end-column="61" />
+ <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>
</file>
- <file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="false">
+ <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="114">
- <caret line="6" column="3" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
+ <state relative-caret-position="378">
+ <caret line="38" column="34" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -103,11 +97,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="true">
+ <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="532">
- <caret line="279" column="42" selection-start-line="279" selection-start-column="42" selection-end-line="279" selection-end-column="42" />
+ <state relative-caret-position="292">
+ <caret line="253" column="25" selection-start-line="253" selection-start-column="25" selection-end-line="253" selection-end-column="25" />
<folding />
</state>
</provider>
@@ -119,19 +113,6 @@
<state relative-caret-position="133">
<caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
<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="57">
- <caret line="3" column="8" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
- <folding>
- <element signature="e#131#153#0" expanded="true" />
- <element signature="e#303#341#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1885,13 +1866,13 @@
<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/java/cn/com/basic/face/util/RtspFaceNative.java" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
<option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
<option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
</list>
</option>
</component>
@@ -1953,6 +1934,20 @@
<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>
+ <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="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
@@ -1969,6 +1964,20 @@
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </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="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
@@ -2374,8 +2383,8 @@
<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.2979351" sideWeight="0.4753219" 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.7392704" 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="true" show_stripe_button="true" weight="0.4237955" sideWeight="0.3004292" 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.71995705" 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.4936034" 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" />
@@ -2387,7 +2396,7 @@
<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.2979351" sideWeight="0.5246781" 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.4237955" sideWeight="0.69957083" 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" />
@@ -2415,7 +2424,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="328" />
+ <option name="time" value="346" />
</breakpoint-manager>
<watches-manager />
</component>
@@ -2571,22 +2580,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/settings.gradle">
- <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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
@@ -2702,14 +2695,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="684">
- <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
- <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="57">
@@ -2745,38 +2730,12 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="6" column="25" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="25" />
- <folding />
- </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="1349">
<caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<folding>
<element signature="e#0#26#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="931">
- <caret line="201" column="61" selection-start-line="201" selection-start-column="61" selection-end-line="201" selection-end-column="61" />
- <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="114">
- <caret line="6" column="3" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
- <folding>
- <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -2799,13 +2758,63 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/settings.gradle">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="209">
+ <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <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" />
+ <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="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://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="114">
+ <caret line="6" column="25" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="25" />
+ <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="532">
- <caret line="279" column="42" selection-start-line="279" selection-start-column="42" selection-end-line="279" selection-end-column="42" />
+ <state relative-caret-position="292">
+ <caret line="253" column="25" selection-start-line="253" selection-start-column="25" selection-end-line="253" selection-end-column="25" />
<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="378">
+ <caret line="38" column="34" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
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 6397b27..7e426a0 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 ccf8d21..0fec56b 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
@@ -1,96 +1,49 @@
# ninja log v5
-50 851 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-5 498 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-867 1861 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-4 456 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-498 910 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-27 1571 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-851 2004 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-845 3661 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-36 2026 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-3 1134 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-4 468 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-468 860 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1232 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1233 1621 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 418 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-13 1165 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1165 1552 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1152 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1152 1538 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 1168 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1168 1556 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 1124 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1124 1511 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1212 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1212 1974 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 1130 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1131 1507 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1164 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1164 1546 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 627 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-627 1261 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 439 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-440 831 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 463 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-13 1148 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1148 1552 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 1227 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1227 1634 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-3 439 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-439 858 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 476 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-13 2019 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-2019 2432 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-5 750 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-22 828 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-25 912 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-18 1316 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-828 1835 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-29 1873 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-912 1930 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-14 1955 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-751 3147 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-3147 3540 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-108 789 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-16 827 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-3 832 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-94 1510 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-832 1649 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-789 1718 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-104 1818 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-12 1869 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-827 3118 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-3118 3513 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-15 737 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-12 772 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-31 856 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-25 1328 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-856 1585 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-737 1649 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-4 1666 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-18 1692 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-772 2984 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-2984 3480 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-21 1178 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
-39 1204 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-42 1225 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
-35 1688 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
-1225 2015 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
-56 2024 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
-1204 2147 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-52 2221 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
-1178 3478 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
-3478 4084 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 747 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-747 1331 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 485 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-485 869 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 465 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-465 863 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 506 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-506 905 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-4 463 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
-463 864 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
-5 716 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
-716 1120 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+18 748 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
+12 755 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
+755 1607 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+21 771 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+3097 3492 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+15 1448 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+748 1775 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+771 3097 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+3 1621 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+27 1802 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+4 618 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+618 1141 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+3 579 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+579 985 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+4 605 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+605 1006 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+3 522 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+522 926 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+33 1163 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
+15 1210 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
+36 1305 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+12 1659 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+30 2138 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+1163 2161 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+1305 2195 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+4 2202 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+1210 3655 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+3655 4082 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+3 744 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438
+11 803 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345
+19 949 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+26 1218 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+803 1540 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+34 1632 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+15 1761 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+949 1814 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+744 2895 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+2895 3282 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
+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
+12 851 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b
+15 1223 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634
+818 1617 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717
+19 1647 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0
+851 1688 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b
+4 1764 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c
+776 2898 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6
+2898 3287 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb
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 eea820d..41bab10 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 @@
-#Wed Apr 12 12:10:41 CST 2017
+#Wed Apr 12 14:10:23 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 f10c330..4d18aa8 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 @@
-#Wed Apr 12 12:10:41 CST 2017
+#Wed Apr 12 14:10:23 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/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
index 249e3cf..e051cd3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -251,7 +251,7 @@
ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif
- if (imgIdxes.size() < 0)
+ if (imgIdxes.size() == 0)
{
LOG_INFO << "No face image captured" << LOG_ENDL;
return nullptr;
diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index 8d4fb56..4267ef1 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -35,7 +35,9 @@
byte[] faceImages = new byte[1024 * 1024 * 1];
ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
- int c = faceImagesIdx.size();
+ int c = 0;
+ if (faceImagesIdx != null)
+ c = faceImagesIdx.size();
Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
releaseFace(cameraIdx);
diff --git a/VisitFace/RtspNativeCodec/release/app-debug49.apk b/VisitFace/RtspNativeCodec/release/app-debug49.apk
index a4c2747..b9eac4e 100644
--- a/VisitFace/RtspNativeCodec/release/app-debug49.apk
+++ b/VisitFace/RtspNativeCodec/release/app-debug49.apk
Binary files differ
--
Gitblit v1.8.0