From 83cfdf5ea0259f1fdf4ee3ea6046a7b694134161 Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 09 八月 2017 13:55:43 +0800 Subject: [PATCH] rtps server (not ok) --- VisitFace/RtspNativeCodec/.idea/workspace.xml | 1017 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 783 insertions(+), 234 deletions(-) diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml index 18e8cb8..f09415d 100644 --- a/VisitFace/RtspNativeCodec/.idea/workspace.xml +++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml @@ -1,25 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="AndroidLayouts"> + <shared> + <config> + <devices> + <device id="tv_1080p" /> + </devices> + </config> + </shared> + </component> <component name="AndroidLogFilters"> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> </component> <component name="ChangeListManager"> - <list default="true" readonly="true" id="03a9d3bc-227b-491c-ac6f-70f09fdb8dce" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewSink.h" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/Logger/src/logger.cc" afterPath="$PROJECT_DIR$/../../RtspFace/Logger/src/logger.cc" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/Logger/src/logger.hpp" afterPath="$PROJECT_DIR$/../../RtspFace/Logger/src/logger.hpp" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_H264Decoder.cpp" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_H264Encoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_H264Encoder.cpp" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_H264Encoder.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_H264Encoder.h" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/live555/config.android" afterPath="$PROJECT_DIR$/../../RtspFace/live555/config.android" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" afterPath="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/logger.h" afterPath="$PROJECT_DIR$/../../RtspFace/logger.h" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/main.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/main.cpp" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/make.sh" afterPath="$PROJECT_DIR$/../../RtspFace/make.sh" /> + <list default="true" readonly="true" id="7ae7b537-c9d7-47f6-b809-98f2bf0296aa" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/RtspNativeCodec.iml" afterPath="$PROJECT_DIR$/RtspNativeCodec.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" /> </list> <ignored path="RtspNativeCodec.iws" /> <ignored path=".idea/workspace.xml" /> + <ignored path="$PROJECT_DIR$/.gradle/" /> + <ignored path="$PROJECT_DIR$/build/classes/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -27,7 +31,6 @@ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="LAST_RESOLUTION" value="IGNORE" /> </component> - <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> <component name="CreatePatchCommitExecutor"> <option name="PATCH_PATH" value="" /> </component> @@ -49,12 +52,24 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="native-codec-jni.cpp" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/app/src/main/cpp/native-codec-jni.cpp"> + <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="569"> - <caret line="323" column="41" selection-start-line="323" selection-start-column="41" selection-end-line="323" selection-end-column="41" /> + <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> @@ -62,9 +77,51 @@ <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="171"> - <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" /> + <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="RemoteFuncClient.cpp" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="116"> + <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="RtspNativeCodecJNIClient.cpp" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="276"> + <caret line="560" column="1" selection-start-line="560" selection-start-column="1" selection-end-line="560" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="reader.h" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/libs/jsoncpp/include/json/reader.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="7859"> + <caret line="271" column="21" selection-start-line="271" selection-start-column="21" selection-end-line="271" selection-end-column="21" /> + <folding /> + </state> + </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> @@ -72,6 +129,16 @@ </leaf> </component> <component name="GradleLocalSettings"> + <option name="myGradleHomes"> + <map> + <entry key="$PROJECT_DIR$" value="C:\Users\ke.chen\.gradle\wrapper\dists\gradle-2.14.1-bin\2r579t5wehc7ew5kc8vfqezww\gradle-2.14.1" /> + </map> + </option> + <option name="myGradleVersions"> + <map> + <entry key="$PROJECT_DIR$" value="2.14.1" /> + </map> + </option> <option name="availableProjects"> <map> <entry> @@ -1372,7 +1439,9 @@ </option> <option name="modificationStamps"> <map> - <entry key="D:\workspace\proxy\VisitFace\RtspNativeCodec" value="4460291565101" /> + <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"> @@ -1400,9 +1469,9 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/2.2.3/9a45614f789d4aab624d2a61983263885f42b615/gradle-api-2.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/2.2.3/aee7a865f76af8f91963ce3f8b3f62070f6eeeb/compilerCommon-2.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/2.2.3/8c3829022a54acd042b5382a4a873ee2d64c29ee/compilerCommon-2.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" /> @@ -1431,11 +1500,8 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.analytics-library/shared/25.2.3/785426dac20cfe596e4cf36d01aad930ffdcb05c/shared-25.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.analytics-library/tracker/25.2.3/8cfb7881aaada4d0fe28c6e2ab56b7150ff8bf8a/tracker-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.analytics-library/tracker/25.2.3/c807f7b3d9aa3cee795ecac620d22c5ca7dd92e1/tracker-25.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/25.2.3/819e632d46915e2772112e07b779cc878cad4a88/lint-checks-25.2.3-sources.jar" /> @@ -1445,14 +1511,11 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/baseLibrary/2.2.3/212ef3aaf0963bf1985c999e1daa4e8c43825a3f/baseLibrary-2.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/baseLibrary/2.2.3/b4b51d1925cdfda98fd861230c1ecb5855500129/baseLibrary-2.2.3.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/25.2.3/14970b6fa3881b4622abdec9d64866a687261236/annotations-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/25.2.3/a9970f79003cbf4aaaf26a5590aca7066f209347/annotations-25.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/ST4/4.0.8/ST4-4.0.8.jar" /> @@ -1462,29 +1525,19 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/25.2.3/5afd79f645811a98c0519141cc13900c659091a8/dvlib-25.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/repository/25.2.3/b17b0ce2b6c0063ee4ebcd49becc4054cb6b7e98/repository-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/repository/25.2.3/179dee8115834f40bd9b39675da3a0273174c3ca/repository-25.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/25.2.3/1124bb83bc7f77eadf151691ece08c37ac682d3f/lint-api-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/25.2.3/fb7afa11dcda11d5bf0fcd3dcfec3e13ee921057/lint-api-25.2.3.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.external.com-intellij/uast/145.597.4/252000592582dea402a8ff20b70c325315c2129d/uast-145.597.4-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.external.com-intellij/uast/145.597.4/6b430796bdb6563146affb34fb840c64e8d1d3b1/uast-145.597.4.jar" /> @@ -1512,9 +1565,9 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/2.2.3/9a45614f789d4aab624d2a61983263885f42b615/gradle-api-2.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/2.2.3/aee7a865f76af8f91963ce3f8b3f62070f6eeeb/compilerCommon-2.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/2.2.3/8c3829022a54acd042b5382a4a873ee2d64c29ee/compilerCommon-2.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-commons/5.0.4/asm-commons-5.0.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946.jar" /> @@ -1543,11 +1596,8 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.analytics-library/shared/25.2.3/785426dac20cfe596e4cf36d01aad930ffdcb05c/shared-25.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.analytics-library/tracker/25.2.3/8cfb7881aaada4d0fe28c6e2ab56b7150ff8bf8a/tracker-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.analytics-library/tracker/25.2.3/c807f7b3d9aa3cee795ecac620d22c5ca7dd92e1/tracker-25.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/25.2.3/819e632d46915e2772112e07b779cc878cad4a88/lint-checks-25.2.3-sources.jar" /> @@ -1557,14 +1607,11 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/baseLibrary/2.2.3/212ef3aaf0963bf1985c999e1daa4e8c43825a3f/baseLibrary-2.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/baseLibrary/2.2.3/b4b51d1925cdfda98fd861230c1ecb5855500129/baseLibrary-2.2.3.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/25.2.3/14970b6fa3881b4622abdec9d64866a687261236/annotations-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/25.2.3/a9970f79003cbf4aaaf26a5590aca7066f209347/annotations-25.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/ST4/4.0.8/ST4-4.0.8.jar" /> @@ -1574,29 +1621,19 @@ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/25.2.3/5afd79f645811a98c0519141cc13900c659091a8/dvlib-25.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/repository/25.2.3/b17b0ce2b6c0063ee4ebcd49becc4054cb6b7e98/repository-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/repository/25.2.3/179dee8115834f40bd9b39675da3a0273174c3ca/repository-25.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/25.2.3/1124bb83bc7f77eadf151691ece08c37ac682d3f/lint-api-25.2.3-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/25.2.3/fb7afa11dcda11d5bf0fcd3dcfec3e13ee921057/lint-api-25.2.3.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.external.com-intellij/uast/145.597.4/252000592582dea402a8ff20b70c325315c2129d/uast-145.597.4-sources.jar" /> <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.external.com-intellij/uast/145.597.4/6b430796bdb6563146affb34fb840c64e8d1d3b1/uast-145.597.4.jar" /> @@ -1611,71 +1648,6 @@ <option name="name" value="app" /> <option name="projectBuildClasspath"> <list> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/ant-1.9.6.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/ant-launcher-1.9.6.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-base-services-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-base-services-groovy-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-cli-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-core-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-docs-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-installation-beacon-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-jvm-services-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-launcher-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-logging-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-messaging-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-model-core-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-model-groovy-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-native-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-open-api-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-process-services-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-resources-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-tooling-api-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-ui-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/gradle-wrapper-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/groovy-all-2.4.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-announce-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-antlr-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-build-comparison-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-build-init-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-code-quality-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-dependency-management-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-diagnostics-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-ear-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-ide-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-ide-native-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-ide-play-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-ivy-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-jacoco-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-javascript-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-jetty-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-language-groovy-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-language-java-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-language-jvm-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-language-native-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-language-scala-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-maven-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-osgi-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-platform-base-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-platform-jvm-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-platform-native-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-platform-play-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-plugin-development-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-plugin-use-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-plugins-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-publish-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-reporting-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-resources-http-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-resources-s3-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-resources-sftp-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-scala-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-signing-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-sonar-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-test-kit-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-testing-base-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-testing-jvm-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-testing-native-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/gradle-tooling-api-builders-2.14.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1/lib/plugins/ivy-2.2.0.jar" /> <option value="$PROJECT_DIR$/buildSrc/src/main/java" /> <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" /> </list> @@ -1692,14 +1664,82 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> + <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp" /> + <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" /> + <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" /> + <option value="$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_BlockGrouping.cpp" /> + <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> + <option value="$PROJECT_DIR$/app/src/main/cpp/cpu_sched_test.cpp" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.h" /> + <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_Split.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_GeneralProc.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PipeLine.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.h" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_InterProcessJoint.h" /> + <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" /> + <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecEncoder.cpp" /> + <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" /> + <option value="$PROJECT_DIR$/app/app.iml" /> + <option value="$PROJECT_DIR$/local.properties" /> + <option value="$PROJECT_DIR$/app/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/src/main/cpp/native-codec-jni.cpp" /> + <option value="$PROJECT_DIR$/app/libs/capnproto/include/capnp/common.h" /> </list> </option> </component> + <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" /> <component name="ProjectFrameBounds"> - <option name="width" value="1920" /> - <option name="height" value="1156" /> + <option name="x" value="-8" /> + <option name="y" value="-8" /> + <option name="width" value="1924" /> + <option name="height" value="1176" /> + </component> + <component name="ProjectInspectionProfilesVisibleTreeState"> + <entry key="Project Default"> + <profile-state> + <expanded-state> + <State> + <id /> + </State> + </expanded-state> + <selected-state> + <State> + <id>C/C++</id> + </State> + </selected-state> + </profile-state> + </entry> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> @@ -1727,9 +1767,6 @@ </navigator> <panes> <pane id="PackagesPane" /> - <pane id="ProjectPane" /> - <pane id="Scope" /> - <pane id="Scratches" /> <pane id="AndroidView"> <subPane> <PATH> @@ -1748,17 +1785,161 @@ <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.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> + <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> + <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> + <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" /> </panes> </component> <component name="PropertiesComponent"> - <property name="android.sdk.path" value="D:/adk" /> - <property name="settings.editor.selected.configurable" value="android.sdk-updates" /> - <property name="settings.editor.splitter.proportion" value="0.2" /> + <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" /> + <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$" /> + <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" /> </component> <component name="RunManager" selected="Android App.app"> + <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="singleModule" /> + </option> + <envs /> + <patterns /> + <method> + <option name="Make" enabled="false" /> + <option name="Android.Gradle.BeforeRunTask" enabled="true" /> + </method> + </configuration> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App"> <module name="" /> <option name="DEPLOY" value="true" /> @@ -1766,37 +1947,41 @@ <option name="PM_INSTALL_OPTIONS" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="MODE" value="default_activity" /> - <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="PREFERRED_AVD" value="" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> <option name="FORCE_STOP_RUNNING_APP" value="true" /> - <option name="DEBUGGER_TYPE" value="Auto" /> + <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="USE_LAST_SELECTED_DEVICE" value="false" /> <option name="PREFERRED_AVD" value="" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" /> <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="DEBUGGER_TYPE" value="Auto" /> <Auto> <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> <option name="WORKING_DIR" value="" /> <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> </Auto> <Hybrid> <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> <option name="WORKING_DIR" value="" /> <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> </Hybrid> <Java /> <Native> <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> <option name="WORKING_DIR" value="" /> <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> </Native> <Profilers> <option name="ENABLE_ADVANCED_PROFILING" value="true" /> - <option name="GAPID_ENABLED" value="false" /> - <option name="GAPID_DISABLE_PCS" value="false" /> <option name="SUPPORT_LIB_ENABLED" value="true" /> <option name="INSTRUMENTATION_ENABLED" value="true" /> </Profilers> @@ -1804,7 +1989,7 @@ <option name="ACTIVITY_CLASS" value="" /> <method /> </configuration> - <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> + <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests"> <module name="" /> <option name="TESTING_TYPE" value="0" /> <option name="INSTRUMENTATION_RUNNER_CLASS" value="" /> @@ -1812,37 +1997,41 @@ <option name="CLASS_NAME" value="" /> <option name="PACKAGE_NAME" value="" /> <option name="EXTRA_OPTIONS" value="" /> - <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="PREFERRED_AVD" value="" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> <option name="FORCE_STOP_RUNNING_APP" value="true" /> - <option name="DEBUGGER_TYPE" value="Auto" /> + <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="USE_LAST_SELECTED_DEVICE" value="false" /> <option name="PREFERRED_AVD" value="" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" /> <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="DEBUGGER_TYPE" value="Auto" /> <Auto> <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> <option name="WORKING_DIR" value="" /> <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> </Auto> <Hybrid> <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> <option name="WORKING_DIR" value="" /> <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> </Hybrid> <Java /> <Native> <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> <option name="WORKING_DIR" value="" /> <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> </Native> <Profilers> <option name="ENABLE_ADVANCED_PROFILING" value="true" /> - <option name="GAPID_ENABLED" value="false" /> - <option name="GAPID_DISABLE_PCS" value="false" /> <option name="SUPPORT_LIB_ENABLED" value="true" /> <option name="INSTRUMENTATION_ENABLED" value="true" /> </Profilers> @@ -1878,30 +2067,6 @@ <option name="vmOptions" /> </ExternalSystemSettings> <method /> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method> - <option name="Make" enabled="false" /> - <option name="Android.Gradle.BeforeRunTask" enabled="true" /> - </method> </configuration> <configuration default="true" type="JarApplication" factoryName="JAR Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> @@ -1988,13 +2153,66 @@ <listeners /> <method /> </configuration> - <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App"> + <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false"> <module name="app" /> <option name="DEPLOY" value="true" /> <option name="ARTIFACT_NAME" value="" /> <option name="PM_INSTALL_OPTIONS" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="MODE" value="default_activity" /> + <option name="PREFERRED_AVD" value="" /> + <option name="CLEAR_LOGCAT" value="false" /> + <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> + <option name="FORCE_STOP_RUNNING_APP" value="true" /> + <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" /> + <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="DEBUGGER_TYPE" value="Auto" /> + <Auto> + <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> + <option name="WORKING_DIR" value="" /> + <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> + </Auto> + <Hybrid> + <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> + <option name="WORKING_DIR" value="" /> + <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> + </Hybrid> + <Java /> + <Native> + <option name="USE_JAVA_AWARE_DEBUGGER" value="false" /> + <option name="SHOW_STATIC_VARS" value="true" /> + <option name="WORKING_DIR" value="" /> + <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" /> + <option name="SHOW_OPTIMIZED_WARNING" value="true" /> + </Native> + <Profilers> + <option name="ENABLE_ADVANCED_PROFILING" value="true" /> + <option name="SUPPORT_LIB_ENABLED" value="true" /> + <option name="INSTRUMENTATION_ENABLED" value="true" /> + </Profilers> + <option name="DEEP_LINK" value="" /> + <option name="ACTIVITY_CLASS" value="" /> + <method /> + </configuration> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="Android App.app" /> + </list> + <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> + <module name="" /> + <option name="TESTING_TYPE" value="0" /> + <option name="INSTRUMENTATION_RUNNER_CLASS" value="" /> + <option name="METHOD_NAME" value="" /> + <option name="CLASS_NAME" value="" /> + <option name="PACKAGE_NAME" value="" /> + <option name="EXTRA_OPTIONS" value="" /> <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="PREFERRED_AVD" value="" /> <option name="CLEAR_LOGCAT" value="false" /> @@ -2029,13 +2247,8 @@ <option name="SUPPORT_LIB_ENABLED" value="true" /> <option name="INSTRUMENTATION_ENABLED" value="true" /> </Profilers> - <option name="DEEP_LINK" value="" /> - <option name="ACTIVITY_CLASS" value="" /> <method /> </configuration> - <list size="1"> - <item index="0" class="java.lang.String" itemvalue="Android App.app" /> - </list> <configuration name="<template>" type="Applet" default="true" selected="false"> <option name="MAIN_CLASS_NAME" /> <option name="HTML_FILE_NAME" /> @@ -2053,42 +2266,86 @@ <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\RtspFace" /> - <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" /> + <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\Logger\src" /> - <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace\Logger\src" /> + <option name="myVcsRoot" value="E:\Documents\works\RtspFace" /> + <option name="myCopyRoot" value="E:\Documents\works\RtspFace" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="E:\Documents\works\RtspFace\CvUtil" /> + <option name="myCopyRoot" value="E:\Documents\works\RtspFace\CvUtil" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="E:\Documents\works\RtspFace\FFmpegRTSPServer" /> + <option name="myCopyRoot" value="E:\Documents\works\RtspFace\FFmpegRTSPServer" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <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="E:\Documents\works\RtspFace\Logger\src" /> + <option name="myCopyRoot" value="E:\Documents\works\RtspFace\Logger\src" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" /> + <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <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\RtspFace" /> - <option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" /> + <option name="myVcsRoot" value="E:\Documents\works\FaceServer" /> + <option name="myCopyRoot" value="E:\Documents\works\FaceServer" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="E:\Documents\works\RtspFace" /> + <option name="myCopyRoot" value="E:\Documents\works\RtspFace" /> + </SvnCopyRootSimple> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" /> + <option name="myCopyRoot" value="E:\Documents\works\VisitFace\RtspNativeCodec" /> </SvnCopyRootSimple> </list> </option> </component> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="03a9d3bc-227b-491c-ac6f-70f09fdb8dce" name="Default" comment="" /> - <created>1487555426582</created> + <changelist id="7ae7b537-c9d7-47f6-b809-98f2bf0296aa" name="Default" comment="" /> + <created>1490160066647</created> <option name="number" value="Default" /> <option name="presentableId" value="Default" /> - <updated>1487555426582</updated> + <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> @@ -2098,40 +2355,42 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="0" width="1920" height="1156" extended-state="0" /> + <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.32971373" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32971373" sideWeight="0.49358287" 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="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="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.32971373" sideWeight="0.50213903" order="7" side_tool="true" content_ui="tabs" /> - <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32971373" sideWeight="0.5" order="7" 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.32971373" sideWeight="0.49465242" order="7" 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="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="3" 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.32971373" sideWeight="0.49786097" order="7" 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="false" show_stripe_button="true" weight="0.32971373" sideWeight="0.5053476" order="7" side_tool="true" content_ui="tabs" /> - <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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24973261" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="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="3" side_tool="true" content_ui="tabs" /> - <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" /> + <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972468" sideWeight="0.45922747" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <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" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="Vcs.Log.UiProperties"> @@ -2145,12 +2404,209 @@ <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 /> + <breakpoint-manager> + <breakpoints> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp</url> + <line>146</line> + <option name="timeStamp" value="968" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp</url> + <line>309</line> + <option name="timeStamp" value="986" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> + <url>file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp</url> + <line>351</line> + <option name="timeStamp" value="987" /> + </line-breakpoint> + </breakpoints> + <option name="time" value="1139" /> + </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/app/src/main/cpp/native-codec-jni.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="329"> + <caret line="584" column="0" selection-start-line="584" selection-start-column="0" selection-end-line="584" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/kj/async.h"> + <provider selected="true" editor-type-id="text-editor"> + <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="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://D:/ProgramFiles/Android/sdk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/bits/stl_vector.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="329"> + <caret line="296" column="6" selection-start-line="296" selection-start-column="6" selection-end-line="296" selection-end-column="6" /> + </state> + </provider> + </entry> + <entry file="file://$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="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$/app/src/main/cpp/RemoteMethod.proto"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="87"> + <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" /> + </state> + </provider> + </entry> + <entry file="file://D:/ProgramFiles/Android/sdk/ndk-bundle/toolchains/aarch64-linux-android-4.9/prebuilt/windows-x86_64/lib/gcc/aarch64-linux-android/4.9.x/include/stddef.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="239"> + <caret line="211" column="22" selection-start-line="211" selection-start-column="22" selection-end-line="211" selection-end-column="22" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCacheForPLBG.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="8004"> + <caret line="292" column="0" selection-start-line="292" selection-start-column="0" selection-end-line="292" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="51"> + <caret line="370" column="0" selection-start-line="370" selection-start-column="0" selection-end-line="370" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="493"> + <caret line="77" column="14" selection-start-line="77" selection-start-column="14" selection-end-line="77" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="203"> + <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperClient.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="262"> + <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.cc"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="275"> + <caret line="82" column="6" selection-start-line="82" selection-start-column="6" selection-end-line="82" selection-end-column="6" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/rpc-twoparty.capnp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="236"> + <caret line="95" column="7" selection-start-line="95" selection-start-column="7" selection-end-line="95" selection-end-column="7" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/rpc.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1682"> + <caret line="58" column="24" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="24" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/libs/capnproto/include/capnp/rpc-prelude.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2871"> + <caret line="99" column="26" selection-start-line="99" selection-start-column="26" selection-end-line="99" selection-end-column="26" /> + </state> + </provider> + </entry> + <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" /> @@ -2158,15 +2614,22 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt"> + <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="171"> - <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" /> + <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$/app/src/main/cpp/CMakeLists.txt"> + <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" /> @@ -2174,62 +2637,148 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/cpp/native-codec-jni.cpp"> + <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="9310"> - <caret line="490" column="1" selection-start-line="490" selection-start-column="1" selection-end-line="490" selection-end-column="1" /> + <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="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/native-codec-jni.cpp"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapperServer.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <state relative-caret-position="464"> + <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/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/java/com/example/nativecodec/NativeCodec.java"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteFuncClient.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="4769"> - <caret line="292" column="24" selection-start-line="292" selection-start-column="24" selection-end-line="292" selection-end-column="24" /> + <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> - <entry file="file://D:/adk/ndk-bundle/platforms/android-21/arch-x86/usr/include/jni.h"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIServer.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="331"> - <caret line="75" column="24" selection-start-line="75" selection-start-column="24" selection-end-line="75" selection-end-column="24" /> + <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$/../../../JniHelpers/src/main/cpp/JniHelpersCommon.h"> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RemoteMethod.proto.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="730"> - <caret line="106" column="8" selection-start-line="106" selection-start-column="8" selection-end-line="106" selection-end-column="8" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="920"> - <caret line="292" column="24" selection-start-line="292" selection-start-column="24" selection-end-line="292" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/cpp/native-codec-jni.cpp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="569"> - <caret line="323" column="41" selection-start-line="323" selection-start-column="41" selection-end-line="323" selection-end-column="41" /> + <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="171"> - <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" /> + <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$/../../RtspFace/GraphicHelper.h"> + <provider selected="true" editor-type-id="text-editor"> + <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://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNIClient.cpp"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="276"> + <caret line="560" column="1" selection-start-line="560" selection-start-column="1" selection-end-line="560" selection-end-column="1" /> <folding /> </state> </provider> -- Gitblit v1.8.0