From 142117991fae65646bc5dd59d96c4a5c5e8559ca Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 14:54:25 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/.idea/workspace.xml | 921 +++++++++++++++++++++++++-------------------------------
1 files changed, 415 insertions(+), 506 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index e4140ea..9d3f7f7 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -14,20 +14,15 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="7ae7b537-c9d7-47f6-b809-98f2bf0296aa" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/RtspNativeCodec.iml" afterPath="$PROJECT_DIR$/RtspNativeCodec.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/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/cpp/TeleWrapper.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/TeleWrapper.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/TeleWrapper.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/TeleWrapper.h" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.cpp" />
- <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/cpp/RemoteFuncServer.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.capnp.c++" afterPath="$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.capnp.cpp" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -61,39 +56,23 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="RtspNativeCodecJNI.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
+ <file leaf-file-name="RtspNativeCodecJNIServer.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="61" column="56" selection-start-line="61" selection-start-column="51" selection-end-line="61" selection-end-column="56" />
+ <state relative-caret-position="0">
+ <caret line="151" column="21" selection-start-line="151" selection-start-column="21" selection-end-line="151" selection-end-column="21" />
<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="RemoteFuncServer.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1083">
- <caret line="801" column="13" selection-start-line="801" selection-start-column="13" selection-end-line="801" selection-end-column="13" />
+ <state relative-caret-position="133">
+ <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
<folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#162#200#0" expanded="true" />
- <marker date="1500898548250" expanded="true" signature="944:1493" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="1597:2068" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="7205:7515" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="13882:14139" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="14316:14460" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="14551:14773" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="14934:15176" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="15530:17000" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="17102:17363" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="17468:17735" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="27803:27854" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="28157:28454" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="28639:28912" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="29088:29455" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="29550:29554" ph="{...}" />
+ <element signature="e#40#62#0" expanded="true" />
</folding>
</state>
</provider>
@@ -102,9 +81,86 @@
<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="399">
- <caret line="87" column="64" selection-start-line="87" selection-start-column="64" selection-end-line="87" selection-end-column="64" />
+ <state relative-caret-position="526">
+ <caret line="132" column="0" selection-start-line="132" selection-start-column="0" selection-end-line="132" selection-end-column="0" />
<folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RtspNativeCodecJNIServer.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="95">
+ <caret line="5" column="28" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="28" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RemoteFuncServer.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="152">
+ <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ez-rpc.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/ez-rpc.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-241">
+ <caret line="88" column="4" selection-start-line="88" selection-start-column="4" selection-end-line="88" selection-end-column="4" />
+ <folding>
+ <element signature="e#1329#1345#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/build.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>
+ </file>
+ <file leaf-file-name="RemoteFuncClient.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RtspNativeCodecJNIClient.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="485">
+ <caret line="571" column="1" selection-start-line="571" selection-start-column="1" selection-end-line="571" selection-end-column="1" />
+ <folding>
+ <element signature="e#174#212#0" expanded="true" />
+ <element signature="e#5301#5366#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RemoteFuncClient.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="209">
+ <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
+ <folding>
+ <element signature="e#132#149#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -1422,7 +1478,9 @@
</option>
<option name="modificationStamps">
<map>
- <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4484151545900" />
+ <entry key="D:\Documents\works\VisitFace\RtspNativeCodec" value="4501597544551" />
+ <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4485531610794" />
+ <entry key="E:\Documents\works\VisitFace\RtspNativeCodec" value="4501597544551" />
</map>
</option>
<option name="projectBuildClasspath">
@@ -1645,56 +1703,56 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Queue2.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Queue2.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/native-codec-jni.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Queue.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Queue.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CaptureCamera.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CaptureCamera.cpp" />
- <option value="$PROJECT_DIR$/../../FaceServer/proto_hton_ntoh.cpp" />
- <option value="$PROJECT_DIR$/../../FaceServer/PbFaceList" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/serial.c" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
- <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImg.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/TeleWrapper.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Fork1.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Fork1.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Fork2.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Fork2.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <option value="$PROJECT_DIR$/../../RtspFace/PipeLine.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/GraphicHelper.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test .cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Paint.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Paint.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Scale.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_Scale.h" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_ColorConv.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
<option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
+ <option value="$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_Split.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_GeneralProc.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PipeLine.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_InterProcessJoint.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
+ <option value="$PROJECT_DIR$/app/app.iml" />
+ <option value="$PROJECT_DIR$/local.properties" />
+ <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelper.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelperClient.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelperServer.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/AppConfig.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFunc.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFunc.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/GraphicHelper.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/AppConfig.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.cpp" />
+ <option value="$PROJECT_DIR$/app/libs/capnproto/include/capnp/common.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp" />
+ <option value="$PROJECT_DIR$/app/build.gradle" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.h" />
+ <option value="$PROJECT_DIR$/app/libs/capnproto/include/capnp/ez-rpc.h" />
<option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
</list>
</option>
@@ -1703,7 +1761,7 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1932" />
+ <option name="width" value="1936" />
<option name="height" value="1176" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
@@ -1747,12 +1805,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scratches" />
<pane id="Scope" />
<pane id="PackagesPane" />
- <pane id="Scratches" />
- <pane id="AndroidView">
- <subPane />
- </pane>
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -1767,112 +1822,8 @@
<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>
- <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>
- <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>
- <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>
- <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="RtspFace" />
- <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="RtspFace" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="testProgs" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -1939,6 +1890,9 @@
</PATH>
</subPane>
</pane>
+ <pane id="AndroidView">
+ <subPane />
+ </pane>
</panes>
</component>
<component name="PropertiesComponent">
@@ -1947,7 +1901,7 @@
<property name="android.project.structure.proportion" value="0.15" />
<property name="show.do.not.ask.upgrade.gradle.plugin" value="2.2.3" />
<property name="device.picker.selection" value="GB8ZARP6EL" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../pocketsphinx-android-demo" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.JSON" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="GpuMonitor.paused" value="false" />
@@ -2322,6 +2276,10 @@
<option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\CvUtil" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\FFmpegRTSPServer" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\FFmpegRTSPServer" />
+ </SvnCopyRootSimple>
+ <SvnCopyRootSimple>
<option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\libv4l2cpp\src" />
<option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\libv4l2cpp\src" />
</SvnCopyRootSimple>
@@ -2368,31 +2326,48 @@
<option name="presentableId" value="Default" />
<updated>1490160066647</updated>
</task>
+ <task id="LOCAL-00001">
+ <created>1502255226944</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1502255226944</updated>
+ </task>
+ <option name="localTasksCounter" value="2" />
<servers />
</component>
+ <component name="TodoView" selected-index="3">
+ <todo-panel id="selected-file">
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ <todo-panel id="all">
+ <are-packages-shown value="true" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ </component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1932" height="1176" extended-state="0" />
+ <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
<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.33" 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.32743362" sideWeight="0.37070817" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23842365" sideWeight="0.4914163" 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.39823008" sideWeight="0.2489339" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28318584" sideWeight="0.5042644" order="8" 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.32645035" sideWeight="0.83208156" order="12" 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.29359606" sideWeight="0.56545067" order="8" 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.26009852" sideWeight="0.38090128" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4978678" order="9" 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.2851524" sideWeight="0.73390555" order="10" 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.26450345" sideWeight="0.47867805" order="9" 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.49557522" sideWeight="0.37579957" order="10" 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.4355949" sideWeight="0.16791846" order="11" 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.21901709" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <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.39823008" sideWeight="0.7510661" order="11" 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.2521322" 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="4" 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="9" 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="5" 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.32251722" sideWeight="0.45922747" 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.3972468" sideWeight="0.45922747" 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" />
@@ -2401,6 +2376,7 @@
<window_info id="Properties" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" />
<window_info id="Designer" 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="Inspection Results" 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="13" side_tool="false" content_ui="tabs" />
<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="7" 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" />
@@ -2418,6 +2394,18 @@
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="LAST_COMMIT_MESSAGE" value="" />
+ <option name="CHANGE_BROWSER_SETTINGS">
+ <map>
+ <entry key="svn">
+ <value>
+ <ChangeBrowserSettings />
+ </value>
+ </entry>
+ </map>
+ </option>
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -2438,89 +2426,154 @@
<option name="timeStamp" value="987" />
</line-breakpoint>
</breakpoints>
- <option name="time" value="1081" />
+ <option name="time" value="1139" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test .cpp" />
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm/usr/include/sched.h">
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="241">
- <caret line="83" column="8" selection-start-line="83" selection-start-column="8" selection-end-line="83" selection-end-column="8" />
+ <state relative-caret-position="329">
+ <caret line="584" column="0" selection-start-line="584" selection-start-column="0" selection-end-line="584" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.h">
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/kj/async.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <state relative-caret-position="532">
+ <caret line="39" column="21" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/captures/com.example.nativecodec_2017.07.20_15.23.trace">
- <provider selected="true" editor-type-id="capture-editor">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.cpp">
+ <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="440">
- <caret line="361" column="27" selection-start-line="361" selection-start-column="27" selection-end-line="361" selection-end-column="27" />
- <folding />
+ <state relative-caret-position="377">
+ <caret line="13" column="23" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="23" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
+ <entry file="file://D:/ProgramFiles/Android/sdk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h" />
+ <entry file="file://$PROJECT_DIR$/app/libs/opencv/include/opencv2/core/types_c.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-670">
- <caret line="47" column="33" selection-start-line="47" selection-start-column="33" selection-end-line="47" selection-end-column="33" />
+ <state relative-caret-position="-7762">
+ <caret line="334" column="9" selection-start-line="334" selection-start-column="9" selection-end-line="334" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.h">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/CvUtil/CvxText.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="180">
- <caret line="90" column="22" selection-start-line="90" selection-start-column="22" selection-end-line="90" selection-end-column="22" />
- <folding />
+ <state relative-caret-position="377">
+ <caret line="178" column="17" selection-start-line="178" selection-start-column="17" selection-end-line="178" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/libs/opencv/include/opencv2/imgproc.hpp">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/CvUtil/CvxText.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="31920">
- <caret line="1680" column="62" selection-start-line="1680" selection-start-column="62" selection-end-line="1680" selection-end-column="62" />
+ <state relative-caret-position="321">
+ <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelperServer.h" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelperServer.cpp" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelperClient.cpp" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelperClient.h" />
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/GraphicHelper.cpp">
<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 relative-caret-position="58">
+ <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.h">
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/capability.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2470">
- <caret line="130" column="1" selection-start-line="129" selection-start-column="6" selection-end-line="129" selection-end-column="32" />
- <folding>
- <marker date="1500545826378" expanded="false" signature="52:113" ph="..." />
- <marker date="1500545826378" expanded="true" signature="654:1452" ph="{...}" />
- <marker date="1500545826378" expanded="true" signature="686:1023" ph="{...}" />
- <marker date="1500545826378" expanded="true" signature="1223:1266" ph="{...}" />
- <marker date="1500545826378" expanded="true" signature="1474:1773" ph="{...}" />
- <marker date="1500545826378" expanded="true" signature="2181:3453" ph="{...}" />
- <marker date="1500545826378" expanded="true" signature="3489:3648" ph="{...}" />
- </folding>
+ <state relative-caret-position="235">
+ <caret line="790" column="65" selection-start-line="790" selection-start-column="65" selection-end-line="790" selection-end-column="65" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.cpp">
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/face_daemon_proto.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="9139">
- <caret line="481" column="7" selection-start-line="481" selection-start-column="7" selection-end-line="481" selection-end-column="7" />
- <folding />
+ <state relative-caret-position="217">
+ <caret line="41" column="7" selection-start-line="41" selection-start-column="7" selection-end-line="41" selection-end-column="7" />
+ </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="259">
+ <caret line="222" column="11" selection-start-line="222" selection-start-column="8" selection-end-line="222" selection-end-column="11" />
+ </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="377">
+ <caret line="64" column="27" selection-start-line="64" selection-start-column="27" selection-end-line="64" selection-end-column="27" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://D:/ProgramFiles/Android/sdk/ndk-bundle/toolchains/aarch64-linux-android-4.9/prebuilt/windows-x86_64/lib/gcc/aarch64-linux-android/4.9.x/include/stddef.h" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="8004">
+ <caret line="292" column="0" selection-start-line="292" selection-start-column="0" selection-end-line="292" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="51">
+ <caret line="370" column="0" selection-start-line="370" selection-start-column="0" selection-end-line="370" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="493">
+ <caret line="77" column="14" selection-start-line="77" selection-start-column="14" selection-end-line="77" selection-end-column="14" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="203">
+ <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="262">
+ <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.cc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="275">
+ <caret line="82" column="6" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/rpc-twoparty.capnp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="236">
+ <caret line="95" column="7" selection-start-line="95" selection-start-column="7" selection-end-line="95" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/rpc.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1682">
+ <caret line="58" column="24" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/rpc-prelude.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2871">
+ <caret line="99" column="26" selection-start-line="99" selection-start-column="26" selection-end-line="99" selection-end-column="26" />
</state>
</provider>
</entry>
@@ -2532,331 +2585,187 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/RtspNativeCodec.iml">
+ <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$/README.md">
+ <entry file="file://D:/ProgramFiles/Android/sdk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/ctype_base.h" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFunc.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 relative-caret-position="628">
+ <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/native-codec.iml">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFunc.cpp">
<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 relative-caret-position="116">
+ <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/local.properties">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.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 relative-caret-position="464">
+ <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradlew.bat">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/AppConfig.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 relative-caret-position="377">
+ <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/license.lic">
+ <entry file="file://$PROJECT_DIR$/app/libs/jsoncpp/include/json/reader.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="5149">
+ <caret line="271" column="21" selection-start-line="271" selection-start-column="21" selection-end-line="271" selection-end-column="21" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="209">
+ <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
+ <folding>
+ <element signature="e#132#149#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp">
<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" />
+ <caret line="151" column="21" selection-start-line="151" selection-start-column="21" selection-end-line="151" selection-end-column="21" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.proto.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="200">
+ <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../RtspFace/GraphicHelper.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-931">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="261">
+ <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/AppConfig.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="406">
+ <caret line="50" column="33" selection-start-line="50" selection-start-column="33" selection-end-line="50" selection-end-column="33" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/common.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="403">
+ <caret line="206" column="42" selection-start-line="206" selection-start-column="42" selection-end-line="206" selection-end-column="42" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="76">
+ <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="485">
+ <caret line="571" column="1" selection-start-line="571" selection-start-column="1" selection-end-line="571" selection-end-column="1" />
<folding>
- <element signature="e#55#74#0" expanded="false" />
+ <element signature="e#174#212#0" expanded="true" />
+ <element signature="e#5301#5366#0" expanded="true" />
</folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="304">
- <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1102">
- <caret line="58" column="24" selection-start-line="58" selection-start-column="16" selection-end-line="58" selection-end-column="24" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="32" column="29" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/live555/include/groupsock/GroupsockHelper.hh">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="224">
- <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="56" selection-end-column="53" />
- </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="224">
- <caret line="86" column="11" selection-start-line="86" selection-start-column="11" selection-end-line="86" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <state relative-caret-position="152">
+ <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/app.iml">
+ <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="83" column="81" selection-start-line="83" selection-start-column="81" selection-end-line="83" selection-end-column="81" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-430">
- <caret line="207" column="49" selection-start-line="207" selection-start-column="49" selection-end-line="207" selection-end-column="49" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="367">
- <caret line="26" column="37" selection-start-line="26" selection-start-column="37" selection-end-line="26" selection-end-column="37" />
- <folding />
- </state>
- </provider>
- <provider editor-type-id="android-manifest">
- <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="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>
- <provider selected="true" editor-type-id="android-designer2">
- <state />
- </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/CvUtil/CvxText.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.proto">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="551">
- <caret line="34" column="33" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="33" />
+ <state relative-caret-position="57">
+ <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.proto.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="319" column="9" selection-start-line="319" selection-start-column="9" selection-end-line="319" selection-end-column="9" />
+ <state relative-caret-position="209">
+ <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="95">
+ <caret line="5" column="28" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="28" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
<folding>
- <element signature="e#24564#25529#0" expanded="false" />
+ <element signature="e#40#62#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncServer.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="627">
- <caret line="33" column="19" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="19" />
+ <state relative-caret-position="152">
+ <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_Paint.h">
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/ez-rpc.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="387">
- <caret line="85" column="18" selection-start-line="85" selection-start-column="18" selection-end-line="85" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_Paint.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="482">
- <caret line="435" column="0" selection-start-line="435" selection-start-column="0" selection-end-line="435" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-399">
- <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_ColorConv.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="438">
- <caret line="26" column="19" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_Scale.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_Scale.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="247">
- <caret line="99" column="79" selection-start-line="99" selection-start-column="79" selection-end-line="99" selection-end-column="79" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_ColorConv.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1577">
- <caret line="83" column="1" selection-start-line="83" selection-start-column="1" selection-end-line="83" selection-end-column="1" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/st_face/include/cv_common.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="215">
- <caret line="83" column="20" selection-start-line="83" selection-start-column="4" selection-end-line="83" selection-end-column="20" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="475">
- <caret line="25" column="11" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="11" />
- <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="4313">
- <caret line="281" column="68" selection-start-line="281" selection-start-column="68" selection-end-line="281" selection-end-column="68" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2603">
- <caret line="137" column="13" selection-start-line="137" selection-start-column="13" selection-end-line="137" selection-end-column="13" />
- <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="8949">
- <caret line="471" column="0" selection-start-line="471" selection-start-column="0" selection-end-line="471" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="874">
- <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="6555">
- <caret line="345" column="0" selection-start-line="345" selection-start-column="0" selection-end-line="345" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="717">
- <caret line="243" column="23" selection-start-line="243" selection-start-column="23" selection-end-line="243" selection-end-column="23" />
- <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="836">
- <caret line="61" column="56" selection-start-line="61" selection-start-column="51" selection-end-line="61" selection-end-column="56" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Desktop/鏂板缓鏂囦欢澶�/RtspNativeCodecJNI.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="627">
- <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
- <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="1083">
- <caret line="801" column="13" selection-start-line="801" selection-start-column="13" selection-end-line="801" selection-end-column="13" />
+ <state relative-caret-position="-241">
+ <caret line="88" column="4" selection-start-line="88" selection-start-column="4" selection-end-line="88" selection-end-column="4" />
<folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#162#200#0" expanded="true" />
- <marker date="1500898548250" expanded="true" signature="944:1493" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="1597:2068" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="7205:7515" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="13882:14139" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="14316:14460" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="14551:14773" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="14934:15176" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="15530:17000" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="17102:17363" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="17468:17735" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="27803:27854" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="28157:28454" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="28639:28912" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="29088:29455" ph="{...}" />
- <marker date="1500898548250" expanded="true" signature="29550:29554" ph="{...}" />
+ <element signature="e#1329#1345#0" expanded="true" />
</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="399">
- <caret line="87" column="64" selection-start-line="87" selection-start-column="64" selection-end-line="87" selection-end-column="64" />
+ <state relative-caret-position="526">
+ <caret line="132" column="0" selection-start-line="132" selection-start-column="0" selection-end-line="132" selection-end-column="0" />
<folding />
</state>
</provider>
--
Gitblit v1.8.0