From 9a3ef17d8b9f96fa05b5439c89bbfc2868d0f268 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 14:53:00 +0800
Subject: [PATCH] optimize
---
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps | 0
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin | 0
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log | 19 +++
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock | 0
VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h | 4
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp | 23 ++-
VisitFace/RtspNativeCodec/.idea/workspace.xml | 255 +++++++++++++++++++-----------------------
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin | 0
9 files changed, 155 insertions(+), 146 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin
index f2e7a3a..c707cff 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 7eddd1a..23b9e67 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 3f43cd1..1199b6c 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 270c173..6b77d8e 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/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index 8208dad..8ff1a8e 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -10,11 +10,6 @@
</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$/../../FaceServer/bias.jpg" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../FaceServer/PbFaceList" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.cc" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../FaceServer/license.lic" />
<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" />
@@ -28,14 +23,9 @@
<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.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$/../../FaceServer/STFaceCache.cpp" afterPath="$PROJECT_DIR$/../../FaceServer/STFaceCache.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../FaceServer/main_face_daemon.cpp" afterPath="$PROJECT_DIR$/../../FaceServer/main_face_daemon.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../FaceServer/make.sh" afterPath="$PROJECT_DIR$/../../FaceServer/make.sh" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../FaceServer/sample_face_search.cpp" afterPath="$PROJECT_DIR$/../../FaceServer/sample_face_search.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../FaceServer/sample_face_search.h" afterPath="$PROJECT_DIR$/../../FaceServer/sample_face_search.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/FFmpegH264Source.h" afterPath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/FFmpegH264Source.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveRTSPServer.h" afterPath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveRTSPServer.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.h" afterPath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.h" />
@@ -57,10 +47,8 @@
<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/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/DebugNetwork.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.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/FaceCache.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -105,41 +93,31 @@
</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">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="33" column="67" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="18" column="48" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
+ <state relative-caret-position="589">
+ <caret line="31" column="31" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="NativeCodec.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="NativeCodec.java" pinned="false" current-in-tab="true">
<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="332">
- <caret line="287" column="30" selection-start-line="287" selection-start-column="30" selection-end-line="287" selection-end-column="30" />
+ <state relative-caret-position="437">
+ <caret line="40" column="31" selection-start-line="40" selection-start-column="31" selection-end-line="40" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="false">
<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="351">
- <caret line="62" column="25" selection-start-line="62" selection-start-column="25" selection-end-line="62" selection-end-column="25" />
+ <state relative-caret-position="788">
+ <caret line="70" column="51" selection-start-line="70" selection-start-column="51" selection-end-line="70" selection-end-column="51" />
<folding />
</state>
</provider>
@@ -158,13 +136,23 @@
<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="56">
- <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="267">
+ <caret line="227" column="75" selection-start-line="227" selection-start-column="73" selection-end-line="227" selection-end-column="75" />
<folding>
<element signature="e#0#22#0" expanded="true" />
- <element signature="e#7547#10017#0" expanded="true" />
- <element signature="e#10043#12425#0" expanded="true" />
+ <element signature="e#7893#10363#0" expanded="true" />
+ <element signature="e#10389#12771#0" expanded="true" />
</folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="convert_from_argb.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from_argb.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="532">
+ <caret line="141" column="14" selection-start-line="141" selection-start-column="8" selection-end-line="141" selection-end-column="14" />
+ <folding />
</state>
</provider>
</entry>
@@ -172,29 +160,10 @@
<file leaf-file-name="DebugNetwork.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="152">
- <caret line="8" column="34" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="34" />
+ <state relative-caret-position="133">
+ <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
<folding>
<element signature="e#55#74#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="257">
- <caret line="226" column="13" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" />
- <folding>
- <element signature="e#0#34#0" expanded="true" />
- <marker date="1493268311755" expanded="true" signature="675:679" ph="{...}" />
- <marker date="1493268311755" expanded="true" signature="718:722" ph="{...}" />
- <marker date="1493268311755" expanded="true" signature="740:1003" ph="{...}" />
- <marker date="1493268311755" expanded="true" signature="1053:1091" ph="{...}" />
- <marker date="1493268311755" expanded="true" signature="1187:1190" ph="{...}" />
- <marker date="1493268311755" expanded="true" signature="1240:1314" ph="{...}" />
- <marker date="1493268311755" expanded="true" signature="3084:3268" ph="{...}" />
</folding>
</state>
</provider>
@@ -203,8 +172,8 @@
<file leaf-file-name="MaterialBuffer.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="95">
- <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+ <state relative-caret-position="399">
+ <caret line="42" column="21" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="21" />
<folding />
</state>
</provider>
@@ -1919,19 +1888,20 @@
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgPub.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
- <option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<option value="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/PbFaceList" />
<option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
<option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
+ <option value="D:/Android/adk/platforms/android-21/android.jar!/javax/microedition/khronos/egl/EGL10.class" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
</list>
</option>
</component>
@@ -2676,7 +2646,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1932" height="1176" extended-state="1" />
+ <frame x="-8" y="-8" width="1932" height="1176" extended-state="0" />
<editor active="true" />
<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" />
@@ -2726,19 +2696,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="663" />
+ <option name="time" value="671" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
- <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$/../../RtspFace/PL_AndroidMediaCodecDecoder.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="347">
@@ -2813,13 +2775,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6194">
<caret line="326" column="0" selection-start-line="326" selection-start-column="0" selection-end-line="326" selection-end-column="0" />
- </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="595">
- <caret line="133" column="0" selection-start-line="133" selection-start-column="0" selection-end-line="141" selection-end-column="62" />
</state>
</provider>
</entry>
@@ -2964,14 +2919,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_argb.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="231">
- <caret line="39" column="0" selection-start-line="39" selection-start-column="0" selection-end-line="44" selection-end-column="38" />
- <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="-228">
@@ -3009,7 +2956,7 @@
<state relative-caret-position="257">
<caret line="226" column="13" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" />
<folding>
- <element signature="e#0#34#0" expanded="true" />
+ <element signature="e#0#34#0" expanded="false" />
<marker date="1493268311755" expanded="true" signature="675:679" ph="{...}" />
<marker date="1493268311755" expanded="true" signature="718:722" ph="{...}" />
<marker date="1493268311755" expanded="true" signature="740:1003" ph="{...}" />
@@ -3037,14 +2984,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="233">
- <caret line="52" column="2" selection-start-line="52" selection-start-column="2" selection-end-line="52" selection-end-column="2" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="874">
@@ -3056,49 +2995,11 @@
<state />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="95">
- <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="18" column="48" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
- <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="285">
<caret line="33" column="67" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
<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="56">
- <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#22#0" expanded="true" />
- <element signature="e#7547#10017#0" expanded="true" />
- <element signature="e#10043#12425#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="152">
- <caret line="8" column="34" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="34" />
- <folding>
- <element signature="e#55#74#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -3113,10 +3014,64 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_argb.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="332">
- <caret line="287" column="30" selection-start-line="287" selection-start-column="30" selection-end-line="287" selection-end-column="30" />
+ <state relative-caret-position="844">
+ <caret line="296" column="33" selection-start-line="296" selection-start-column="29" selection-end-line="296" selection-end-column="33" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
+ <folding>
+ <element signature="e#55#74#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="399">
+ <caret line="42" column="21" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="21" />
+ <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="248">
+ <caret line="112" column="14" selection-start-line="112" selection-start-column="4" selection-end-line="112" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="233">
+ <caret line="52" column="2" selection-start-line="52" selection-start-column="2" selection-end-line="52" selection-end-column="2" />
+ <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="267">
+ <caret line="227" column="75" selection-start-line="227" selection-start-column="73" selection-end-line="227" selection-end-column="75" />
+ <folding>
+ <element signature="e#0#22#0" expanded="true" />
+ <element signature="e#7893#10363#0" expanded="true" />
+ <element signature="e#10389#12771#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from_argb.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="532">
+ <caret line="141" column="14" selection-start-line="141" selection-start-column="8" selection-end-line="141" selection-end-column="14" />
<folding />
</state>
</provider>
@@ -3131,8 +3086,32 @@
</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="351">
- <caret line="62" column="25" selection-start-line="62" selection-start-column="25" selection-end-line="62" selection-end-column="25" />
+ <state relative-caret-position="788">
+ <caret line="70" column="51" selection-start-line="70" selection-start-column="51" selection-end-line="70" selection-end-column="51" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="589">
+ <caret line="31" column="31" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="31" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/javax/microedition/khronos/egl/EGL10.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+ <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="437">
+ <caret line="40" column="31" selection-start-line="40" selection-start-column="31" selection-end-line="40" selection-end-column="31" />
<folding />
</state>
</provider>
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 03cd693..26d5439 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 a72f161..9d98585 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
@@ -69,3 +69,22 @@
833 2355 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120
1765 3823 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6
3823 4245 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
+4 1281 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7
+1281 1710 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
+4 399 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c
+15 558 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013
+559 1013 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
+4 1281 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7
+1281 1705 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
+4 1327 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7
+1327 1746 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
+3 1267 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7
+1268 1677 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
+27 966 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e
+22 1006 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c
+34 1101 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946
+4 1205 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3
+966 1659 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb
+16 1774 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7
+46 2566 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6
+2566 2986 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h
index 1ef12f1..2665e48 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h
@@ -5,8 +5,8 @@
#include "FaceCache.h"
-//#define ENABLE_DEBUG_SENDFACEDETECT
-//#define ENABLE_DEBUG_SENDFACEADD
+#define ENABLE_DEBUG_SENDFACEDETECT
+#define ENABLE_DEBUG_SENDFACEADD
extern std::string g_dbgLog;
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
index 997305c..aec1267 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
@@ -20,7 +20,7 @@
//#define YUV420_TO_RGB888 1
//#define YUV420_TO_RGB565 1
-#define YUV420_TO_ARGB8888 1
+#define YUV420_TO_ABGR8888 1
struct FcPmBreackerContext
{
@@ -98,7 +98,7 @@
return true;
}
- bool convertYUV420ToARGB8888()
+ bool convertYUV420ToABGR8888()
{
int src_height = height;
int src_width = width;
@@ -106,12 +106,23 @@
const uint8* src_u = (const uint8*)(src_y + (src_height * src_width));
const uint8* src_v = (const uint8*)(src_u + (src_height * src_width / 4));
- libyuv::I420ToARGB(src_y, src_width,
+ libyuv::I420ToABGR(src_y, src_width, // android ARGB_8888 is ABGR
src_u, SUBSAMPLE(src_width, 2),
src_v, SUBSAMPLE(src_width, 2),
frameRGB, 4 * src_width,
src_width, src_height);
frameRGBSize = src_height * src_width * 4;
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/face-%u.argb", ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(frameRGB, 1, frameRGBSize, pFile);
+ // fclose(pFile);
+ // if (f > 10)exit(0);
+ //}
+
return true;
}
};
@@ -411,7 +422,7 @@
return true;
}
-#elif YUV420_TO_ARGB8888
+#elif YUV420_TO_ABGR8888
bool FaceCache::getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize)
{
@@ -422,7 +433,7 @@
if (ctx.frameRGBSize == 0)
{
//#todo should optimize not convert the whole image
- if (! ctx.convertYUV420ToARGB8888())
+ if (! ctx.convertYUV420ToABGR8888())
return false;
}
@@ -440,7 +451,7 @@
NativeImgIdx imgidx;
imgidx.offset = offset;
imgidx.size = roiMat.total() * roiMat.elemSize();
- imgidx.type = MB_Frame::MBFT_ARGB8888;
+ imgidx.type = MB_Frame::MBFT_ABGR8888;
imgidx.width = roiMat.cols;
imgidx.height = roiMat.rows;
--
Gitblit v1.8.0