From 91e551962e2e61faf55e0e733f3e06fd2b413cbd Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 04 五月 2017 16:45:54 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/.idea/workspace.xml | 1023 ++++++++++++++++++++++----------------------------------
1 files changed, 405 insertions(+), 618 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index 37eba9f..edf5684 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -6,7 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
+ <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="791a1ca7-972c-421c-af50-d8f452f0c589" name="Default" comment="">
@@ -14,6 +14,11 @@
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_proto.h" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_server.cpp" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/ev_server.h" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/face_daemon_proto.h" afterPath="" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/../../RtspFace/main_face_daemon.cpp" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" />
@@ -21,27 +26,34 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/FFmpegH264Source.h" afterPath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/FFmpegH264Source.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveRTSPServer.h" afterPath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveRTSPServer.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.h" afterPath="$PROJECT_DIR$/../../RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" afterPath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
<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_RTSPClient.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_RTSPServer.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_RTSPServer.cpp" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceDetect.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceDetect.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PipeLine.h" afterPath="$PROJECT_DIR$/../../RtspFace/PipeLine.h" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" afterPath="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/TextureRender.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/TextureRender.java" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -73,11 +85,54 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
+ <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="162">
- <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+ <state relative-caret-position="-72">
+ <caret line="122" column="59" selection-start-line="122" selection-start-column="59" selection-end-line="122" selection-end-column="59" />
+ <folding>
+ <element signature="e#135#173#0" expanded="true" />
+ <element signature="e#4778#4836#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PL_SensetimeFaceTrack.cpp" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="898">
+ <caret line="253" column="54" selection-start-line="253" selection-start-column="54" selection-end-line="253" selection-end-column="54" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PL_SensetimeFaceTrack.h" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-209">
+ <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PL_AndroidMediaCodecDecoder.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="346">
+ <caret line="286" column="49" selection-start-line="286" selection-start-column="49" selection-end-line="286" selection-end-column="49" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="CameraWrapper.cpp" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="266">
+ <caret line="49" column="22" selection-start-line="49" selection-start-column="22" selection-end-line="49" selection-end-column="22" />
<folding />
</state>
</provider>
@@ -86,67 +141,32 @@
<file leaf-file-name="NativeCodec.java" pinned="false" current-in-tab="false">
<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="359">
- <caret line="63" column="47" selection-start-line="63" selection-start-column="47" selection-end-line="63" selection-end-column="47" />
+ <state relative-caret-position="243">
+ <caret line="210" column="120" selection-start-line="210" selection-start-column="120" selection-end-line="210" selection-end-column="120" />
<folding>
- <element signature="e#8238#8488#0" expanded="true" />
- <element signature="e#8487#8488#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RtspNativeCodecJNI.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
+ <file leaf-file-name="OutputSurface.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="247">
- <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="43" column="19" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
+ <state relative-caret-position="628">
+ <caret line="268" column="28" selection-start-line="268" selection-start-column="18" selection-end-line="268" selection-end-column="28" />
<folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#135#173#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="testRTSPClient.hpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp">
+ <file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="305" column="38" selection-start-line="305" selection-start-column="38" selection-end-line="305" selection-end-column="38" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CameraWrapper.h" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="568">
- <caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="26" />
- <folding>
- <element signature="e#131#153#0" expanded="true" />
- <element signature="e#344#382#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="FaceCache.cpp" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="553">
- <caret line="168" column="35" selection-start-line="168" selection-start-column="35" selection-end-line="168" selection-end-column="35" />
+ <state relative-caret-position="685">
+ <caret line="70" column="51" selection-start-line="70" selection-start-column="51" selection-end-line="70" selection-end-column="51" />
<folding />
</state>
</provider>
@@ -1845,28 +1865,38 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/MyGLSurfaceView.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/../../RtspFace/PipeLine.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
- <option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
<option value="$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp" />
<option value="$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp" />
<option value="$PROJECT_DIR$/app/build.gradle" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
- <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
<option value="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" />
- <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
+ <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgPub.java" />
+ <option value="$PROJECT_DIR$/app/src/main/res/layout/main.xml" />
+ <option value="$PROJECT_DIR$/../../RtspFace/MediaHelper.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/PbFaceList" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" />
<option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
+ <option value="D:/Android/adk/platforms/android-21/android.jar!/javax/microedition/khronos/egl/EGL10.class" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/TextureRender.java" />
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" />
+ <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
+ <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
</list>
</option>
</component>
@@ -1874,7 +1904,7 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
- <option name="width" value="1924" />
+ <option name="width" value="1932" />
<option name="height" value="1176" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -1902,9 +1932,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="AndroidView" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -1985,126 +2014,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="layout" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="nativecodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspFaceNative.java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="cpp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -2118,20 +2027,6 @@
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -2167,126 +2062,6 @@
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="res" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="layout" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="nativecodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspNativeCodec" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="app" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="util" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="RtspFaceNative.java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
@@ -2317,7 +2092,8 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
+ <pane id="PackagesPane" />
+ <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -2328,7 +2104,12 @@
<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="015d2109845c1607" />
+ <property name="device.picker.selection" value="30bffbe57d22" />
+ </component>
+ <component name="RecentsManager">
+ <key name="CreateClassDialog.RecentsKey">
+ <recent name="com.example.nativecodec" />
+ </key>
</component>
<component name="RunManager" selected="Android App.app">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
@@ -2655,6 +2436,10 @@
<option name="myMappingRoots">
<list>
<SvnCopyRootSimple>
+ <option name="myVcsRoot" value="D:\workspace\proxy\FaceServer" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\FaceServer" />
+ </SvnCopyRootSimple>
+ <SvnCopyRootSimple>
<option name="myVcsRoot" value="D:\workspace\proxy\RtspFace" />
<option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" />
</SvnCopyRootSimple>
@@ -2678,6 +2463,10 @@
</option>
<option name="myMoreRealMappingRoots">
<list>
+ <SvnCopyRootSimple>
+ <option name="myVcsRoot" value="D:\workspace\proxy\FaceServer" />
+ <option name="myCopyRoot" value="D:\workspace\proxy\FaceServer" />
+ </SvnCopyRootSimple>
<SvnCopyRootSimple>
<option name="myVcsRoot" value="D:\workspace\proxy\RtspFace" />
<option name="myCopyRoot" value="D:\workspace\proxy\RtspFace" />
@@ -2709,8 +2498,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1924" height="1176" extended-state="0" />
- <editor active="false" />
+ <frame x="-8" y="-8" width="1932" height="1176" extended-state="0" />
+ <editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28318584" sideWeight="0.36748928" order="7" side_tool="false" content_ui="tabs" />
@@ -2718,31 +2507,32 @@
<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.29301867" sideWeight="0.33530042" 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.45427728" sideWeight="0.6732833" order="7" side_tool="false" 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.2861357" sideWeight="0.65450644" order="7" 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.32940018" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4892704" order="7" 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.32940018" sideWeight="0.4978678" order="7" 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.29301867" sideWeight="0.35139486" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25107297" 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="false" show_stripe_button="true" weight="0.27630284" sideWeight="0.34549356" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24946581" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29301867" sideWeight="0.64860517" 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.32959402" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
+ <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21828909" sideWeight="0.64860517" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<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="3" 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="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="3" 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.24946581" 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">
@@ -2758,157 +2548,79 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="536" />
+ <breakpoints>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java</url>
+ <line>270</line>
+ <properties />
+ <option name="timeStamp" value="696" />
+ </line-breakpoint>
+ </breakpoints>
+ <option name="time" value="721" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/local.properties">
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaFormat.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
+ <state relative-caret-position="380">
+ <caret line="85" column="48" selection-start-line="85" selection-start-column="19" selection-end-line="85" selection-end-column="48" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/README.md">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state relative-caret-position="652">
+ <caret line="37" column="35" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="35" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/RtspNativeCodec.iml">
+ <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/RTSPClient.hh">
<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="230">
+ <caret line="38" column="6" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp">
<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="6194">
+ <caret line="326" column="0" selection-start-line="326" selection-start-column="0" selection-end-line="326" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/native-codec.iml">
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/scale.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="208">
+ <caret line="54" column="4" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaCodec.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="646">
- <caret line="44" column="39" selection-start-line="44" selection-start-column="39" selection-end-line="44" selection-end-column="39" />
+ <state relative-caret-position="1691">
+ <caret line="89" column="14" selection-start-line="89" selection-start-column="14" selection-end-line="89" selection-end-column="14" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/app.iml">
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/android/native_window.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>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/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="190">
- <caret line="1362" column="9" selection-start-line="1362" selection-start-column="9" selection-end-line="1362" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/st_face/include/cv_face.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="437">
- <caret line="110" column="46" selection-start-line="110" selection-start-column="46" selection-end-line="110" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.cc">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="963" column="0" selection-start-line="963" selection-start-column="0" selection-end-line="963" selection-end-column="0" />
+ <state relative-caret-position="798">
+ <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/message_lite.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="265">
- <caret line="222" column="7" selection-start-line="222" selection-start-column="7" selection-end-line="222" selection-end-column="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.hpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PipeLine.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="57">
- <caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/sources/android-22/android/util/Log.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-626">
- <caret line="108" column="22" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/stubs/logging.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="198" column="8" selection-start-line="198" selection-start-column="8" selection-end-line="198" selection-end-column="8" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/opencv/include/opencv2/core/mat.inl.hpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="247">
- <caret line="814" column="0" selection-start-line="814" selection-start-column="0" selection-end-line="814" selection-end-column="0" />
+ <state relative-caret-position="246">
+ <caret line="173" column="48" selection-start-line="173" selection-start-column="44" selection-end-line="173" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/libs/protobuf/include/google/protobuf/repeated_field.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="513">
- <caret line="1447" column="0" selection-start-line="1447" selection-start-column="0" selection-end-line="1447" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="12388">
- <caret line="652" column="0" selection-start-line="652" selection-start-column="0" selection-end-line="652" selection-end-column="0" />
- </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="570">
- <caret line="31" column="62" selection-start-line="31" selection-start-column="26" selection-end-line="31" selection-end-column="62" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="418">
- <caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/settings.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="-558">
+ <caret line="745" column="6" selection-start-line="745" selection-start-column="6" selection-end-line="745" selection-end-column="6" />
</state>
</provider>
</entry>
@@ -2920,119 +2632,84 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java" />
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/unistd.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="587" column="0" selection-start-line="587" selection-start-column="0" selection-end-line="587" 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="230">
- <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="347">
- <caret line="62" column="19" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="344">
- <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="260">
- <caret line="112" column="0" selection-start-line="112" selection-start-column="0" selection-end-line="116" selection-end-column="38" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/H264VideoRTPSource.hh">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/Base64.hh">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="456">
- <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
- <folding>
- <element signature="e#964#985#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_RTSPClient.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="100">
- <caret line="212" column="59" selection-start-line="212" selection-start-column="59" selection-end-line="212" selection-end-column="59" />
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaCodec.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="969">
- <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" 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="133">
- <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1140">
- <caret line="60" column="68" selection-start-line="60" selection-start-column="68" selection-end-line="60" selection-end-column="68" />
- <folding>
- <element signature="e#0#26#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/android/native_window.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="608">
- <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
- <provider editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/Logger/src/logger.hpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="272">
+ <caret line="28" column="6" selection-start-line="28" selection-start-column="2" selection-end-line="28" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="41" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/MyGLSurfaceView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="208">
+ <caret line="73" column="6" selection-start-line="73" selection-start-column="6" selection-end-line="73" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/java/lang/Override.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+ </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="114">
+ <caret line="6" column="22" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="22" />
+ <folding />
+ </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="114">
+ <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
+ </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="614">
+ <caret line="38" column="7" selection-start-line="38" selection-start-column="7" selection-end-line="38" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="207">
+ <caret line="189" column="28" selection-start-line="189" selection-start-column="22" selection-end-line="189" selection-end-column="28" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/opencv/include/opencv2/core/hal/interface.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="250">
+ <caret line="84" column="15" selection-start-line="84" selection-start-column="8" selection-end-line="84" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.h" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList" />
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/main.xml">
+ <provider editor-type-id="text-editor">
+ <state relative-caret-position="874">
+ <caret line="46" column="42" selection-start-line="46" selection-start-column="29" selection-end-line="46" selection-end-column="42" />
<folding />
</state>
</provider>
@@ -3040,119 +2717,229 @@
<state />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidSurfaceViewRender.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="779">
- <caret line="212" column="6" selection-start-line="212" selection-start-column="6" selection-end-line="212" selection-end-column="6" />
- <folding>
- <element signature="e#0#40#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/media/NdkMediaFormat.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="380">
- <caret line="85" column="48" selection-start-line="85" selection-start-column="19" selection-end-line="85" selection-end-column="48" />
+ <state relative-caret-position="285">
+ <caret line="33" column="67" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.cpp">
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_argb.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="652">
- <caret line="37" column="35" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="35" />
- <folding>
- <element signature="e#50#83#0" expanded="false" />
- </folding>
+ <state relative-caret-position="844">
+ <caret line="296" column="33" selection-start-line="296" selection-start-column="29" selection-end-line="296" selection-end-column="33" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="197">
- <caret line="258" column="56" selection-start-line="258" selection-start-column="56" selection-end-line="258" selection-end-column="56" />
- <folding />
+ <state relative-caret-position="248">
+ <caret line="112" column="14" selection-start-line="112" selection-start-column="4" selection-end-line="112" selection-end-column="14" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <entry file="file://$PROJECT_DIR$/../../FaceServer/PbFaceList.pb.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="233">
+ <caret line="52" column="2" selection-start-line="52" selection-start-column="2" selection-end-line="52" selection-end-column="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from_argb.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
- <caret line="263" column="48" selection-start-line="263" selection-start-column="48" selection-end-line="263" selection-end-column="48" />
+ <caret line="141" column="14" selection-start-line="141" selection-start-column="8" selection-end-line="141" selection-end-column="14" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/javax/microedition/khronos/egl/EGL10.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="133">
+ <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/android/view/Surface.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="114">
+ <caret line="14" column="20" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="20" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="247">
+ <caret line="727" column="0" selection-start-line="727" selection-start-column="0" selection-end-line="727" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="308">
+ <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/libs/live555/include/liveMedia/RTSPClient.hh">
+ <entry file="jar://D:/Android/adk/platforms/android-21/android.jar!/android/graphics/SurfaceTexture.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="38" column="6" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
+ <state relative-caret-position="205">
+ <caret line="30" column="16" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="300">
+ <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="467">
+ <caret line="134" column="36" selection-start-line="134" selection-start-column="36" selection-end-line="134" selection-end-column="36" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="592">
+ <caret line="42" column="21" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="21" />
<folding />
</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="553">
- <caret line="168" column="35" selection-start-line="168" selection-start-column="35" selection-end-line="168" selection-end-column="35" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="568">
- <caret line="36" column="26" selection-start-line="36" selection-start-column="26" selection-end-line="36" selection-end-column="26" />
+ <state relative-caret-position="1353">
+ <caret line="468" column="0" selection-start-line="468" selection-start-column="0" selection-end-line="468" selection-end-column="0" />
<folding>
- <element signature="e#131#153#0" expanded="true" />
- <element signature="e#344#382#0" expanded="true" />
+ <element signature="e#0#22#0" expanded="false" />
+ <element signature="e#7893#10363#0" expanded="false" />
+ <element signature="e#10389#12771#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="247">
- <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
+ <state relative-caret-position="38">
+ <caret line="2" column="45" selection-start-line="2" selection-start-column="45" selection-end-line="2" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="305" column="38" selection-start-line="305" selection-start-column="38" selection-end-line="305" selection-end-column="38" />
+ <state relative-caret-position="114">
+ <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/TextureRender.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="43" column="19" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
+ <state relative-caret-position="299">
+ <caret line="74" column="16" selection-start-line="74" selection-start-column="16" selection-end-line="74" selection-end-column="64" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="685">
+ <caret line="70" column="51" selection-start-line="70" selection-start-column="51" selection-end-line="70" selection-end-column="51" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="346">
+ <caret line="286" column="49" selection-start-line="286" selection-start-column="49" selection-end-line="286" selection-end-column="49" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="266">
+ <caret line="49" column="22" selection-start-line="49" selection-start-column="22" selection-end-line="49" selection-end-column="22" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="628">
+ <caret line="268" column="28" selection-start-line="268" selection-start-column="18" selection-end-line="268" selection-end-column="28" />
<folding>
- <element signature="e#0#31#0" expanded="true" />
- <element signature="e#135#173#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="359">
- <caret line="63" column="47" selection-start-line="63" selection-start-column="47" selection-end-line="63" selection-end-column="47" />
+ <state relative-caret-position="243">
+ <caret line="210" column="120" selection-start-line="210" selection-start-column="120" selection-end-line="210" selection-end-column="120" />
<folding>
- <element signature="e#8238#8488#0" expanded="true" />
- <element signature="e#8487#8488#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java">
+ <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="162">
- <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+ <state relative-caret-position="-72">
+ <caret line="122" column="59" selection-start-line="122" selection-start-column="59" selection-end-line="122" selection-end-column="59" />
+ <folding>
+ <element signature="e#135#173#0" expanded="true" />
+ <element signature="e#4778#4836#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/st_face/include/cv_common.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="219">
+ <caret line="26" column="8" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/app/libs/st_face/include/cv_face.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="219">
+ <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-209">
+ <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.h">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="469">
+ <caret line="54" column="28" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="898">
+ <caret line="253" column="54" selection-start-line="253" selection-start-column="54" selection-end-line="253" selection-end-column="54" />
<folding />
</state>
</provider>
--
Gitblit v1.8.0