houxiao
2017-05-04 21b675418bc1c6ff3620483f3cd103fa0234fe26
optimize

git-svn-id: http://192.168.1.226/svn/proxy@597 454eff88-639b-444f-9e54-f578c98de674
16个文件已修改
832 ■■■■■ 已修改文件
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.idea/workspace.xml 643 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/app.iml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/OutputSurface.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/TextureRender.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin
Binary files differ
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin
Binary files differ
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin
Binary files differ
VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock
Binary files differ
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
Binary files differ
VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
Binary files differ
VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -14,8 +14,6 @@
      <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/OutputSurface.java" />
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/TextureRender.java" />
      <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="" />
@@ -25,11 +23,9 @@
      <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" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin" />
      <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$/../../FaceServer/STFaceCache.cpp" afterPath="$PROJECT_DIR$/../../FaceServer/STFaceCache.cpp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../FaceServer/sample_face_search.cpp" afterPath="$PROJECT_DIR$/../../FaceServer/sample_face_search.cpp" />
      <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" />
@@ -50,14 +46,14 @@
      <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/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/CMakeOutput.log" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/CMakeOutput.log" />
      <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/CameraWrapper.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" />
      <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/native-codec-jni.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/native-codec-jni.cpp" />
      <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" />
@@ -89,11 +85,44 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file leaf-file-name="RtspNativeCodecJNI.cpp" pinned="false" current-in-tab="true">
      <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="-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="149" column="60" selection-start-line="149" selection-start-column="60" selection-end-line="149" selection-end-column="60" />
              <caret line="286" column="49" selection-start-line="286" selection-start-column="49" selection-end-line="286" selection-end-column="49" />
              <folding />
            </state>
          </provider>
@@ -102,8 +131,8 @@
      <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="1577">
              <caret line="139" column="51" selection-start-line="139" selection-start-column="51" selection-end-line="139" selection-end-column="51" />
            <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>
@@ -112,8 +141,8 @@
      <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="333">
              <caret line="295" column="87" selection-start-line="295" selection-start-column="87" selection-end-line="295" selection-end-column="87" />
            <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="imports" expanded="true" />
              </folding>
@@ -124,38 +153,11 @@
      <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="475">
              <caret line="232" column="33" selection-start-line="232" selection-start-column="33" selection-end-line="232" selection-end-column="33" />
            <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="imports" expanded="true" />
                <element signature="e#3299#3300#0" expanded="true" />
                <element signature="e#3322#3323#0" expanded="true" />
                <element signature="e#8675#8676#0" expanded="true" />
                <element signature="e#8706#8707#0" expanded="true" />
                <element signature="e#10198#10199#0" expanded="true" />
                <element signature="e#10255#10256#0" expanded="true" />
              </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="138">
              <caret line="264" column="59" selection-start-line="264" selection-start-column="59" selection-end-line="264" selection-end-column="59" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="DebugNetwork.h" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h">
          <provider selected="true" editor-type-id="text-editor">
            <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>
@@ -163,7 +165,7 @@
      <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="788">
            <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>
@@ -1877,7 +1879,6 @@
        <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$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
        <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" />
@@ -1885,16 +1886,17 @@
        <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/java/com/example/nativecodec/OutputSurface.java" />
        <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/TextureRender.java" />
        <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/CMakeLists.txt" />
        <option value="$PROJECT_DIR$/app/src/main/cpp/DebugNetwork.h" />
        <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" />
        <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" />
      </list>
    </option>
  </component>
@@ -1932,8 +1934,6 @@
    <panes>
      <pane id="AndroidView" />
      <pane id="Scope" />
      <pane id="Scratches" />
      <pane id="PackagesPane" />
      <pane id="ProjectPane">
        <subPane>
          <PATH>
@@ -2014,118 +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>
          <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>
@@ -2136,24 +2024,6 @@
              <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="build" />
              <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>
@@ -2191,118 +2061,6 @@
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="main" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
            </PATH_ELEMENT>
          </PATH>
          <PATH>
            <PATH_ELEMENT>
              <option name="myItemId" value="RtspNativeCodec" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="app" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="app" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="src" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="main" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="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>
@@ -2329,29 +2087,13 @@
            </PATH_ELEMENT>
            <PATH_ELEMENT>
              <option name="myItemId" value="cpp" />
              <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="build" />
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
            </PATH_ELEMENT>
          </PATH>
        </subPane>
      </pane>
      <pane id="PackagesPane" />
      <pane id="Scratches" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -2362,7 +2104,7 @@
    <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">
@@ -2756,7 +2498,7 @@
    </todo-panel>
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1932" height="1176" extended-state="1" />
    <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" />
@@ -2766,7 +2508,6 @@
      <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.2861357" sideWeight="0.65450644" order="7" 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="4" 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" />
@@ -2774,23 +2515,24 @@
      <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.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="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" />
      <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" 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.23303835" 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&#9;" 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&#9;" 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="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">
@@ -2806,25 +2548,19 @@
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <option name="time" value="694" />
      <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$/../../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://$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://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">
@@ -2943,9 +2679,6 @@
      <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" />
          <folding>
            <element signature="e#49#70#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
@@ -2953,7 +2686,6 @@
      <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -2969,67 +2701,11 @@
      <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" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/../../RtspFace/MediaHelper.h">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="285">
          <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
          <folding>
            <element signature="e#51#70#0" expanded="false" />
            <element signature="e#910#922#0" expanded="false" />
          </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="171">
          <caret line="44" column="84" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
          <folding>
            <marker date="1493268191849" expanded="true" signature="127:178" ph="{...}" />
            <marker date="1493268191849" expanded="true" signature="197:404" ph="{...}" />
            <marker date="1493268191849" expanded="true" signature="435:678" ph="{...}" />
            <marker date="1493268191849" expanded="true" signature="770:1384" ph="{...}" />
          </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="257">
          <caret line="226" column="13" selection-start-line="226" selection-start-column="13" selection-end-line="226" selection-end-column="13" />
          <folding>
            <element signature="e#0#34#0" expanded="false" />
            <marker date="1493372102361" expanded="true" signature="675:679" ph="{...}" />
            <marker date="1493372102361" expanded="true" signature="718:722" ph="{...}" />
            <marker date="1493372102361" expanded="true" signature="740:1003" ph="{...}" />
            <marker date="1493372102361" expanded="true" signature="1053:1091" ph="{...}" />
            <marker date="1493372102361" expanded="true" signature="1187:1190" ph="{...}" />
            <marker date="1493372102361" expanded="true" signature="1240:1314" ph="{...}" />
            <marker date="1493372102361" expanded="true" signature="3084:3268" ph="{...}" />
          </folding>
        </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="247">
          <caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="399">
          <caret line="21" column="33" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" />
          <folding />
        </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">
@@ -3053,7 +2729,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3061,7 +2736,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3069,7 +2743,6 @@
      <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3077,7 +2750,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="532">
          <caret line="141" column="14" selection-start-line="141" selection-start-column="8" selection-end-line="141" selection-end-column="14" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3085,7 +2757,6 @@
      <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3093,7 +2764,6 @@
      <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3101,7 +2771,6 @@
      <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" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3117,22 +2786,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <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" />
          <folding>
            <element signature="e#863#864#0" expanded="true" />
            <element signature="e#914#915#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <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="95">
          <caret line="32" column="50" selection-start-line="32" selection-start-column="50" selection-end-line="32" selection-end-column="50" />
          <folding>
            <element signature="imports" expanded="true" />
            <element signature="e#3379#3380#0" expanded="true" />
            <element signature="e#3412#3413#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
@@ -3144,53 +2797,10 @@
        </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="475">
          <caret line="232" column="33" selection-start-line="232" selection-start-column="33" selection-end-line="232" selection-end-column="33" />
          <folding>
            <element signature="imports" expanded="true" />
            <element signature="e#3299#3300#0" expanded="true" />
            <element signature="e#3322#3323#0" expanded="true" />
            <element signature="e#8675#8676#0" expanded="true" />
            <element signature="e#8706#8707#0" expanded="true" />
            <element signature="e#10198#10199#0" expanded="true" />
            <element signature="e#10255#10256#0" expanded="true" />
          </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" />
          <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="333">
          <caret line="295" column="87" selection-start-line="295" selection-start-column="87" selection-end-line="295" selection-end-column="87" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1577">
          <caret line="139" column="51" selection-start-line="139" selection-start-column="51" selection-end-line="139" 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="138">
          <caret line="264" column="59" selection-start-line="264" selection-start-column="59" selection-end-line="264" selection-end-column="59" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -3214,10 +2824,10 @@
        </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/CMakeLists.txt">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="788">
          <caret line="70" column="51" selection-start-line="70" selection-start-column="51" selection-end-line="70" selection-end-column="51" />
        <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>
@@ -3231,18 +2841,105 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
    <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="38">
          <caret line="2" column="45" selection-start-line="2" selection-start-column="45" selection-end-line="2" selection-end-column="45" />
        <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="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="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="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="346">
          <caret line="149" column="60" selection-start-line="149" selection-start-column="60" selection-end-line="149" selection-end-column="60" />
        <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>
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps
Binary files differ
VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log
@@ -1,90 +1,64 @@
# ninja log v5
29    973    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
2091    3072    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
59    999    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
999    3112    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
5    848    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
1834    3113    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
38    1262    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
3948    4768    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
20    1581    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
1581    3049    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
973    3948    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
1262    1834    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
45    3057    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
848    2091    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
17    1245    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
530    1328    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
25    1342    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
545    1683    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
5    1990    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
1245    2184    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
1328    2324    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
1990    2474    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
1683    2488    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
30    2658    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
2184    3010    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
2324    3617    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1342    3988    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
3988    4915    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    779    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
17    809    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
23    843    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
37    1237    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
45    1433    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
779    1515    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
844    1950    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
809    1969    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
28    2166    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1950    2207    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
1515    2256    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
1433    2859    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1238    3620    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
3620    4066    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
17    803    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
32    861    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
26    887    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
50    1076    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
37    1422    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
803    1545    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
861    1604    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
1423    1899    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
887    1961    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
4    2257    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1545    2355    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
1076    2638    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1604    3878    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
3879    5160    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
14    818    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
28    833    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
56    867    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
4    1002    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
37    1593    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
867    1765    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
818    1828    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
1593    1938    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
1002    1983    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
20    2102    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1828    2280    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
833    2355    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1765    3823    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
3823    4245    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    1281    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1281    1710    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    399    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
15    558    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
559    1013    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    1281    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1281    1705    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    1327    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1327    1746    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
3    1267    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1268    1677    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
27    966    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
22    1006    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
34    1101    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
4    1205    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
966    1659    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
16    1774    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
46    2566    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
2566    2986    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
15    747    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
0    767    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
38    781    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
11    944    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
33    1469    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
781    1565    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
767    1729    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
944    1977    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
20    2101    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1729    2107    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
1565    2194    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
748    2290    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1469    3627    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
3628    4072    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
80    1153    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
140    1169    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
5    1183    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
1153    1670    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
158    1694    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
1183    1889    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
181    1904    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
1169    2696    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
1694    2928    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
126    2938    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1904    2944    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
1889    3495    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1670    4211    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
4211    4642    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
5    712    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
18    775    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
4    613    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
613    1050    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
6    640    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
640    1046    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    710    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
710    1128    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
5    633    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
17    666    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
666    1069    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
3    426    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
426    863    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    545    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
545    960    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    535    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
535    949    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
4    2424    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
2424    2852    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
6    2715    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
2715    3205    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
21    739    0    CMakeFiles/rtspface.dir/DebugNetwork.cpp.o    6912857d2f0b093c
27    789    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o    2321d0df350e0c14
32    823    0    CMakeFiles/rtspface.dir/CameraWrapper.cpp.o    8fa3c5046aba132e
4    1156    0    CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o    1b670d247e3c3013
16    1526    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o    a0c3298bf2f1fdd3
823    1706    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o    4ca01ebe2ad8ddc5
789    1739    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o    eb13258a52b8c22e
1526    2104    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/proto_hton_ntoh.cpp.o    e47d510343935308
39    2308    0    CMakeFiles/rtspface.dir/FaceCache.cpp.o    8baf55dae28060f7
1156    2381    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o    1b65b282f06a9946
739    2466    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/FaceServer/PbFaceList.pb.cc.o    920851f8d2524120
1706    2577    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o    7fc9b5e578c500bb
1739    3923    0    CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o    52c3b223cc5b5cc6
3923    4349    0    D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so    1504fd8339e50e42
VisitFace/RtspNativeCodec/app/app.iml
@@ -96,15 +96,20 @@
      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
#Fri Apr 28 17:11:47 CST 2017
#Thu May 04 11:59:26 CST 2017
VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
#Fri Apr 28 17:11:47 CST 2017
#Thu May 04 11:59:26 CST 2017
D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi\\ic_launcher.png
D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi\\ic_launcher.png
D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi\\ic_launcher.png
VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp
@@ -58,7 +58,7 @@
    env->ReleaseStringUTFChars(ipaddr, utf8);
}
void createHiddenSurface(JNIEnv *env, int cameraIdx)
static void createHiddenSurface(JNIEnv *env, int cameraIdx)
{
    CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
@@ -70,10 +70,16 @@
    jclass jcOutputSurface = env->FindClass("com/example/nativecodec/OutputSurface");
    jmethodID jmOutputSurface_ctor = env->GetMethodID(jcOutputSurface, "<init>", "(II)V");
    jmethodID jmOutputSurface_getSurface = env->GetMethodID(jcOutputSurface, "getSurface", "()Landroid/view/Surface;");
    jmethodID jmOutputSurface_readPixels = env->GetMethodID(jcOutputSurface, "readPixels", "()Ljava/nio/Buffer;");
    jobject jobjOutputSurface = env->NewObject(jcOutputSurface , jmOutputSurface_ctor, 1920, 1088);
    jobject jobjSurface = env->CallObjectMethod(jobjOutputSurface, jmOutputSurface_getSurface);
    cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, jobjSurface);
}
void readPixels(uint8_t* buf, size_t& maxSize)
{
}
// set the surface
@@ -122,8 +128,8 @@
        cameraWrapper.amcdConfig.ak_mime = "video/avc";
        cameraWrapper.amcdConfig.ak_width = 640;
        cameraWrapper.amcdConfig.ak_height = 480;
        cameraWrapper.amcdConfig.windowSurfaceDecode = nullptr; //cameraWrapper.windowDecode;
        cameraWrapper.amcdConfig.windowSurfaceRender = nullptr;
        cameraWrapper.amcdConfig.windowSurfaceDecode = cameraWrapper.windowDecode; //cameraWrapper.windowDecode;
        cameraWrapper.amcdConfig.windowSurfaceRender = nullptr;//cameraWrapper.windowRender;
        cameraWrapper.amcdConfig.releaseOutputBuffIdx = true;
        cameraWrapper.amcdConfig.releaseOutputBuffIdxInPay = false;
        cameraWrapper.amcdConfig.generateDecodedDataPerFrame = 1;
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
@@ -76,7 +76,7 @@
        ThisActivity = this;
        RtspFaceNative.init();
        RtspFaceNative.setLocalIP("192.168.1.10");
        RtspFaceNative.setLocalIP("192.168.1.106");
        mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/OutputSurface.java
@@ -22,6 +22,8 @@
import android.opengl.Matrix;
import android.util.Log;
import android.view.Surface;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
@@ -263,4 +265,11 @@
            throw new RuntimeException("EGL error encountered (see log)");
        }
    }
    public Buffer readPixels()
    {
        Buffer buf = ByteBuffer.allocateDirect( 640 * 480 * 4);
        mTextureRender.readPixels(buf);
        return buf;
    }
}
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/TextureRender.java
@@ -14,6 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
@@ -210,4 +211,8 @@
            throw new RuntimeException(op + ": glError " + error);
        }
    }
    public void readPixels(Buffer buf)
    {
        GLES20.glReadPixels(0, 0, 640, 480, GLES20.GL_RGB, GLES20.GL_UNSIGNED_BYTE, buf);
    }
}