From 00fbeab326328aef416882ce3417b4906d385de3 Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期四, 27 四月 2017 18:38:26 +0800 Subject: [PATCH] optimize --- VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0 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 | 143 ++++++++++------------- VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin | 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 | 157 +++++++++++-------------- VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h | 4 VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0 VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0 13 files changed, 137 insertions(+), 173 deletions(-) diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin index c64788a..f2e7a3a 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 cb4ae89..7eddd1a 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 8669f0d..3f43cd1 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 ff3fe30..270c173 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 f62475e..997760d 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 eb3e058..631d427 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 8ed8d07..8208dad 100644 --- a/VisitFace/RtspNativeCodec/.idea/workspace.xml +++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml @@ -24,18 +24,13 @@ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_server.h" afterPath="" /> <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/face_daemon_proto.h" afterPath="" /> <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/main_face_daemon.cpp" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.cc" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.h" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/PbFaceList" afterPath="" /> <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" /> - <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$/../../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" /> @@ -62,26 +57,10 @@ <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/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/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/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/generated/source/r/debug/com/example/nativecodec/R.java" afterPath="$PROJECT_DIR$/app/build/generated/source/r/debug/com/example/nativecodec/R.java" /> <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/res/merged/debug/layout/main.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/main.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/DebugNetwork.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" /> <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/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" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/main.xml" /> </list> <ignored path="RtspNativeCodec.iws" /> <ignored path=".idea/workspace.xml" /> @@ -113,11 +92,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <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="836"> - <caret line="451" column="0" selection-start-line="451" selection-start-column="0" selection-end-line="451" selection-end-column="0" /> + <state relative-caret-position="380"> + <caret line="430" column="76" selection-start-line="430" selection-start-column="76" selection-end-line="430" selection-end-column="76" /> <folding> <element signature="e#0#31#0" expanded="true" /> <element signature="e#135#173#0" expanded="true" /> @@ -129,8 +108,8 @@ <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="627"> - <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="47" selection-end-column="0" /> + <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> @@ -149,18 +128,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="-2574"> - <caret line="273" column="11" selection-start-line="273" selection-start-column="11" selection-end-line="273" selection-end-column="11" /> + <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" /> <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="-465"> - <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" /> + <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" /> <folding /> </state> </provider> @@ -169,8 +148,8 @@ <file leaf-file-name="DebugNetwork.cpp" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="332"> - <caret line="41" column="21" selection-start-line="41" selection-start-column="21" selection-end-line="41" selection-end-column="21" /> + <state relative-caret-position="144"> + <caret line="120" column="19" selection-start-line="120" selection-start-column="5" selection-end-line="120" selection-end-column="19" /> <folding /> </state> </provider> @@ -179,8 +158,8 @@ <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="314"> - <caret line="135" column="46" selection-start-line="135" selection-start-column="46" selection-end-line="135" selection-end-column="46" /> + <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" /> @@ -193,8 +172,8 @@ <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="190"> - <caret line="10" column="27" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="27" /> + <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> @@ -1950,9 +1929,9 @@ <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.h" /> <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" /> </list> </option> </component> @@ -2697,7 +2676,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1932" height="1176" extended-state="0" /> + <frame x="-8" y="-8" width="1932" height="1176" extended-state="1" /> <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" /> @@ -2719,7 +2698,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="false" show_stripe_button="true" weight="0.2428712" sideWeight="0.64860517" 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.2428712" 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" /> @@ -2747,7 +2726,7 @@ </component> <component name="XDebuggerManager"> <breakpoint-manager> - <option name="time" value="662" /> + <option name="time" value="663" /> </breakpoint-manager> <watches-manager /> </component> @@ -3066,18 +3045,6 @@ </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="314"> - <caret line="135" column="46" selection-start-line="135" selection-start-column="46" selection-end-line="135" selection-end-column="46" /> - <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/res/layout/main.xml"> <provider editor-type-id="text-editor"> <state relative-caret-position="874"> @@ -3097,14 +3064,6 @@ </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="627"> - <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="47" 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"> @@ -3113,48 +3072,68 @@ </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="190"> - <caret line="10" column="27" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="27" /> + <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> - <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="332"> - <caret line="41" column="21" selection-start-line="41" selection-start-column="21" selection-end-line="41" selection-end-column="21" /> - <folding /> + <state relative-caret-position="380"> + <caret line="430" column="76" selection-start-line="430" selection-start-column="76" selection-end-line="430" selection-end-column="76" /> + <folding> + <element signature="e#0#31#0" expanded="true" /> + <element signature="e#135#173#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="-2574"> - <caret line="273" column="11" selection-start-line="273" selection-start-column="11" selection-end-line="273" selection-end-column="11" /> + <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" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="144"> + <caret line="120" column="19" selection-start-line="120" selection-start-column="5" selection-end-line="120" selection-end-column="19" /> <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="-465"> - <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" /> + <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" /> <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="836"> - <caret line="451" column="0" selection-start-line="451" selection-start-column="0" selection-end-line="451" selection-end-column="0" /> - <folding> - <element signature="e#0#31#0" expanded="true" /> - <element signature="e#135#173#0" expanded="true" /> - </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 5560c64..03cd693 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 753dd2f..a72f161 100644 --- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log +++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log @@ -1,88 +1,71 @@ # ninja log v5 -1 813 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -32 879 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 -39 896 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e -18 967 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -11 1335 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 -879 1688 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 -896 1753 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb -1335 2125 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 -814 2293 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 -967 3320 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 -75 716 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 -58 738 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -4 757 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e -21 1025 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -757 1253 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 -28 1335 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 -716 2009 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 -1335 2035 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 -15 2153 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 -1253 2158 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e -738 2348 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 -2009 2641 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb -1025 3431 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 -3431 3980 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -3 1297 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 -1297 1832 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -4 696 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 -32 722 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e -14 814 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -20 930 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -722 1463 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 -41 1515 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 -697 1821 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb -814 1858 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e -25 2097 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 -1464 2135 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 -1515 2319 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 -1821 3057 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 -931 3715 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 -3715 4139 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -4 737 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -23 743 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e -45 813 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 -31 1250 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -70 1488 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 -737 1518 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 -1251 1768 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 -813 1931 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb -17 2167 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 -743 2318 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 -1519 2373 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 -1768 2382 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e -1488 4452 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 -4452 4910 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -19 760 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 -33 799 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -44 867 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e -4 923 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -14 1444 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 -867 1822 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 -760 1883 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb -1444 1946 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 -799 1972 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 -25 2130 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 -1883 2393 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e -1822 3032 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 -924 3512 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 -3512 3950 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -4 563 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -564 982 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -4 422 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -422 866 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 -4 683 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -38 853 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c -4 927 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 -16 994 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e -22 1042 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 -50 1451 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 -853 1652 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 -994 1888 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e -1451 1929 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 -30 2142 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 -1653 2496 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 -1042 2596 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 -1889 2700 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb -927 3473 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 -3473 3950 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 +29 973 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e +2091 3072 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 +59 999 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c +999 3112 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 +5 848 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 +1834 3113 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb +38 1262 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 +3948 4768 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 +20 1581 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 +1581 3049 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 +973 3948 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 +1262 1834 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 +45 3057 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 +848 2091 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e +17 1245 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 +530 1328 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e +25 1342 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c +545 1683 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 +5 1990 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 +1245 2184 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 +1328 2324 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb +1990 2474 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 +1683 2488 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e +30 2658 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 +2184 3010 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 +2324 3617 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 +1342 3988 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 +3988 4915 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 +4 779 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c +17 809 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 +23 843 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e +37 1237 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 +45 1433 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 +779 1515 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 +844 1950 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb +809 1969 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 +28 2166 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 +1950 2207 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 +1515 2256 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e +1433 2859 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 +1238 3620 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 +3620 4066 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 +17 803 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 +32 861 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c +26 887 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e +50 1076 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 +37 1422 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 +803 1545 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 +861 1604 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e +1423 1899 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 +887 1961 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 +4 2257 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 +1545 2355 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb +1076 2638 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o 920851f8d2524120 +1604 3878 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o 52c3b223cc5b5cc6 +3879 5160 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 1504fd8339e50e42 +14 818 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o 2321d0df350e0c14 +28 833 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o 8fa3c5046aba132e +56 867 0 CMakeFiles/rtspface.dir/DebugNetwork.cpp.o 6912857d2f0b093c +4 1002 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 1b670d247e3c3013 +37 1593 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o a0c3298bf2f1fdd3 +867 1765 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o eb13258a52b8c22e +818 1828 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 1b65b282f06a9946 +1593 1938 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o e47d510343935308 +1002 1983 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o 7fc9b5e578c500bb +20 2102 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 8baf55dae28060f7 +1828 2280 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o 4ca01ebe2ad8ddc5 +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 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 6443367..33995ad 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 27 15:27:08 CST 2017 +#Thu Apr 27 17:42:02 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 03da4e9..a695c9f 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 27 15:27:08 CST 2017 +#Thu Apr 27 17:42:01 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/DebugNetwork.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/DebugNetwork.h index 2665e48..1ef12f1 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/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp index 0918661..59f2a80 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp @@ -115,6 +115,8 @@ cameraWrapper.asvrConfig.windowSurface = cameraWrapper.window; cameraWrapper.asvrConfig.outputOriginFrame = true; cameraWrapper.asvrConfig.outputRenderFrame = true; + cameraWrapper.asvrConfig.scaleToWidth = 640; + cameraWrapper.asvrConfig.scaleToHeight = 480; } { -- Gitblit v1.8.0