From a0092014ee12abf06edb1788b189cc7c57336063 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:42:00 +0800
Subject: [PATCH] Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和CapnpProtocol功能初步实现 ........
---
VisitFace/RtspNativeCodec/.idea/workspace.xml | 1207 +++++++++++++++++++++++----------------------------------
1 files changed, 491 insertions(+), 716 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index 74f9081..f09415d 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -14,27 +14,11 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="7ae7b537-c9d7-47f6-b809-98f2bf0296aa" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.cpp" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.h" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.h" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.h" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.h" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" afterPath="" />
- <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_SensetimeFaceTrackMultiTrd.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PipeLine.h" afterPath="$PROJECT_DIR$/../../RtspFace/PipeLine.h" />
+ <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/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.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/java/com/example/nativecodec/NativeCodec.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/RtspNativeCodec.iml" afterPath="$PROJECT_DIR$/RtspNativeCodec.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -68,80 +52,76 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <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="4379">
+ <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="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="290">
+ <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#40#62#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="16">
- <caret line="73" column="59" selection-start-line="73" selection-start-column="59" selection-end-line="73" selection-end-column="59" />
+ <state relative-caret-position="290">
+ <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="CameraWrapperServer.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp">
+ <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="272">
- <caret line="95" column="59" selection-start-line="95" selection-start-column="59" selection-end-line="95" selection-end-column="59" />
- <folding>
- <element signature="e#0#32#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CameraWrapperClient.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="413">
- <caret line="104" column="98" selection-start-line="104" selection-start-column="82" selection-end-line="104" selection-end-column="98" />
- <folding>
- <element signature="e#0#32#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PL_AndroidMediaCodecEncoder.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="117" column="50" selection-start-line="117" selection-start-column="50" selection-end-line="117" selection-end-column="50" />
- <folding>
- <element signature="e#0#40#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PipeLine.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="589">
- <caret line="355" column="0" selection-start-line="355" selection-start-column="0" selection-end-line="355" selection-end-column="0" />
- <folding>
- <element signature="e#0#21#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PL_AndroidMediaCodecDecoder_ndk.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="152" column="0" selection-start-line="152" selection-start-column="0" selection-end-line="152" selection-end-column="0" />
+ <state relative-caret-position="116">
+ <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="NdkMediaCodec.h" pinned="false" current-in-tab="true">
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm64/usr/include/media/NdkMediaCodec.h">
+ <file leaf-file-name="RtspNativeCodecJNIClient.cpp" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="619">
- <caret line="71" column="48" selection-start-line="71" selection-start-column="48" selection-end-line="71" selection-end-column="48" />
+ <state relative-caret-position="276">
+ <caret line="560" column="1" selection-start-line="560" selection-start-column="1" selection-end-line="560" selection-end-column="1" />
<folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="reader.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/libs/jsoncpp/include/json/reader.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="7859">
+ <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>
+ </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="319">
+ <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>
@@ -151,7 +131,7 @@
<component name="GradleLocalSettings">
<option name="myGradleHomes">
<map>
- <entry key="$PROJECT_DIR$" value="C:\Users\houxiao\.gradle\wrapper\dists\gradle-2.14.1-bin\2r579t5wehc7ew5kc8vfqezww\gradle-2.14.1" />
+ <entry key="$PROJECT_DIR$" value="C:\Users\ke.chen\.gradle\wrapper\dists\gradle-2.14.1-bin\2r579t5wehc7ew5kc8vfqezww\gradle-2.14.1" />
</map>
</option>
<option name="myGradleVersions">
@@ -1459,7 +1439,9 @@
</option>
<option name="modificationStamps">
<map>
+ <entry key="D:\Documents\works\VisitFace\RtspNativeCodec" value="4501597544551" />
<entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4484914127051" />
+ <entry key="E:\Documents\works\VisitFace\RtspNativeCodec" value="4501597544551" />
</map>
</option>
<option name="projectBuildClasspath">
@@ -1682,22 +1664,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <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$/../../RtspFace/PL_Paint.h" />
- <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/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$/../../RtspFace/PL_Scale.h" />
- <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" />
@@ -1708,9 +1674,7 @@
<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/FaceCache.h" />
<option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.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" />
@@ -1721,18 +1685,36 @@
<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/cpp/RtspNativeCodecJNIServer.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.h" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
<option value="$PROJECT_DIR$/app/app.iml" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.cpp" />
+ <option value="$PROJECT_DIR$/local.properties" />
+ <option value="$PROJECT_DIR$/app/build.gradle" />
+ <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/RtspNativeCodecJNIServer.h" />
+ <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/RtspNativeCodecJNIClient.cpp" />
+ <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/RemoteFuncServer.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/src/main/cpp/CMakeLists.txt" />
+ <option value="$PROJECT_DIR$/app/libs/capnproto/include/capnp/common.h" />
</list>
</option>
</component>
@@ -1740,7 +1722,7 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1936" />
+ <option name="width" value="1924" />
<option name="height" value="1176" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
@@ -1770,7 +1752,7 @@
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1">
+ <navigator currentView="AndroidView" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
@@ -1784,283 +1766,139 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="AndroidView">
- <subPane />
- </pane>
<pane id="PackagesPane" />
- <pane id="ProjectPane">
+ <pane id="AndroidView">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="Gradle Scripts" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
</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" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</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" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</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="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="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="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>
- <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" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cpp" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidJniFolderNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidLibraryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="VisitFace" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
</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="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <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="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>
- <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" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cpp" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidJniFolderNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidLibraryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpp" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidJniFolderNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidLibraryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="VisitFace" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpp" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="RtspNativeCodec" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="app" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="cpp" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidJniFolderNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.NativeAndroidLibraryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
+ </pane>
+ <pane id="ProjectPane">
+ <subPane />
</pane>
<pane id="Scratches" />
<pane id="Scope" />
@@ -2068,11 +1906,11 @@
</component>
<component name="PropertiesComponent">
<property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
- <property name="android.project.structure.last.selected" value="Project" />
+ <property name="android.project.structure.last.selected" value="app" />
<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" />
@@ -2428,59 +2266,63 @@
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration" cleanupOnStartRun="true">
- <configuration>C:\Users\houxiao\AppData\Roaming\Subversion</configuration>
+ <configuration>C:\Users\ke.chen\AppData\Roaming\Subversion</configuration>
<supportedVersion>125</supportedVersion>
</component>
<component name="SvnFileUrlMappingImpl">
<option name="myMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\FaceServer" />
- <option name="myCopyRoot" value="D:\workspace\proxy\FaceServer" />
+ <option name="myVcsRoot" value="E:\Documents\works\FaceServer" />
+ <option name="myCopyRoot" value="E:\Documents\works\FaceServer" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace" />
- <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" />
+ <option name="myVcsRoot" value="E:\Documents\works\RtspFace" />
+ <option name="myCopyRoot" value="E:\Documents\works\RtspFace" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\CvUtil" />
- <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\CvUtil" />
+ <option name="myVcsRoot" value="E:\Documents\works\RtspFace\CvUtil" />
+ <option name="myCopyRoot" value="E:\Documents\works\RtspFace\CvUtil" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\libv4l2cpp\src" />
- <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\libv4l2cpp\src" />
+ <option name="myVcsRoot" value="E:\Documents\works\RtspFace\FFmpegRTSPServer" />
+ <option name="myCopyRoot" value="E:\Documents\works\RtspFace\FFmpegRTSPServer" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\Logger\src" />
- <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\Logger\src" />
+ <option name="myVcsRoot" value="E:\Documents\works\RtspFace\libv4l2cpp\src" />
+ <option name="myCopyRoot" value="E:\Documents\works\RtspFace\libv4l2cpp\src" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
- <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
+ <option name="myVcsRoot" value="E:\Documents\works\RtspFace\Logger\src" />
+ <option name="myCopyRoot" value="E:\Documents\works\RtspFace\Logger\src" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\.idea" />
- <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\.idea" />
+ <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
+ <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\app" />
- <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\app" />
+ <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec\.idea" />
+ <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec\.idea" />
+ </SvnCopyRootSimple>
+ <SvnCopyRootSimple>
+ <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec\app" />
+ <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec\app" />
</SvnCopyRootSimple>
</list>
</option>
<option name="myMoreRealMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\FaceServer" />
- <option name="myCopyRoot" value="D:\workspace\proxy\FaceServer" />
+ <option name="myVcsRoot" value="E:\Documents\works\FaceServer" />
+ <option name="myCopyRoot" value="E:\Documents\works\FaceServer" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace" />
- <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" />
+ <option name="myVcsRoot" value="E:\Documents\works\RtspFace" />
+ <option name="myCopyRoot" value="E:\Documents\works\RtspFace" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
- <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
+ <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
+ <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
</SvnCopyRootSimple>
</list>
</option>
@@ -2493,9 +2335,17 @@
<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">
+ <component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
@@ -2505,23 +2355,23 @@
</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="1924" 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.3640725" 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.29359606" sideWeight="0.43240345" 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.3284169" sideWeight="0.32356077" 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.26843658" sideWeight="0.39072496" 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="true" show_stripe_button="true" weight="0.26502463" sideWeight="0.4828326" 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.2679803" sideWeight="0.37768242" 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="true" show_stripe_button="true" weight="0.28318584" sideWeight="0.6359275" 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.2185501" 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="true" show_stripe_button="true" weight="0.26502463" sideWeight="0.5171674" order="11" side_tool="true" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25214592" 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" />
@@ -2535,6 +2385,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" />
@@ -2552,6 +2403,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>
@@ -2571,439 +2434,351 @@
<line>351</line>
<option name="timeStamp" value="987" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
- <url>file://$PROJECT_DIR$/../../RtspFace/PipeLine.cpp</url>
- <line>354</line>
- <option name="timeStamp" value="1119" />
- </line-breakpoint>
</breakpoints>
- <option name="time" value="1131" />
+ <option name="time" value="1139" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$USER_HOME$/Desktop/鏂板缓鏂囦欢澶�/RtspNativeCodecJNI.cpp" />
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncHelper.cpp" />
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-2223">
- <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="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$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/kj/async.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="919">
- <caret line="153" column="5" selection-start-line="153" selection-start-column="5" selection-end-line="153" selection-end-column="5" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
- <caret line="19" column="6" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
- <folding>
- <element signature="e#260#419#0" expanded="false" />
- <element signature="e#476#668#0" expanded="false" />
- <element signature="e#677#721#0" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm/usr/include/linux/sched.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="428">
- <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm/usr/include/sched.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="161">
- <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-22/android.jar!/android/Manifest.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="100">
- <caret line="118" column="84" selection-start-line="118" selection-start-column="71" selection-end-line="118" selection-end-column="84" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm/usr/include/pthread.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
- <caret line="171" column="81" selection-start-line="171" selection-start-column="81" selection-end-line="171" selection-end-column="81" />
- </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="798">
- <caret line="42" column="0" selection-start-line="24" 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/cpu_sched_test.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="912">
- <caret line="48" column="58" selection-start-line="48" selection-start-column="58" selection-end-line="48" selection-end-column="58" />
- </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="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$/../../RtspFace/PL_SensetimeFaceTrack.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="703">
- <caret line="97" column="18" selection-start-line="97" selection-start-column="18" selection-end-line="97" selection-end-column="18" />
- <folding />
+ <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$/app/src/main/java/cn/com/basic/face/util/NativeImg.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="304">
- <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
- <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/cpp/FaceCacheForPLBG.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="798">
- <caret line="217" column="51" selection-start-line="217" selection-start-column="46" selection-end-line="217" selection-end-column="51" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="950">
- <caret line="142" column="22" selection-start-line="142" selection-start-column="22" selection-end-line="142" selection-end-column="22" />
- <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="349">
- <caret line="267" column="21" selection-start-line="267" selection-start-column="21" selection-end-line="267" selection-end-column="21" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.h">
+ <entry file="file://D:/ProgramFiles/Android/sdk/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="329">
- <caret line="33" column="7" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
- <folding />
+ <caret line="296" column="6" selection-start-line="296" selection-start-column="6" selection-end-line="296" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <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="-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/CvUtil/CvxText.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/../../RtspFace/CvUtil/CvxText.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <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/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="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$/app/libs/capnproto/include/capnp/capability.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/../../FaceServer/face_daemon_proto.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <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="798">
- <caret line="62" column="15" selection-start-line="62" selection-start-column="15" selection-end-line="62" selection-end-column="15" />
- <folding />
+ <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://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.proto">
<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="7" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="87">
+ <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm64/usr/include/media/NdkMediaFormat.h">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="722">
- <caret line="103" column="41" selection-start-line="103" selection-start-column="41" selection-end-line="103" selection-end-column="41" />
- <folding />
+ <state relative-caret-position="239">
+ <caret line="211" column="22" selection-start-line="211" selection-start-column="22" selection-end-line="211" selection-end-column="22" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_Split.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="19">
- <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
- <folding />
+ <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$/../../RtspFace/PL_GeneralProc.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="31" selection-start-line="0" selection-start-column="31" selection-end-line="0" selection-end-column="31" />
- <folding />
+ <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$/../../RtspFace/PL_BlockGrouping.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="615">
- <caret line="337" column="68" selection-start-line="337" selection-start-column="57" selection-end-line="337" selection-end-column="68" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="342">
- <caret line="47" column="18" selection-start-line="47" selection-start-column="18" selection-end-line="47" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="31" column="39" selection-start-line="31" selection-start-column="39" selection-end-line="31" selection-end-column="39" />
- <folding>
- <marker date="1501569899416" expanded="true" signature="654:1536" ph="{...}" />
- <marker date="1501569899416" expanded="true" signature="1223:1266" ph="{...}" />
- <marker date="1501569899416" expanded="true" signature="1558:1857" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPServer.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-2964">
- <caret line="37" column="4" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="4" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/basic_string.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="329">
- <caret line="561" column="6" selection-start-line="561" selection-start-column="6" selection-end-line="561" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="437">
- <caret line="40" column="19" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="261">
- <caret line="134" column="22" selection-start-line="134" selection-start-column="22" selection-end-line="134" selection-end-column="22" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/mediastreamer2/src/android/android_mediacodec.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="162">
- <caret line="247" column="17" selection-start-line="247" selection-start-column="17" selection-end-line="247" selection-end-column="17" />
- <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="266">
- <caret line="152" column="0" selection-start-line="152" selection-start-column="0" selection-end-line="152" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="589">
- <caret line="355" column="0" selection-start-line="355" selection-start-column="0" selection-end-line="355" selection-end-column="0" />
- <folding>
- <element signature="e#0#21#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_InterProcessJoint.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="297">
- <caret line="506" column="0" selection-start-line="506" selection-start-column="0" selection-end-line="506" selection-end-column="0" />
- <folding>
- <element signature="e#1038#1326#0" expanded="false" />
- <element signature="e#2430#3069#0" expanded="false" />
- <element signature="e#3072#3642#0" expanded="false" />
- <element signature="e#4261#5676#0" expanded="false" />
- <element signature="e#5679#5963#0" expanded="false" />
- <element signature="e#6013#8886#0" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="117" column="50" selection-start-line="117" selection-start-column="50" selection-end-line="117" selection-end-column="50" />
- <folding>
- <element signature="e#0#40#0" expanded="true" />
- </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="504">
- <caret line="168" column="0" selection-start-line="168" selection-start-column="0" selection-end-line="168" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/common.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="218">
- <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
- <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="95">
- <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
- <folding>
- <element signature="e#0#37#0" expanded="false" />
- <element signature="e#174#212#0" expanded="false" />
- </folding>
+ <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="133">
+ <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>
+ <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$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp">
+ <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="7" column="38" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
- <folding>
- <element signature="e#0#37#0" expanded="false" />
- </folding>
+ <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/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="522">
+ <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <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>
+ <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="386">
+ <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://D:/ProgramFiles/Android/sdk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/arm64-v8a/include/bits/ctype_base.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="172">
+ <caret line="38" column="19" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFunc.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/app/src/main/cpp/RemoteFunc.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/app/src/main/cpp/RtspNativeCodecJNIServer.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="399">
- <caret line="21" column="64" selection-start-line="21" selection-start-column="64" selection-end-line="21" selection-end-column="64" />
+ <state relative-caret-position="116">
+ <caret line="4" column="23" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
+ <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$/app/src/main/cpp/RemoteFuncServer.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="457">
+ <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/AppConfig.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/app/libs/jsoncpp/include/json/reader.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="7859">
+ <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/CameraWrapperClient.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider editor-type-id="android-manifest">
- <state />
- </provider>
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="684">
- <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="703">
- <caret line="37" column="58" selection-start-line="37" selection-start-column="57" selection-end-line="37" selection-end-column="58" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/app.iml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="551">
- <caret line="29" column="55" selection-start-line="29" selection-start-column="55" selection-end-line="29" selection-end-column="55" />
- <folding />
- </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="413">
- <caret line="104" column="98" selection-start-line="104" selection-start-column="82" selection-end-line="104" selection-end-column="98" />
+ <state relative-caret-position="319">
+ <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#0#32#0" expanded="true" />
+ <element signature="e#132#149#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="272">
- <caret line="95" column="59" selection-start-line="95" selection-start-column="59" selection-end-line="95" selection-end-column="59" />
- <folding>
- <element signature="e#0#32#0" expanded="true" />
- </folding>
+ <state relative-caret-position="4379">
+ <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" />
+ <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="16">
- <caret line="73" column="59" selection-start-line="73" selection-start-column="59" selection-end-line="73" selection-end-column="59" />
+ <state relative-caret-position="290">
+ <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/GraphicHelper.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="387">
- <caret line="495" column="45" selection-start-line="495" selection-start-column="45" selection-end-line="495" selection-end-column="45" />
+ <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/RemoteFuncServer.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="290">
+ <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#40#62#0" expanded="true" />
+ </folding>
+ </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="116">
+ <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://$USER_HOME$/AppData/Local/Android/Sdk/ndk-bundle/platforms/android-22/arch-arm64/usr/include/media/NdkMediaCodec.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="619">
- <caret line="71" column="48" selection-start-line="71" selection-start-column="48" selection-end-line="71" selection-end-column="48" />
+ <state relative-caret-position="276">
+ <caret line="560" column="1" selection-start-line="560" selection-start-column="1" selection-end-line="560" selection-end-column="1" />
<folding />
</state>
</provider>
--
Gitblit v1.8.0