From 353d2469941ee78798a68e60824aafd09c498e4a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 17:59:41 +0800
Subject: [PATCH] rtps server (not ok)
---
VisitFace/RtspNativeCodec/app/build.gradle | 4
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h | 2
VisitFace/RtspNativeCodec/.idea/workspace.xml | 463 +++++++++++++++++++++++++--------------------------
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 15 +
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteMethod.capnp.cpp | 0
VisitFace/RtspNativeCodec/.idea/misc.xml | 2
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h | 2
7 files changed, 241 insertions(+), 247 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/misc.xml b/VisitFace/RtspNativeCodec/.idea/misc.xml
index 9c3ae0a..69a5b4d 100644
--- a/VisitFace/RtspNativeCodec/.idea/misc.xml
+++ b/VisitFace/RtspNativeCodec/.idea/misc.xml
@@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index f09415d..9d3f7f7 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -17,8 +17,12 @@
<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$/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$/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/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" />
@@ -55,7 +59,7 @@
<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">
+ <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>
@@ -65,7 +69,7 @@
<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">
+ <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#40#62#0" expanded="true" />
@@ -74,11 +78,53 @@
</provider>
</entry>
</file>
- <file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="false">
+ <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="290">
- <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+ <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>
@@ -87,29 +133,22 @@
<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="116">
+ <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="true">
+ <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="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 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>
@@ -117,7 +156,7 @@
<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">
+ <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" />
@@ -131,7 +170,7 @@
<component name="GradleLocalSettings">
<option name="myGradleHomes">
<map>
- <entry key="$PROJECT_DIR$" value="C:\Users\ke.chen\.gradle\wrapper\dists\gradle-2.14.1-bin\2r579t5wehc7ew5kc8vfqezww\gradle-2.14.1" />
+ <entry key="$PROJECT_DIR$" value="C:\Users\houxiao\.gradle\wrapper\dists\gradle-2.14.1-bin\2r579t5wehc7ew5kc8vfqezww\gradle-2.14.1" />
</map>
</option>
<option name="myGradleVersions">
@@ -1440,7 +1479,7 @@
<option name="modificationStamps">
<map>
<entry key="D:\Documents\works\VisitFace\RtspNativeCodec" value="4501597544551" />
- <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4484914127051" />
+ <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4485531610794" />
<entry key="E:\Documents\works\VisitFace\RtspNativeCodec" value="4501597544551" />
</map>
</option>
@@ -1664,7 +1703,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <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" />
@@ -1688,7 +1726,6 @@
<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/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" />
@@ -1698,14 +1735,11 @@
<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" />
@@ -1713,8 +1747,13 @@
<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" />
+ <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>
</component>
@@ -1722,7 +1761,7 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1924" />
+ <option name="width" value="1936" />
<option name="height" value="1176" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
@@ -1752,7 +1791,7 @@
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectView">
- <navigator currentView="AndroidView" proportions="" version="1">
+ <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
@@ -1766,142 +1805,94 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scratches" />
+ <pane id="Scope" />
<pane id="PackagesPane" />
- <pane id="AndroidView">
+ <pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="Gradle Scripts" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
+ <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.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <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.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+ <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.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <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.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>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <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.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>
- <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" />
+ <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.android.tools.idea.navigator.nodes.NativeAndroidSourceDirectoryNode" />
+ <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.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" />
+ <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.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
+ <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.android.tools.idea.navigator.nodes.AndroidModuleNode" />
+ <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="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" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="ProjectPane">
+ <pane id="AndroidView">
<subPane />
</pane>
- <pane id="Scratches" />
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2266,63 +2257,63 @@
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration" cleanupOnStartRun="true">
- <configuration>C:\Users\ke.chen\AppData\Roaming\Subversion</configuration>
+ <configuration>C:\Users\houxiao\AppData\Roaming\Subversion</configuration>
<supportedVersion>125</supportedVersion>
</component>
<component name="SvnFileUrlMappingImpl">
<option name="myMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\FaceServer" />
- <option name="myCopyRoot" value="E:\Documents\works\FaceServer" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\FaceServer" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\FaceServer" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\RtspFace" />
- <option name="myCopyRoot" value="E:\Documents\works\RtspFace" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\RtspFace\CvUtil" />
- <option name="myCopyRoot" value="E:\Documents\works\RtspFace\CvUtil" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\CvUtil" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\CvUtil" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\RtspFace\FFmpegRTSPServer" />
- <option name="myCopyRoot" value="E:\Documents\works\RtspFace\FFmpegRTSPServer" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\FFmpegRTSPServer" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\FFmpegRTSPServer" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\RtspFace\libv4l2cpp\src" />
- <option name="myCopyRoot" value="E:\Documents\works\RtspFace\libv4l2cpp\src" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\libv4l2cpp\src" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\libv4l2cpp\src" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\RtspFace\Logger\src" />
- <option name="myCopyRoot" value="E:\Documents\works\RtspFace\Logger\src" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace\Logger\src" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\Logger\src" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
- <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec\.idea" />
- <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec\.idea" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\.idea" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\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" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\app" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec\app" />
</SvnCopyRootSimple>
</list>
</option>
<option name="myMoreRealMappingRoots">
<list>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\FaceServer" />
- <option name="myCopyRoot" value="E:\Documents\works\FaceServer" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\FaceServer" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\FaceServer" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\RtspFace" />
- <option name="myCopyRoot" value="E:\Documents\works\RtspFace" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\RtspFace" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
- <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" />
+ <option name="myVcsRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\VisitFace\RtspNativeCodec" />
</SvnCopyRootSimple>
</list>
</option>
@@ -2355,23 +2346,23 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1924" height="1176" extended-state="0" />
- <editor active="false" />
+ <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.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="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.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="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="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="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 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" />
@@ -2440,7 +2431,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <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="329">
@@ -2462,13 +2452,7 @@
</state>
</provider>
</entry>
- <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="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://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="-7762">
@@ -2529,20 +2513,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.proto">
- <provider selected="true" editor-type-id="text-editor">
- <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://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="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://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">
@@ -2621,36 +2592,7 @@
</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://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="628">
@@ -2665,25 +2607,10 @@
</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="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="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>
@@ -2696,7 +2623,7 @@
</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">
+ <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>
@@ -2704,7 +2631,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="319">
+ <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" />
@@ -2714,7 +2641,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4379">
+ <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>
@@ -2724,15 +2651,6 @@
<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="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>
@@ -2757,19 +2675,9 @@
</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">
+ <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>
@@ -2777,8 +2685,87 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <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>
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/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/src/main/cpp/RemoteMethod.proto">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/app/src/main/cpp/RemoteMethod.proto.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <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#40#62#0" expanded="true" />
+ </folding>
+ </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="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$/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>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+ <provider selected="true" editor-type-id="text-editor">
+ <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>
diff --git a/VisitFace/RtspNativeCodec/app/build.gradle b/VisitFace/RtspNativeCodec/app/build.gradle
index 051d8cd..3c8c0dc 100644
--- a/VisitFace/RtspNativeCodec/app/build.gradle
+++ b/VisitFace/RtspNativeCodec/app/build.gradle
@@ -9,7 +9,7 @@
targetSdkVersion 23
ndk {
//abiFilters 'armeabi-v7a', 'x86' , 'x86_64', 'armeabi' , 'arm64-v8a'
- abiFilters 'armeabi-v7a'
+ abiFilters 'arm64-v8a'
}
externalNativeBuild {
cmake {
@@ -35,7 +35,7 @@
}
sourceSets {
main {
- jniLibs.srcDirs = ['libs/opencv/lib', 'libs/protobuf/lib', 'libs/st_face/lib', 'libs/freetype/lib', 'libs/capnproto/lib']
+ jniLibs.srcDirs = ['libs/opencv/lib', 'libs/protobuf/lib', 'libs/st_face/lib', 'libs/freetype/lib', 'libs/capnproto/lib', 'libs/jsoncpp/lib']
}
}
}
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index ab715f3..38de31e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -7,6 +7,7 @@
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")
set(WORKSPACE_PATH "D:/workspace/proxy")
+set(ARCH "arm64-v8a")
include_directories(
"${WORKSPACE_PATH}/RtspFace"
@@ -43,6 +44,7 @@
add_library(rtspface_server SHARED
RtspNativeCodecJNIServer.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncServer.cpp
RemoteFunc.cpp
CameraWrapperServer.cpp
@@ -53,7 +55,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -114,12 +115,14 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/${ARCH}/libprotobuf.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
@@ -131,6 +134,7 @@
add_library(rtspface_client SHARED
RtspNativeCodecJNIClient.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncClient.cpp
RemoteFunc.cpp
CameraWrapperClient.cpp
@@ -141,7 +145,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -197,12 +200,16 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
+
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
index 31a19d5..00d3a9e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
@@ -7,7 +7,7 @@
#include <string>
#include <capnp/ez-rpc.h>
-#include "RemoteMethod.proto.h"
+#include "RemoteMethod.capnp.h"
class RtspFaceDetectClient :public RtspFaceDetect::Client{
public:
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteMethod.capnp.c++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteMethod.capnp.cpp
similarity index 100%
rename from VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteMethod.capnp.c++
rename to VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteMethod.capnp.cpp
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
index 26a6561..240b289 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
@@ -3,7 +3,7 @@
#include <jni.h>
#include "CameraWrapperServer.h"
-#include "RemoteMethod.proto.h"
+#include "RemoteMethod.capnp.h"
#define CAMERA_COUNT 2
--
Gitblit v1.8.0