From 521e435d5d63fc76097e6667ba5ef9bcd1393a7b Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 四月 2017 16:35:32 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/.idea/workspace.xml | 771 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 394 insertions(+), 377 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index 6aff866..a86d8de 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -6,7 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
+ <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="791a1ca7-972c-421c-af50-d8f452f0c589" name="Default" comment="">
@@ -14,35 +14,67 @@
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImg.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_proto.h" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_server.cpp" afterPath="" />
+ <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="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$/../../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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" afterPath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_RTSPServer.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPServer.cpp" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceDetect.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceDetect.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PipeLine.h" afterPath="$PROJECT_DIR$/../../RtspFace/PipeLine.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" afterPath="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/logger.h" afterPath="$PROJECT_DIR$/../../RtspFace/logger.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/main.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/main.cpp" />
<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/blame/res/debug/multi/values.json" afterPath="$PROJECT_DIR$/app/build/intermediates/blame/res/debug/multi/values.json" />
<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/incremental/mergeDebugResources/merged.dir/values/values.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" />
<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/build/intermediates/res/merged/debug/values/values.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/values/values.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/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" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -74,41 +106,35 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="PL_AndroidMediaCodecDecoder.cpp" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <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="311">
- <caret line="294" column="72" selection-start-line="294" selection-start-column="72" selection-end-line="294" selection-end-column="72" />
+ <state relative-caret-position="-1228">
+ <caret line="266" column="28" selection-start-line="266" selection-start-column="28" selection-end-line="266" selection-end-column="28" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ <element signature="e#135#173#0" expanded="true" />
+ <marker date="1493109161314" expanded="true" signature="7947:9999" ph="{...}" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="282">
+ <caret line="15" column="54" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="NdkMediaCodec.h" pinned="false" current-in-tab="false">
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaCodec.h">
+ <file leaf-file-name="face_daemon_proto.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/face_daemon_proto.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="386">
- <caret line="89" column="14" selection-start-line="89" selection-start-column="14" selection-end-line="89" selection-end-column="14" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="native_window.h" pinned="false" current-in-tab="false">
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/android/native_window.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="798">
- <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="RtspNativeCodecJNI.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="652">
- <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+ <state relative-caret-position="342">
+ <caret line="38" column="7" selection-start-line="38" selection-start-column="7" selection-end-line="38" selection-end-column="7" />
<folding />
</state>
</provider>
@@ -117,22 +143,44 @@
<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="451">
- <caret line="195" column="121" selection-start-line="195" selection-start-column="117" selection-end-line="195" selection-end-column="121" />
+ <state relative-caret-position="4180">
+ <caret line="269" column="46" selection-start-line="269" selection-start-column="46" selection-end-line="269" selection-end-column="46" />
+ <folding>
+ <element signature="e#0#15748#0" expanded="false" />
+ <element signature="imports" expanded="false" />
+ <element signature="e#3322#3323#0" expanded="false" />
+ <element signature="e#3384#3385#0" expanded="false" />
+ <element signature="e#6360#6361#0" expanded="false" />
+ <element signature="e#6408#6409#0" expanded="false" />
+ <element signature="e#6549#6550#0" expanded="false" />
+ <element signature="e#6597#6598#0" expanded="false" />
+ <element signature="e#14654#14655#0" expanded="false" />
+ <element signature="e#14708#14709#0" expanded="false" />
+ <element signature="e#14778#14779#0" expanded="false" />
+ <element signature="e#14844#14845#0" expanded="false" />
+ <element signature="e#15299#15300#0" expanded="false" />
+ <element signature="e#15357#15358#0" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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="760">
+ <caret line="52" column="37" selection-start-line="52" selection-start-column="37" selection-end-line="52" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
+ <file leaf-file-name="NativeImg.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImg.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="90" column="5" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="5" />
- <folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#135#173#0" expanded="true" />
- </folding>
+ <state relative-caret-position="114">
+ <caret line="6" column="22" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="22" />
+ <folding />
</state>
</provider>
</entry>
@@ -140,8 +188,8 @@
<file leaf-file-name="FaceCache.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="304">
- <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
+ <state relative-caret-position="114">
+ <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
<folding>
<element signature="e#49#70#0" expanded="true" />
</folding>
@@ -149,35 +197,37 @@
</provider>
</entry>
</file>
- <file leaf-file-name="FaceCache.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp">
+ <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="5111">
- <caret line="329" column="36" selection-start-line="329" selection-start-column="36" selection-end-line="329" selection-end-column="36" />
+ <state relative-caret-position="228">
+ <caret line="12" column="64" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="64" />
<folding>
- <element signature="e#0#22#0" expanded="true" />
- <element signature="e#6117#8587#0" expanded="true" />
+ <element signature="e#55#74#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PL_AndroidSurfaceViewRender.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp">
+ <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="113">
- <caret line="124" column="48" selection-start-line="124" selection-start-column="48" selection-end-line="124" selection-end-column="48" />
+ <state relative-caret-position="950">
+ <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="testRTSPClient.hpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp">
+ <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="6194">
- <caret line="326" column="0" selection-start-line="326" selection-start-column="0" selection-end-line="326" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="386">
+ <caret line="183" column="4" selection-start-line="183" selection-start-column="4" selection-end-line="183" selection-end-column="4" />
+ <folding>
+ <element signature="e#0#22#0" expanded="true" />
+ <element signature="e#6811#9281#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1876,7 +1926,6 @@
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
@@ -1889,16 +1938,21 @@
<option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
<option value="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
- <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$/../../RtspFace/MaterialBuffer.h" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgPub.java" />
+ <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/CMakeLists.txt" />
</list>
</option>
</component>
@@ -1906,7 +1960,7 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1936" />
+ <option name="width" value="1932" />
<option name="height" value="1176" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -1934,9 +1988,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="AndroidView" />
+ <pane id="Scratches" />
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -1965,11 +2020,59 @@
<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.ProjectViewModuleNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -2041,107 +2144,12 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="res" />
+ <option name="myItemId" value="cpp" />
<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>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="layout" />
- <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>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="nativecodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="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_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspFaceNative.java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2533,8 +2541,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
- <editor active="true" />
+ <frame x="-8" y="-8" width="1932" height="1176" extended-state="0" />
+ <editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28318584" sideWeight="0.36748928" order="7" side_tool="false" content_ui="tabs" />
@@ -2542,20 +2550,19 @@
<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="false" show_stripe_button="true" weight="0.29301867" sideWeight="0.33530042" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43067846" sideWeight="0.65450644" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="-1" side_tool="false" 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.2861357" sideWeight="0.65450644" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4892704" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4978678" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27630284" sideWeight="0.34549356" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24946696" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24946581" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21533923" 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="false" show_stripe_button="true" weight="0.33038348" 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" />
@@ -2567,6 +2574,7 @@
<window_info id="Ant Build" active="false" anchor="right" 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="Palette	" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24946581" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
@@ -2583,88 +2591,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="584" />
+ <option name="time" value="638" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/RtspNativeCodec.iml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/native-codec.iml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="646">
- <caret line="44" column="39" selection-start-line="44" selection-start-column="39" selection-end-line="44" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/app.iml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://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">
- <caret line="1362" column="9" selection-start-line="1362" selection-start-column="9" selection-end-line="1362" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/st_face/include/cv_face.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="437">
- <caret line="110" column="46" selection-start-line="110" selection-start-column="46" selection-end-line="110" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.cc">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="963" column="0" selection-start-line="963" selection-start-column="0" selection-end-line="963" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/message_lite.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="265">
- <caret line="222" column="7" selection-start-line="222" selection-start-column="7" selection-end-line="222" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="57">
- <caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/sources/android-22/android/util/Log.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-626">
- <caret line="108" column="22" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/stubs/logging.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
@@ -2679,32 +2610,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/repeated_field.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="513">
- <caret line="1447" column="0" selection-start-line="1447" selection-start-column="0" selection-end-line="1447" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="12388">
- <caret line="652" column="0" selection-start-line="652" selection-start-column="0" selection-end-line="652" selection-end-column="0" />
- </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>
@@ -2787,13 +2696,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="532">
- <caret line="263" column="48" selection-start-line="263" selection-start-column="48" selection-end-line="263" selection-end-column="48" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/RTSPClient.hh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
@@ -2812,30 +2714,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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.hpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="537">
- <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="208">
- <caret line="984" column="27" selection-start-line="984" selection-start-column="9" selection-end-line="984" selection-end-column="27" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="310">
- <caret line="23" column="68" selection-start-line="23" selection-start-column="68" selection-end-line="23" selection-end-column="68" />
- <folding />
</state>
</provider>
</entry>
@@ -2843,23 +2721,6 @@
<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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="341">
- <caret line="21" column="60" selection-start-line="21" selection-start-column="60" selection-end-line="21" selection-end-column="60" />
- <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="542">
- <caret line="86" column="60" selection-start-line="86" selection-start-column="60" selection-end-line="86" selection-end-column="60" />
- <folding />
</state>
</provider>
</entry>
@@ -2867,20 +2728,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="61" column="37" selection-start-line="61" selection-start-column="27" selection-end-line="61" selection-end-column="37" />
- <folding>
- <element signature="e#0#26#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5111">
- <caret line="329" column="36" selection-start-line="329" selection-start-column="36" selection-end-line="329" selection-end-column="36" />
- <folding>
- <element signature="e#0#22#0" expanded="true" />
- <element signature="e#6117#8587#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -2888,60 +2735,20 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<caret line="54" column="4" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
- <provider selected="true" editor-type-id="android-designer2">
- <state />
- </provider>
- <provider editor-type-id="text-editor">
- <state relative-caret-position="1159">
- <caret line="61" column="37" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="35" />
- <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="113">
+ <state relative-caret-position="2356">
<caret line="124" column="48" selection-start-line="124" selection-start-column="48" selection-end-line="124" 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="652">
- <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="304">
- <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
- <folding>
- <element signature="e#49#70#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="451">
- <caret line="195" column="121" selection-start-line="195" selection-start-column="117" selection-end-line="195" selection-end-column="121" />
- <folding />
</state>
</provider>
</entry>
<entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaCodec.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="386">
+ <state relative-caret-position="1691">
<caret line="89" column="14" selection-start-line="89" selection-start-column="14" selection-end-line="89" selection-end-column="14" />
- <folding />
</state>
</provider>
</entry>
@@ -2949,25 +2756,235 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="798">
<caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="5871">
+ <caret line="309" column="0" selection-start-line="309" selection-start-column="0" selection-end-line="309" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/message_lite.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="246">
+ <caret line="173" column="48" selection-start-line="173" selection-start-column="44" selection-end-line="173" selection-end-column="48" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="570">
+ <caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="4" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/repeated_field.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-558">
+ <caret line="745" column="6" selection-start-line="745" selection-start-column="6" selection-end-line="745" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="12464">
+ <caret line="656" column="27" selection-start-line="656" selection-start-column="27" selection-end-line="656" selection-end-column="27" />
+ </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/platforms/android-22/arch-arm/usr/include/unistd.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1596">
+ <caret line="241" column="22" selection-start-line="241" selection-start-column="22" selection-end-line="241" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-133">
+ <caret line="21" column="60" selection-start-line="21" selection-start-column="60" selection-end-line="21" selection-end-column="60" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.hpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="272">
+ <caret line="28" column="6" selection-start-line="28" selection-start-column="2" selection-end-line="28" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="41" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/MyGLSurfaceView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="208">
+ <caret line="73" column="6" selection-start-line="73" selection-start-column="6" selection-end-line="73" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/java/lang/Override.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="874">
+ <caret line="46" column="42" selection-start-line="46" selection-start-column="29" selection-end-line="46" selection-end-column="42" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2">
+ <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="836">
+ <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImg.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="114">
+ <caret line="6" column="22" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="22" />
+ <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="4180">
+ <caret line="269" column="46" selection-start-line="269" selection-start-column="46" selection-end-line="269" selection-end-column="46" />
+ <folding>
+ <element signature="e#0#15748#0" expanded="false" />
+ <element signature="imports" expanded="false" />
+ <element signature="e#3322#3323#0" expanded="false" />
+ <element signature="e#3384#3385#0" expanded="false" />
+ <element signature="e#6360#6361#0" expanded="false" />
+ <element signature="e#6408#6409#0" expanded="false" />
+ <element signature="e#6549#6550#0" expanded="false" />
+ <element signature="e#6597#6598#0" expanded="false" />
+ <element signature="e#14654#14655#0" expanded="false" />
+ <element signature="e#14708#14709#0" expanded="false" />
+ <element signature="e#14778#14779#0" expanded="false" />
+ <element signature="e#14844#14845#0" expanded="false" />
+ <element signature="e#15299#15300#0" expanded="false" />
+ <element signature="e#15357#15358#0" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="254">
+ <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="114">
+ <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
+ <folding>
+ <element signature="e#49#70#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="228">
+ <caret line="12" column="64" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="64" />
+ <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="310">
+ <caret line="23" column="68" selection-start-line="23" selection-start-column="68" selection-end-line="23" selection-end-column="68" />
+ </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="950">
+ <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
+ <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="386">
+ <caret line="183" column="4" selection-start-line="183" selection-start-column="4" selection-end-line="183" selection-end-column="4" />
+ <folding>
+ <element signature="e#0#22#0" expanded="true" />
+ <element signature="e#6811#9281#0" expanded="true" />
+ </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="760">
+ <caret line="52" column="37" selection-start-line="52" selection-start-column="37" selection-end-line="52" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/face_daemon_proto.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="342">
+ <caret line="38" column="7" selection-start-line="38" selection-start-column="7" selection-end-line="38" selection-end-column="7" />
<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="285">
- <caret line="90" column="5" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="5" />
+ <state relative-caret-position="-1228">
+ <caret line="266" column="28" selection-start-line="266" selection-start-column="28" selection-end-line="266" selection-end-column="28" />
<folding>
<element signature="e#0#31#0" expanded="true" />
<element signature="e#135#173#0" expanded="true" />
+ <marker date="1493109161314" expanded="true" signature="7947:9999" ph="{...}" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="311">
- <caret line="294" column="72" selection-start-line="294" selection-start-column="72" selection-end-line="294" selection-end-column="72" />
+ <state relative-caret-position="282">
+ <caret line="15" column="54" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
<folding />
</state>
</provider>
--
Gitblit v1.8.0