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/RtspNativeCodec.iml | 2
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h | 8
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp | 66
VisitFace/RtspNativeCodec/.idea/workspace.xml | 1207 +++++++++++++-------------------
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp | 74 -
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 28
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp | 206 ++++
VisitFace/RtspNativeCodec/local.properties | 6
VisitFace/RtspNativeCodec/.idea/misc.xml | 27
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h | 96 -
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp | 53 +
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp | 9
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp | 23
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h | 22
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp | 14
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h | 12
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h | 8
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h | 2
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp | 255 +++++-
VisitFace/RtspNativeCodec/app/app.iml | 10
VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h | 83 +-
21 files changed, 1,160 insertions(+), 1,051 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/misc.xml b/VisitFace/RtspNativeCodec/.idea/misc.xml
index bd818b3..9c3ae0a 100644
--- a/VisitFace/RtspNativeCodec/.idea/misc.xml
+++ b/VisitFace/RtspNativeCodec/.idea/misc.xml
@@ -37,13 +37,38 @@
<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="1.8" project-jdk-type="JavaSDK">
+ <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">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<component name="SvnBranchConfigurationManager">
+ <option name="myConfigurationMap">
+ <map>
+ <entry key="$PROJECT_DIR$/../../FaceServer">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="trunkUrl" value="http://123.57.224.53:8000/svn/proxy/FaceServer" />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$/../../RtspFace">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="trunkUrl" value="http://123.57.224.53:8000/svn/proxy/RtspFace" />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ <entry key="$PROJECT_DIR$">
+ <value>
+ <SvnBranchConfiguration>
+ <option name="trunkUrl" value="http://123.57.224.53:8000/svn/proxy/VisitFace/RtspNativeCodec" />
+ </SvnBranchConfiguration>
+ </value>
+ </entry>
+ </map>
+ </option>
<option name="mySupportsUserInfoFilter" value="true" />
</component>
</project>
\ No newline at end of file
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>
diff --git a/VisitFace/RtspNativeCodec/RtspNativeCodec.iml b/VisitFace/RtspNativeCodec/RtspNativeCodec.iml
index 23f2aeb..cbf0f33 100644
--- a/VisitFace/RtspNativeCodec/RtspNativeCodec.iml
+++ b/VisitFace/RtspNativeCodec/RtspNativeCodec.iml
@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
- <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+ <orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
diff --git a/VisitFace/RtspNativeCodec/app/app.iml b/VisitFace/RtspNativeCodec/app/app.iml
index 1ed01ef..865e016 100644
--- a/VisitFace/RtspNativeCodec/app/app.iml
+++ b/VisitFace/RtspNativeCodec/app/app.iml
@@ -8,7 +8,7 @@
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
- <option name="SELECTED_BUILD_VARIANT" value="debug" />
+ <option name="SELECTED_BUILD_VARIANT" value="release" />
</configuration>
</facet>
<facet type="android" name="Android">
@@ -39,6 +39,9 @@
</content>
<content url="file://$MODULE_DIR$/../../../RtspFace/CvUtil">
<sourceFolder url="file://$MODULE_DIR$/../../../RtspFace/CvUtil" isTestSource="false" />
+ </content>
+ <content url="file://$MODULE_DIR$/../../../RtspFace/FFmpegRTSPServer">
+ <sourceFolder url="file://$MODULE_DIR$/../../../RtspFace/FFmpegRTSPServer" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../../RtspFace/Logger/src">
<sourceFolder url="file://$MODULE_DIR$/../../../RtspFace/Logger/src" isTestSource="false" />
@@ -102,21 +105,16 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 8922d56..95d13b3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti -Wall -UNDEBUG")
#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 "E:/Documents/works")
+set(WORKSPACE_PATH "D:/workspace/proxy")
set(ARCH "arm64-v8a")
include_directories(
@@ -24,7 +24,6 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/include/json"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
@@ -44,8 +43,6 @@
add_library(rtspface_server SHARED
RtspNativeCodecJNIServer.cpp
- RemoteFuncServer.cpp
- RemoteFunc.cpp
CameraWrapperServer.cpp
FaceCache.cpp
FaceCacheForPLBG.cpp
@@ -54,8 +51,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
- AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -114,11 +109,11 @@
"${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/capnproto/lib/${ARCH}/libcapnp.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/capnproto/lib/${ARCH}/libcapnp-0.6.1.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.6.1.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.6.1.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"
@@ -130,8 +125,6 @@
add_library(rtspface_client SHARED
RtspNativeCodecJNIClient.cpp
- RemoteFuncClient.cpp
- RemoteFunc.cpp
CameraWrapperClient.cpp
FaceCache.cpp
FaceCacheForPLBG.cpp
@@ -140,8 +133,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
- AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -196,12 +187,13 @@
"${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/capnproto/lib/${ARCH}/libcapnp.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/capnproto/lib/${ARCH}/libcapnp-0.6.1.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.6.1.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.6.1.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/CameraWrapperClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
index 2e3a0fb..c5bb607 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
@@ -267,31 +267,33 @@
faceLabels.insert(std::make_pair(st_track_id, label));
}
-void CameraWrapper::fireFaceCount(int faceCount)
+static void invokeCallback(CameraWrapper& cameraWrapper, int faceCount)
{
+ //jni thread may not able to invoke java callback
// double check it's all ok
- int getEnvStat = javaVM->GetEnv((void **)&(javaEnv), JNI_VERSION_1_6);
+ int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
if (getEnvStat == JNI_EDETACHED)
{
//LOG_WARN << "GetEnv: not attached" << std::endl;
- if (javaVM->AttachCurrentThread(&(javaEnv), NULL) != 0)
+ if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
LOG_WARN << "Failed to attach" << LOG_ENDL;
else
getEnvStat = JNI_OK;
}
- else if (getEnvStat == JNI_OK){
+ else if (getEnvStat == JNI_OK)
+ {
}
else if (getEnvStat == JNI_EVERSION)
LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
else if (getEnvStat == JNI_ERR)
LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
- javaEnv->CallStaticVoidMethod(faceCallbackClazz, faceCallbackFunc, cameraIdx, faceCount);
+ cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, faceCount);
- if (javaEnv->ExceptionCheck())
- javaEnv->ExceptionDescribe();
+ if (cameraWrapper.javaEnv->ExceptionCheck())
+ cameraWrapper.javaEnv->ExceptionDescribe();
- javaVM->DetachCurrentThread();
+ cameraWrapper.javaVM->DetachCurrentThread();
}
bool cw_pm_breaker_ptr_paint(const PipeMaterial* pm, void* args)
@@ -355,22 +357,22 @@
return false;
}
-//bool cw_pm_breaker_ptr_face(const PipeMaterial* pm, void* args)
-//{
-// CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
-//
-// if (cameraWrapper.faceCacheLocked)
-// return false;
-//
-// int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
-// if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
-// return false;
-//
-// cameraWrapper.faceCache.cachePm(*pm);
-// invokeCallback(cameraWrapper, faceCount);
-//
-// return false;
-//}
+bool cw_pm_breaker_ptr_face(const PipeMaterial* pm, void* args)
+{
+ CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
+
+ if (cameraWrapper.faceCacheLocked)
+ return false;
+
+ int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
+ if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
+ return false;
+
+ cameraWrapper.faceCache.cachePm(*pm);
+ invokeCallback(cameraWrapper, faceCount);
+
+ return false;
+}
void test_paint(CameraWrapper& cameraWrapper)
{
@@ -445,14 +447,14 @@
cameraWrapper.lastAliveTime = time(nullptr);
- //if (! cameraWrapper.faceCacheLocked)
- //{
- // PipeMaterial pmAnalizer(pm);
- // PipeLineElem* last = cameraWrapper.pipeLineAnalyzer->pipe(&pmAnalizer);
- // bool ret = last->gain(pmAnalizer);
- // if (ret)
- // pmAnalizer.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_face, &(cameraWrapper));
- //}
+ if (! cameraWrapper.faceCacheLocked)
+ {
+ PipeMaterial pmAnalizer(pm);
+ PipeLineElem* last = cameraWrapper.pipeLineAnalyzer->pipe(&pmAnalizer);
+ bool ret = last->gain(pmAnalizer);
+ if (ret)
+ pmAnalizer.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_face, &(cameraWrapper));
+ }
pm.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_paint, &(cameraWrapper));
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
index ef7d6f4..9705fa6 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
@@ -75,7 +75,7 @@
void lockFace();
void releaseFace();
- void fireFaceCount(int faceCount);
+
void setFaceLabel(int st_track_id, const std::wstring& label);
private:
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
index 677f004..7c1adbd 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
@@ -1,5 +1,4 @@
#include "CameraWrapperServer.h"
-#include "RemoteFuncServer.h"
#include <logger.h>
#include <Logger/src/logger.hpp>
#include <MaterialBuffer.h>
@@ -11,6 +10,7 @@
#include <PL_ColorConv.h>
#include <PL_AndroidMediaCodecEncoder.h>
#include <PL_RTSPServer.h>
+
CameraWrapper::~CameraWrapper()
{
stop();
@@ -372,21 +372,17 @@
bool cw_pm_breaker_ptr_face(const PipeMaterial* pm, void* args)
{
CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
+
if (cameraWrapper.faceCacheLocked)
return false;
int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
return false;
+
cameraWrapper.faceCache.cachePm(*pm);
- //remote call start, 涓轰簡淇濊瘉閫氱敤鎬э紝鏈皢浠ヤ笅姝ラ灏佸叆RtspFaceDetectClient
- RtspFaceDetectClient &client = getRtspFaceDetectClient();
- auto request = client.fireFaceCountListenerRequest();
- request.setCameraIndex(cameraWrapper.cameraIdx);
- request.setFaceCount(cameraWrapper.faceCache.getFaceCount(*pm));
- auto sendAct = request.send();
- sendAct.wait(client.getWaitScope());
- //remote call end
+ invokeCallback(cameraWrapper, faceCount);
+
return false;
}
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
index 917fc08..2f9cea5 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
@@ -4,8 +4,6 @@
#include <PipeLine.h>
#include <vector>
-#define FACECACHEFORPLBG_RESULT_BUFFSIZE (1920 * 1080 * 2)
-
struct NativeImgIdx
{
int st_track_id;
@@ -58,21 +56,11 @@
size_t getFaceCount(const PipeMaterial& pm) const;
bool getFaceListPb(uint8_t* buffer, size_t& buffMaxSize);
- uint8_t* getFaceListPb(size_t& buffSize)
- {
- buffSize = FACECACHEFORPLBG_RESULT_BUFFSIZE;
- if (!getFaceListPb(resultBuffer, buffSize))
- return nullptr;
- return resultBuffer;//#todo to cpp
- }
bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize);
- uint8_t* getFaceListImage(size_t& buffSize);
-
private:
void* _ctx;
- uint8_t* resultBuffer;
};
#endif
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
index b7502eb..7a82720 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
@@ -152,16 +152,14 @@
}
};
-FaceCacheForPLBG::FaceCacheForPLBG() : _ctx(new FcPmBreackerContextPLBG), resultBuffer(nullptr)
+FaceCacheForPLBG::FaceCacheForPLBG() : _ctx(new FcPmBreackerContextPLBG)
{
- resultBuffer = new uint8_t[FACECACHEFORPLBG_RESULT_BUFFSIZE];
+
}
FaceCacheForPLBG::~FaceCacheForPLBG()
{
delete (FcPmBreackerContextPLBG*)_ctx;
- delete resultBuffer;
- resultBuffer = nullptr;
}
@@ -228,6 +226,7 @@
return 0;
}
+
bool FaceCacheForPLBG::getFaceListPb(uint8_t* buffer, size_t& buffMaxSize)
{
FcPmBreackerContextPLBG& ctx(*(FcPmBreackerContextPLBG*)_ctx);
@@ -277,6 +276,7 @@
return buffMaxSize > 0;
}
+
bool FaceCacheForPLBG::getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize)
{
FcPmBreackerContextPLBG& ctx(*(FcPmBreackerContextPLBG*)_ctx);
@@ -313,3 +313,4 @@
return true;
}
+
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp
index 2034887..b8ee965 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp
@@ -1,4 +1,49 @@
-//
-// Created by pansen on 2017/8/4.
-//
-#include "RemoteFunc.h"
+//
+// Created by pansen on 2017/8/4.
+//
+
+#include "RemoteFunc.h"
+#include <logger.h>
+
+
+bool RemoteServer::start() {
+ LOG_INFO << "server_thd::start" << LOG_ENDL;
+
+ if(running == true){
+ LOG_INFO << "The server_thd is already running" << LOG_ENDL;
+ return false;
+ }
+ running = true;
+ pthread_mutex_init(&mutexSerevr, NULL); // 鍒濆鍖栦簰鏂ュ璞�,鍔ㄦ�佸姞閿侊紝鐢ㄤ簬server
+
+ int retServer = pthread_create(&server_thd, NULL, RemoteServer::rServer_thd, this);
+
+ if(retServer != 0)
+ {
+ LOGP(ERROR, "server_thd_create: %s/n", strerror(retServer));
+ running = false;
+ return false;
+ }
+ return true;
+}
+
+void RemoteServer::stop() {
+// LOG_INFO << "server_thd::stop" << LOG_ENDL;
+// if (!running)
+// return;
+// running = false;
+// pthread_mutex_destroy(&mutexSerevr);
+ //#todo
+}
+
+template <class T>
+void *RemoteServer::rServer_thd(void *arg) {
+ LOG_INFO << "RemoteServer::rServer_thd start" << LOG_ENDL;
+ RemoteServer& rs = *(RemoteServer*)arg;
+ capnp::EzRpcServer trpcServer(kj::heap<T>(),rs.host, rs.port);
+ auto& serverLoop = trpcServer.getWaitScope();
+ kj::NEVER_DONE.wait(serverLoop);
+ LOG_INFO << "RemoteServer::rServer_thd stop" << LOG_ENDL;
+}
+
+
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h
index 422237d..83c55c0 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h
@@ -1,61 +1,35 @@
-//
-// Created by pansen on 2017/8/4.
-//
-
-#ifndef RTSPNATIVECODEC_REMOTEFUNC_H
-#define RTSPNATIVECODEC_REMOTEFUNC_H
-
-#include <iostream>
-#include <capnp/ez-rpc.h>
-#include <logger.h>
-
-template <class T> class RemoteServer{
-public:
- RemoteServer(std::string host,int port):host(host),port(port){};
- ~RemoteServer(){};
-
- bool start() {
- LOG_INFO << "server_thd::start" << LOG_ENDL;
-
- if(running == true){
- LOG_INFO << "The server_thd is already running" << LOG_ENDL;
- return false;
- }
- running = true;
- pthread_mutex_init(&mutexSerevr, NULL); // 鍒濆鍖栦簰鏂ュ璞�,鍔ㄦ�佸姞閿侊紝鐢ㄤ簬server
-
- int retServer = pthread_create(&server_thid, NULL, RemoteServer::rServer_thd, this);
-
- if(retServer != 0)
- {
- LOGP(ERROR, "server_thd_create: %s/n", strerror(retServer));
- running = false;
- return false;
- }
- return true;
- }
- void stop(){
-// LOG_INFO << "server_thd::stop" << LOG_ENDL;
-// if (!running)
-// return;
-// running = false;
-// pthread_mutex_destroy(&mutexSerevr);
- //#todo
- }
-
- bool running;
-private:
- std::string host;
- int port;
-
- static void *rServer_thd(void *arg) {
- RemoteServer& rs = *(RemoteServer*)arg;
- capnp::EzRpcServer trpcServer(kj::heap<T>(),rs.host, rs.port);
- auto& serverLoop = trpcServer.getWaitScope();
- kj::NEVER_DONE.wait(serverLoop);
- }
- pthread_t server_thid;
- pthread_mutex_t mutexSerevr;
-};
-#endif //RTSPNATIVECODEC_REMOTEFUNC_H
-
+//
+// Created by pansen on 2017/8/4.
+//
+
+#ifndef RTSPNATIVECODEC_REMOTEFUNC_H
+#define RTSPNATIVECODEC_REMOTEFUNC_H
+
+#include <iostream>
+#include <capnp/ez-rpc.h>
+#include "RemoteMethod.proto.h"
+
+//::capnp::Capability::Server
+template <class T> class RemoteServer{
+public:
+// RemoteServer(std::string host, int port, capnp::EzRpcServer rpcServer) : rpcServer(rpcServer) {
+// this->rpcServer(kj::heap<T>(),host, port);
+// //.rpcServer(kj::heap<T>(),host, port);
+// };
+ RemoteServer(std::string host,int port):host(host),port(port){};
+ ~RemoteServer(){};
+
+ bool start();
+ void stop();
+ bool running;
+private:
+ std::string host;
+ int port;
+
+ static void *rServer_thd(void *arg);
+
+ pthread_t server_thd;
+ pthread_mutex_t mutexSerevr;
+};
+#endif //RTSPNATIVECODEC_REMOTEFUNC_H
+
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp
index 5bc9c0d..b423f48 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp
@@ -2,25 +2,4 @@
// Created by pansen on 2017/8/4.
//
-#include "RemoteFuncClient.h"
-#include "RemoteFunc.h"
-#include "RtspNativeCodecJNIClient.h"
-RemoteServer<RtspFaceDetectImpl> remoteServer("127.0.0.1",8111);
-void startRemoteServer(){
- remoteServer.start();
-}
-RtspFaceViewClient rtspFaceViewClient;
-RtspFaceViewClient& RtspFaceViewClient(){
- return rtspFaceViewClient;
-}
-RtspFaceViewClient::RtspFaceViewClient():rpcClient("127.0.0.1",8112),
- RtspFaceView::Client(rpcClient.getMain<RtspFaceView>())
-{}
-::kj::WaitScope& RtspFaceViewClient::getWaitScope(){
- return rpcClient.getWaitScope();
-}
-::kj::Promise<void> RtspFaceDetectImpl::fireFaceCountListener(FireFaceCountListenerContext context) {
- auto results = context.getResults();
- remoteFireFaceCountListener(context.getParams(), results);
- context.setResults(results);
-}
\ No newline at end of file
+
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
index 75f482b..bff5df3 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
@@ -5,24 +5,32 @@
#ifndef RTSPNATIVECODEC_REMOTEMETHODCLIENT_H
#define RTSPNATIVECODEC_REMOTEMETHODCLIENT_H
-#include <string>
+#include <iostream>
#include <capnp/ez-rpc.h>
#include "RemoteMethod.proto.h"
#include "CameraWrapperServer.h"
-void startRemoteServer();
-class RtspFaceViewClient : RtspFaceView::Client{
+
+const RtspFaceView::Client getRtspFaceViewClient();
+
+class RtspFaceViewClient{
public:
RtspFaceViewClient();
- ~RtspFaceViewClient(){};
- ::kj::WaitScope& getWaitScope();
+ ~RtspFaceViewClient();
+
+ RtspFaceView::GetFaceListResults::Reader getFaceList(int cameraIndex);
+ RtspFaceView::GetFaceListResults::Reader getFaceImages(int cameraIndex);
+ void setFaceLable(int cameraIndex,int trackId,std::string label);
+
private:
capnp::EzRpcClient rpcClient;
+ RtspFaceDetect::Client client;
};
-
-const RtspFaceViewClient& getRtspFaceViewClient();
class RtspFaceDetectImpl final : public RtspFaceDetect::Server{
public:
+ RtspFaceDetectImpl();
+ ~RtspFaceDetectImpl();
+
virtual ::kj::Promise<void> fireFaceCountListener(FireFaceCountListenerContext context) override ;
};
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
index 963b60c..b768f8a 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
@@ -1,42 +1,32 @@
-//
-// Created by pansen on 2017/8/4.
-//
-#include "AppConfig.h"
-#include "RemoteFunc.h"
-#include "RemoteFuncServer.h"
-#include "RtspNativeCodecJNIServer.h"
-RemoteServer<RtspFaceViewImpl> remoteServer("127.0.0.1",8112);
-RtspFaceDetectClient rtspFaceDetectClient;
-void startRemoteServer(){
- AppConfig config;
- config.loadConfig("data/config.cfg");
- remoteServer.start();
-}
-RtspFaceDetectClient& getRtspFaceDetectClient(){
- return rtspFaceDetectClient;
-}
-//#todo
-RtspFaceDetectClient::RtspFaceDetectClient():rpcClient("127.0.0.1",8111),
- RtspFaceDetect::Client(rpcClient.getMain<RtspFaceDetect>())
-{}
-::kj::WaitScope& RtspFaceDetectClient::getWaitScope() {
- return rpcClient.getWaitScope();
-}
-
-::kj::Promise<void> RtspFaceViewImpl::getFaceList(GetFaceListContext context) {
- auto results = context.getResults();
- remoteGetFaceList(context.getParams(), results);
- context.setResults(results);
-}
-
-::kj::Promise<void> RtspFaceViewImpl::getFaceImages(GetFaceImagesContext context){
- auto results = context.getResults();
- remoteGetFaceListImage(context.getParams(), results);
- context.setResults(results);
-}
-
-::kj::Promise<void> RtspFaceViewImpl::setFaceLabel(SetFaceLabelContext context) {
- auto results = context.getResults();
- remoteSetFaceLabel(context.getParams(), results);
- context.setResults(results);
-}
+//
+// Created by pansen on 2017/8/4.
+//
+#include "RemoteFuncServer.h"
+
+RtspFaceDetectClient rtspFaceDetectClient;
+
+const RtspFaceDetectClient& getRtspFaceDetectClient(){
+ return rtspFaceDetectClient;
+}
+
+//#todo
+RtspFaceDetectClient::RtspFaceDetectClient():rpcClient("127.0.0.1",8111),
+ client(rpcClient.getMain<RtspFaceDetect>())
+{}
+void RtspFaceDetectClient::fireFaceCountListener(int cameraIndex, int faceCount){
+ auto req = client.fireFaceCountListenerRequest();
+ req.setCameraIndex(cameraIndex);
+ req.setFaceCount(faceCount);
+ auto send = req.send();
+ send.wait(rpcClient.getWaitScope());
+}
+
+
+
+//#todo
+::kj::Promise<void> RtspFaceViewImpl::RtspFaceViewImpl() {}
+::kj::Promise<void> RtspFaceViewImpl::~RtspFaceViewImpl(){}
+
+::kj::Promise<void> RtspFaceViewImpl::getFaceList(GetFaceListContext context) override{}
+::kj::Promise<void> RtspFaceViewImpl::getFaceImages(GetFaceImagesContext context) override{}
+::kj::Promise<void> RtspFaceViewImpl::setFaceLabel(SetFaceLabelContext context) override {}
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
index 31a19d5..5cf671e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
@@ -1,37 +1,46 @@
-//
-// Created by pansen on 2017/8/4.
-//
-
-#ifndef RTSPNATIVECODEC_REMOTEMETHODSERVER_H
-#define RTSPNATIVECODEC_REMOTEMETHODSERVER_H
-
-#include <string>
-#include <capnp/ez-rpc.h>
-#include "RemoteMethod.proto.h"
-
-class RtspFaceDetectClient :public RtspFaceDetect::Client{
-public:
- RtspFaceDetectClient();
- ~RtspFaceDetectClient(){};
- ::kj::WaitScope& getWaitScope();
-private:
- capnp::EzRpcClient rpcClient;
-};
-
-void startRemoteServer();
-RtspFaceDetectClient& getRtspFaceDetectClient();
-
-class RtspFaceViewImpl final : public RtspFaceView::Server {
-public:
- virtual ::kj::Promise<void> getFaceList(GetFaceListContext context) override;
-
- virtual ::kj::Promise<void> getFaceImages(GetFaceImagesContext context) override;
-
- virtual ::kj::Promise<void> setFaceLabel(SetFaceLabelContext context) override;
-
-private:
-};
-
-
-
-#endif //RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+//
+// Created by pansen on 2017/8/4.
+//
+
+#ifndef RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+#define RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+
+#include <iostream>
+#include <capnp/ez-rpc.h>
+#include "RemoteMethod.proto.h"
+#include "CameraWrapperServer.h"
+
+const RtspFaceDetectClient& getRtspFaceDetectClient();
+
+class RtspFaceDetectClient{
+public:
+ RtspFaceDetectClient();
+ ~RtspFaceDetectClient();
+
+ void fireFaceCountListener(int cameraIndex, int faceCount);
+
+private:
+ capnp::EzRpcClient rpcClient;
+ RtspFaceDetect::Client client;
+};
+
+class RtspFaceViewImpl final : public RtspFaceView::Server {
+public:
+ RtspFaceViewImpl();
+
+ ~RtspFaceViewImpl();
+
+ virtual ::kj::Promise<void> getFaceList(GetFaceListContext context) override;
+
+
+ virtual ::kj::Promise<void> getFaceImages(GetFaceImagesContext context) override;
+
+ virtual ::kj::Promise<void> setFaceLabel(SetFaceLabelContext context) override ;
+
+private:
+ CameraWrapper cameraWrapper;
+};
+
+
+
+#endif //RTSPNATIVECODEC_REMOTEMETHODSERVER_H
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
index c4a679e..72f5046 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
@@ -10,6 +10,7 @@
#include <media/NdkMediaExtractor.h>
#include <pthread.h>
+
#include <ev_proto.h>
#include <face_daemon_proto.h>
@@ -19,6 +20,7 @@
#include "TeleWrapper.h"
#include "cpu_sched_test.h"
+
//#include <mediastreamer2/include/mediastreamer2/msjava.h>
std::stringstream logss;
@@ -34,21 +36,14 @@
TeleWrapper g_TeleWrapper;
-const size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
-uint8_t _faceImages[_faceImagesSize]; // android stack is small
-void remoteFireFaceCountListener(const RtspFaceDetect::FireFaceCountListenerParams::Reader& params, RtspFaceDetect::FireFaceCountListenerResults::Builder& results){
- int count = params.getFaceCount();
- int index = params.getCameraIndex();
- g_CameraWrappers[index].fireFaceCount(count);
-}
extern "C"
{
void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
- {
- g_logger.set_level(INFO);
+{
+ g_logger.set_level(INFO);
- cpu_sched();
+ cpu_sched();
#ifdef USE_ST_SDK
PipeLine::register_global_elem_creator("PL_SensetimeFaceTrackMitiTrd", create_PL_SensetimeFaceTrackMultiTrd);
@@ -80,6 +75,174 @@
g_CameraWrappers[i].rtspConfig.requestStreamingOverTcp = true;
}
env->ReleaseStringUTFChars(ipaddr, utf8);
+}
+
+//static jclass _jcOutputSurface = nullptr;
+//static jmethodID _jmOutputSurface_ctor = nullptr;
+//static jmethodID _jmOutputSurface_getSurface = nullptr;
+//static jmethodID _jmOutputSurface_readPixels = nullptr;
+//static jmethodID _jmOutputSurface_awaitNewImage = nullptr;
+//static jmethodID _jmOutputSurface_drawImage = nullptr;
+//static jmethodID _jmOutputSurface_makeCurrent = nullptr;
+//
+//static jobject _jobjOutputSurface = nullptr;
+//static jobject _jobjSurface = nullptr;
+//static JNIEnv *_env = nullptr;
+
+void readPixels(void *surface, uint8_t *buf, size_t &maxSize)
+{
+ //ANativeWindow* window = (ANativeWindow*)surface;
+
+ CameraWrapper &cameraWrapper(g_CameraWrappers[0]);
+
+ int getEnvStat = cameraWrapper.javaVM->GetEnv((void **) &(cameraWrapper.javaEnv),
+ JNI_VERSION_1_6);
+ if (getEnvStat == JNI_EDETACHED)
+ {
+ //LOG_WARN << "GetEnv: not attached" << std::endl;
+ if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+ LOG_WARN << "Failed to attach" << LOG_ENDL;
+ else
+ getEnvStat = JNI_OK;
+ } else if (getEnvStat == JNI_OK)
+ {
+ } else if (getEnvStat == JNI_EVERSION)
+ LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
+ else if (getEnvStat == JNI_ERR)
+ LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+
+ if (maxSize == 0)
+ {
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_makeCurrent);
+ } else
+ {
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_awaitNewImage);
+ //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_drawImage);
+//
+ //jbyteArray jbarrBuffer = (jbyteArray)cameraWrapper.javaEnv->CallObjectMethod(_jobjOutputSurface, _jmOutputSurface_readPixels);
+ //if (jbarrBuffer != nullptr)
+ // cameraWrapper.javaEnv->GetByteArrayRegion(jbarrBuffer, 0, 640 * 480 * 2, (jbyte*)buf);
+ }
+
+ if (cameraWrapper.javaEnv->ExceptionCheck())
+ cameraWrapper.javaEnv->ExceptionDescribe();
+
+ cameraWrapper.javaVM->DetachCurrentThread();
+}
+
+
+/*
+static void* createDecodeSurface()
+{
+ CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
+
+ //OutputSurface outputSurface = null;
+ //outputSurface = new OutputSurface(mWidth, mHeight);
+ //outputSurface.getSurface();
+ //outputSurface.release();
+
+
+ //int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+ //if (getEnvStat == JNI_EDETACHED)
+ //{
+ // //LOG_WARN << "GetEnv: not attached" << std::endl;
+ // if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+ // LOG_WARN << "Failed to attach" << LOG_ENDL;
+ // else
+ // getEnvStat = JNI_OK;
+ //}
+ //else if (getEnvStat == JNI_OK)
+ //{
+ //}
+ //else if (getEnvStat == JNI_EVERSION)
+ // LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
+ //else if (getEnvStat == JNI_ERR)
+ // LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
+
+ //void* ret = nullptr;
+ //{
+ // jclass jcOutputSurface = _jcOutputSurface = cameraWrapper.javaEnv->FindClass("com/example/nativecodec/OutputSurface");
+ // _jcOutputSurface = static_cast<jclass>( cameraWrapper.javaEnv->NewGlobalRef( jcOutputSurface ));
+//
+ // jmethodID jmOutputSurface_ctor = _jmOutputSurface_ctor = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "<init>", "(II)V");
+ // jmethodID jmOutputSurface_getSurface = _jmOutputSurface_getSurface = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "getSurface", "()Landroid/view/Surface;");
+ // jmethodID jmOutputSurface_readPixels = _jmOutputSurface_readPixels = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "readPixels", "()[B");
+//
+ // jmethodID jmOutputSurface_awaitNewImage = _jmOutputSurface_awaitNewImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "awaitNewImage", "()V");
+ // jmethodID jmOutputSurface_drawImage = _jmOutputSurface_drawImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "drawImage", "()V");
+ // jmethodID jmOutputSurface_makeCurrent = _jmOutputSurface_makeCurrent = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "makeCurrent", "()V");
+//
+ // jobject jobjOutputSurface = _jobjOutputSurface = cameraWrapper.javaEnv->NewObject(jcOutputSurface , jmOutputSurface_ctor, 1920, 1088);
+ // _jobjOutputSurface = static_cast<jobject>( cameraWrapper.javaEnv->NewGlobalRef( jobjOutputSurface ));
+//
+ // jobject jobjSurface = _jobjSurface = cameraWrapper.javaEnv->CallObjectMethod(jobjOutputSurface, jmOutputSurface_getSurface);
+ // ret = ANativeWindow_fromSurface(cameraWrapper.javaEnv, jobjSurface);
+ // cameraWrapper.amcdConfig.readPixels_callback = readPixels;
+ //}
+
+ //if (cameraWrapper.javaEnv->ExceptionCheck())
+ // cameraWrapper.javaEnv->ExceptionDescribe();
+//
+ //cameraWrapper.javaVM->DetachCurrentThread();
+
+ //return ret;
+}
+*/
+
+static void *getSurfaceHolderGetSurface(JNIEnv *env, jobject jobjSurfaceHolder)
+{
+ jclass jcSurfaceHolder = env->FindClass("android/view/SurfaceHolder");
+ jmethodID jmSurfaceHolder_getSurface = env->GetMethodID(jcSurfaceHolder, "getSurface", "()Landroid/view/Surface;");
+ jobject surface = env->CallObjectMethod(jobjSurfaceHolder, jmSurfaceHolder_getSurface);
+ return surface;
+}
+
+// set the surface
+void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx,
+ jobject surfaceRender)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ // obtain a native windowRender from a Java surface
+ if (cameraWrapper.windowDecode != nullptr)
+ {
+ ANativeWindow_release((ANativeWindow *) (cameraWrapper.windowDecode));
+ cameraWrapper.windowDecode = NULL;
+ }
+ cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceRender);
+ //cameraWrapper.windowDecode = getSurfaceHolderGetSurface(env, surfaceRender);
+ //cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
+
+ if (cameraWrapper.windowRender != nullptr)
+ {
+ ANativeWindow_release((ANativeWindow *) (cameraWrapper.windowRender));
+ cameraWrapper.windowRender = NULL;
+ }
+ cameraWrapper.windowRender = ANativeWindow_fromSurface(env, surfaceRender);
+ cameraWrapper.asvrConfig.windowSurface = cameraWrapper.windowRender; // support reset
+ //cameraWrapper.windowRender = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
+
+ {
+ ANativeWindow* window = (ANativeWindow*)(cameraWrapper.windowRender);
+ ANativeWindow_Buffer buffer;
+ if(cameraWrapper.windowRender != nullptr && ANativeWindow_lock(window, &buffer, NULL) == 0)
+ {
+ cameraWrapper.plScaleCfg.toHeight=buffer.height;
+ cameraWrapper.plScaleCfg.toWidth=buffer.stride;
+ ANativeWindow_unlockAndPost(window);
+ }
+ else
+ {
+ cameraWrapper.plScaleCfg.toHeight=480;
+ cameraWrapper.plScaleCfg.toWidth=640;
+ }
+ }
+
+ LOGP(DEBUG, "@@@ setsurface %p,%p", cameraWrapper.windowDecode, cameraWrapper.windowRender);
}
jboolean
@@ -281,17 +444,6 @@
cameraWrapper.cameraIdx, 0);
}
-JNIEXPORT jboolean JNICALL
-Java_cn_com_basic_face_util_RtspFaceNative_addFaceCountListener(JNIEnv *env, jclass type,
- jint cameraIdx, jstring host_,
- jint port) {
- const char *host = env->GetStringUTFChars(host_, 0);
-
- //TODO
-
- env->ReleaseStringUTFChars(host_, host);
-}
-
void
Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv *env, jclass clazz, jint cameraIdx)
{
@@ -388,19 +540,20 @@
CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
std::vector<NativeImgIdx> imgIdxes;
-
+ size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+ uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
memset(_faceImages, 0, _faceImagesSize);
bool ret = false;
#ifdef USE_ST_SDK
- size_t faceImagesSize =_faceImagesSize;
- ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages,faceImagesSize);
+ ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
#endif
if (imgIdxes.size() == 0)
{
LOG_INFO << "No face image captured" << LOG_ENDL;
+ delete[] _faceImages;
return nullptr;
}
@@ -411,6 +564,7 @@
LOG_DEBUG << "_faceImagesSize=" << _faceImagesSize << LOG_ENDL;
env->SetByteArrayRegion(jbaFaceImages, 0, _faceImagesSize, (const jbyte *) _faceImages);
env->SetObjectField(faceImages, jfRefByteArray_arr, jbaFaceImages);
+ delete[] _faceImages;
jclass jcArrayList = env->FindClass("java/util/ArrayList");
jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
@@ -465,6 +619,7 @@
if (imgIdxes.size() == 0)
{
LOG_INFO << "No face image captured" << LOG_ENDL;
+ delete[] _faceImages;
return nullptr;
}
@@ -501,6 +656,9 @@
LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
}
+
+ delete[] _faceImages;
+ _faceImages = nullptr;
return jobjArrayList_Imgs;
}
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h
index a7fa3fd..1e473b2 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h
@@ -1,10 +1,10 @@
#ifndef __RTSPNATIVECODECJNI_CLIENT_H__
#define __RTSPNATIVECODECJNI_CLIENT_H__
-#define CAMERA_COUNT 2
-#include <jni.h>
-#include "RemoteMethod.proto.h"
-void remoteFireFaceCountListener(const RtspFaceDetect::FireFaceCountListenerParams::Reader& params, RtspFaceDetect::FireFaceCountListenerResults::Builder& results);
+#include <jni.h>
+
+#define CAMERA_COUNT 2
+
extern "C"
{
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
index 1ca3782..9549e1b 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
@@ -36,45 +36,6 @@
TeleWrapper g_TeleWrapper;
-const size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
-uint8_t _faceImages[_faceImagesSize]; // android stack is small
-const size_t _faceListBufferSize = sizeof(MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT*3);
-uint8_t faceListBuffer[_faceListBufferSize] = {0};
-
-void remoteGetFaceListImage(const RtspFaceView::GetFaceImagesParams::Reader& params, RtspFaceView::GetFaceImagesResults::Builder& results){
- const int cameraIdx = params.getCameraIndex() - 1;
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- std::vector<NativeImgIdx> imgIdxes;
- size_t faceImagesSize = _faceImagesSize;
- memset(_faceImages, 0, _faceImagesSize);
- bool ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, faceImagesSize);
- if (imgIdxes.size() == 0){
- LOG_INFO << "No face image captured" << LOG_ENDL;
- return;
- }
- int imgIdxesSize = imgIdxes.size() * sizeof(NativeImgIdx);
- auto imgIndexData = results.initImgIndexData(imgIdxesSize);
- memcpy(imgIndexData.begin(), imgIdxes.data(), imgIdxesSize);
- auto imgData = results.initImgData(_faceImagesSize);
- memcpy(imgData.begin(), _faceImages, _faceImagesSize);
-}
-
-void remoteGetFaceList(const RtspFaceView::GetFaceListParams::Reader& params, RtspFaceView::GetFaceListResults::Builder& results){
- const int cameraIdx = params.getCameraIndex() - 1;
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- uint8_t *pBufPB = faceListBuffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
- size_t faceListBufferSize = sizeof(faceListBuffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
- cameraWrapper.faceCache.getFaceListPb(pBufPB, faceListBufferSize);
- auto buffer = results.initFaceList(faceListBufferSize);
- memcpy(buffer.begin(), pBufPB, faceListBufferSize);
-}
-
-void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results){
- const int cameraIdx = params.getCameraIndex() - 1;
- CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
- cameraWrapper.setFaceLabel(params.getTrackId(),std::wstring((wchar_t*)params.getLabel().begin()));
-}
-
extern "C"
{
@@ -91,6 +52,7 @@
for (size_t i = 0; i < CAMERA_COUNT; i++)
{
g_CameraWrappers[i].cameraIdx = i + 1;
+
g_CameraWrappers[i].pipeLineDecoderDetector = new PipeLine;
g_CameraWrappers[i].pipeLineAnalyzer = new PipeLine;
g_CameraWrappers[i].pipeLineRender = new PipeLine;
@@ -504,6 +466,202 @@
cameraWrapper.releaseFace();
}
+jint
+Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv *env, jclass clazz, jint cameraIdx,
+ jint dbId, jobject faceListPb)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceList" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ // #todo optimize not copy data here, set data to jbyteArray directly
+ // Y channel of YUV420p, packed in protobuf
+ uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT] = {0};
+ size_t buffSize = sizeof(buffer);
+
+ bool ret = false;
+#ifdef USE_ST_SDK
+ uint8_t *pBufPB = buffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
+ buffSize = sizeof(buffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
+ ret = cameraWrapper.faceCache.getFaceListPb(pBufPB, buffSize);
+#endif
+
+ if (!ret)
+ {
+ LOG_INFO << "No face captured" << LOG_ENDL;
+ return 0;
+ }
+
+ LOG_INFO << "Face captured " << LOG_ENDL;
+
+ EVPHeader *evpHeader = new(buffer) EVPHeader;
+ evpHeader->proto = EVPProto::EVPP_PROTOBUF;
+ evpHeader->cmd = FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_PB;
+ evpHeader->size = sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB) + buffSize;
+ buffSize = evpHeader->size;
+
+ FDP_FaceDetectPB *fdpFaceDetectPB = new(buffer + sizeof(EVPHeader)) FDP_FaceDetectPB(dbId, cameraIdx + 1);
+
+ evpHeader->hton();
+ fdpFaceDetectPB->hton();
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/facelist-%d-%d-%u.pb", dbId, cameraIdx, ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(buffer, 1, buffSize, pFile);
+ // fclose(pFile);
+ // if (f > 10)exit(0);
+ //}
+
+ jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
+ jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
+
+ jbyteArray jbaFaceListPb = env->NewByteArray(buffSize);
+ env->SetByteArrayRegion(jbaFaceListPb, 0, buffSize, (const jbyte *) buffer);
+ env->SetObjectField(faceListPb, jfRefByteArray_arr, jbaFaceListPb);
+
+#ifdef ENABLE_DEBUG_SENDFACEDETECT
+ dbgSendFaceDetect(buffer, buffSize);
+#endif
+
+ return buffSize;
+}
+
+jobject
+_Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv *env, jclass clazz, jint cameraIdx,
+ jobject faceImages)
+{
+ LOG_DEBUG << "@@@ _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ std::vector<NativeImgIdx> imgIdxes;
+ size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+ uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
+ memset(_faceImages, 0, _faceImagesSize);
+
+ bool ret = false;
+
+#ifdef USE_ST_SDK
+ ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
+#endif
+
+ if (imgIdxes.size() == 0)
+ {
+ LOG_INFO << "No face image captured" << LOG_ENDL;
+ delete[] _faceImages;
+ return nullptr;
+ }
+
+ jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
+ jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
+
+ jbyteArray jbaFaceImages = env->NewByteArray(_faceImagesSize);
+ LOG_DEBUG << "_faceImagesSize=" << _faceImagesSize << LOG_ENDL;
+ env->SetByteArrayRegion(jbaFaceImages, 0, _faceImagesSize, (const jbyte *) _faceImages);
+ env->SetObjectField(faceImages, jfRefByteArray_arr, jbaFaceImages);
+ delete[] _faceImages;
+
+ jclass jcArrayList = env->FindClass("java/util/ArrayList");
+ jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
+ jmethodID jmArrayList_add = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");
+
+ jclass jcNativeImgIdx = env->FindClass("cn/com/basic/face/util/NativeImgIdx");
+ jmethodID jmNativeImgIdx_ctor = env->GetMethodID(jcNativeImgIdx, "<init>", "()V");
+ jfieldID jfNativeImgIdx_offset = env->GetFieldID(jcNativeImgIdx, "offset", "I");
+ jfieldID jfNativeImgIdx_size = env->GetFieldID(jcNativeImgIdx, "size", "I");
+ jfieldID jfNativeImgIdx_type = env->GetFieldID(jcNativeImgIdx, "type", "I");
+ jfieldID jfNativeImgIdx_width = env->GetFieldID(jcNativeImgIdx, "width", "I");
+ jfieldID jfNativeImgIdx_height = env->GetFieldID(jcNativeImgIdx, "height", "I");
+
+ jobject jobjArrayList_ImgIdxes = env->NewObject(jcArrayList, jmArrayList_ctor);
+
+ for (size_t i = 0; i < imgIdxes.size(); i++)
+ {
+ jobject jobjNativeImgIdx = env->NewObject(jcNativeImgIdx, jmNativeImgIdx_ctor);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_offset, imgIdxes[i].offset);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_size, imgIdxes[i].size);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_type, imgIdxes[i].type);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_width, imgIdxes[i].width);
+ env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_height, imgIdxes[i].height);
+
+ env->CallBooleanMethod(jobjArrayList_ImgIdxes, jmArrayList_add, jobjNativeImgIdx);
+
+ LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
+ }
+
+ return jobjArrayList_ImgIdxes;
+}
+
+jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv *env, jclass clazz,
+ jint cameraIdx)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+
+ std::vector<NativeImgIdx> imgIdxes;
+ size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+ uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
+ memset(_faceImages, 0, _faceImagesSize);
+
+ bool ret = false;
+
+#ifdef USE_ST_SDK
+ ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
+#endif
+
+ if (imgIdxes.size() == 0)
+ {
+ LOG_INFO << "No face image captured" << LOG_ENDL;
+ delete[] _faceImages;
+ return nullptr;
+ }
+
+ jclass jcArrayList = env->FindClass("java/util/ArrayList");
+ jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
+ jmethodID jmArrayList_add = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");
+
+ jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
+ jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
+ jfieldID jfNativeImg_st_track_id = env->GetFieldID(jcNativeImg, "st_track_id", "I");
+ jfieldID jfNativeImg_size = env->GetFieldID(jcNativeImg, "size", "I");
+ jfieldID jfNativeImg_type = env->GetFieldID(jcNativeImg, "type", "I");
+ jfieldID jfNativeImg_width = env->GetFieldID(jcNativeImg, "width", "I");
+ jfieldID jfNativeImg_height = env->GetFieldID(jcNativeImg, "height", "I");
+ jfieldID jfNativeImg_image = env->GetFieldID(jcNativeImg, "image", "[B");
+
+ jobject jobjArrayList_Imgs = env->NewObject(jcArrayList, jmArrayList_ctor);
+
+ for (size_t i = 0; i < imgIdxes.size(); i++)
+ {
+ jobject jobjNativeImg = env->NewObject(jcNativeImg, jmNativeImg_ctor);
+ env->SetIntField(jobjNativeImg, jfNativeImg_st_track_id, imgIdxes[i].st_track_id);
+ env->SetIntField(jobjNativeImg, jfNativeImg_size, imgIdxes[i].size);
+ env->SetIntField(jobjNativeImg, jfNativeImg_type, imgIdxes[i].type);
+ env->SetIntField(jobjNativeImg, jfNativeImg_width, imgIdxes[i].width);
+ env->SetIntField(jobjNativeImg, jfNativeImg_height, imgIdxes[i].height);
+
+ jbyteArray jbaFaceImage = env->NewByteArray(imgIdxes[i].size);
+ env->SetByteArrayRegion(jbaFaceImage, 0, imgIdxes[i].size,
+ (const jbyte *) (_faceImages + imgIdxes[i].offset));
+ env->SetObjectField(jobjNativeImg, jfNativeImg_image, jbaFaceImage);
+
+ env->CallBooleanMethod(jobjArrayList_Imgs, jmArrayList_add, jobjNativeImg);
+
+ LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
+ }
+
+ delete[] _faceImages;
+ _faceImages = nullptr;
+ return jobjArrayList_Imgs;
+}
+
void Java_cn_com_basic_face_util_RtspFaceNative_dbgFaceAdd(JNIEnv *env, jclass clazz,
jobject faceImage)
{
@@ -627,4 +785,23 @@
LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_telShutdown" << LOG_ENDL;
g_TeleWrapper.stop();
}
+
+void Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel(JNIEnv *env, jclass clazz, jint cameraIdx, jint stTrackId, jstring label)
+{
+ LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel" << LOG_ENDL;
+ assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
+ cameraIdx -= 1;
+ CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
+ const jchar* jchars = env->GetStringChars(label, nullptr);
+ std::wstring wstr;
+ int lenth = env->GetStringLength(label);
+
+ for (int i = 0; i < lenth; ++i) {
+ jchar jc = *(jchars + i);
+ wchar_t wt = (wchar_t)jc;
+ wstr.push_back(wt);
+ }
+ env->ReleaseStringChars(label,jchars);
+ cameraWrapper.setFaceLabel(stTrackId, wstr);
+}
} // extern C
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
index 26a6561..964a98e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
@@ -2,16 +2,8 @@
#define __RTSPNATIVECODECJNI_SERVER_H__
#include <jni.h>
-#include "CameraWrapperServer.h"
-#include "RemoteMethod.proto.h"
#define CAMERA_COUNT 2
-
-//CameraWrapper& getCameraWrapper(int camidx);
-
-void remoteGetFaceListImage(const RtspFaceView::GetFaceImagesParams::Reader& params, RtspFaceView::GetFaceImagesResults::Builder& results);
-void remoteGetFaceList(const RtspFaceView::GetFaceListParams::Reader& params, RtspFaceView::GetFaceListResults::Builder& results);
-void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results);
extern "C"
{
diff --git a/VisitFace/RtspNativeCodec/local.properties b/VisitFace/RtspNativeCodec/local.properties
index 2fd8b8b..850cfc7 100644
--- a/VisitFace/RtspNativeCodec/local.properties
+++ b/VisitFace/RtspNativeCodec/local.properties
@@ -7,6 +7,6 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Wed Mar 22 13:58:29 CST 2017
-ndk.dir=C\:\\Users\\houxiao\\AppData\\Local\\Android\\Sdk\\ndk-bundle
-sdk.dir=C\:\\Users\\houxiao\\AppData\\Local\\Android\\Sdk
+#Thu Aug 03 09:16:54 CST 2017
+ndk.dir=D\:\\ProgramFiles\\Android\\sdk\\ndk-bundle
+sdk.dir=D\:\\ProgramFiles\\Android\\sdk
--
Gitblit v1.8.0