From d7dec3b8ce547916dce7e896dfc4df5189f36066 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 23 三月 2017 16:29:13 +0800
Subject: [PATCH] add library
---
VisitFace/RtspNativeCodec/.idea/workspace.xml | 73 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 29 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml
index ba8aef1..e698e84 100644
--- a/VisitFace/RtspNativeCodec/.idea/workspace.xml
+++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml
@@ -10,6 +10,32 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="791a1ca7-972c-421c-af50-d8f452f0c589" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/lib" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/lib/armeabi-v7a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/basic_types.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/compare.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/compare_row.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_argb.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from_argb.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/cpu_id.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/mjpeg_decoder.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/planar_functions.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/rotate.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/rotate_argb.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/rotate_row.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/row.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/scale.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/scale_argb.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/scale_row.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/version.h" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/libs/libyuv/include/libyuv/video_common.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileHashes.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin" />
@@ -19,9 +45,6 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin" />
- <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$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/.ninja_deps" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/.ninja_deps" />
@@ -68,17 +91,10 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/build.ninja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/cmake_build_command.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/rules.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/arm64-v8a/rules.ninja" />
- <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/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake" />
<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/debug/armeabi-v7a/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_output.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_output.txt" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/rules.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/rules.ninja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeCache.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeCache.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/CMakeFiles/CMakeOutput.log" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi/build.ninja" />
@@ -154,11 +170,10 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/lib/android-aarch64" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/arm64-v8a" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/lib/android-armv7" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/armeabi-v7a" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/lib/android-armv7/libcvface_api.so" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so" />
<change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/libs" afterPath="$PROJECT_DIR$/app/libs/st_face/lib" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/libs/android-aarch64" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/android-aarch64" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/libs/android-aarch64/libcvface_api.so" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/android-aarch64/libcvface_api.so" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/libs/android-armv7" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/android-armv7" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/app/libs/st_face/libs/android-armv7/libcvface_api.so" afterPath="$PROJECT_DIR$/app/libs/st_face/lib/android-armv7/libcvface_api.so" />
</list>
<ignored path="RtspNativeCodec.iws" />
<ignored path=".idea/workspace.xml" />
@@ -229,8 +244,8 @@
<file leaf-file-name="CMakeLists.txt" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="44" column="87" selection-start-line="44" selection-start-column="87" selection-end-line="44" selection-end-column="87" />
+ <state relative-caret-position="817">
+ <caret line="46" column="101" selection-start-line="46" selection-start-column="101" selection-end-line="46" selection-end-column="101" />
<folding />
</state>
</provider>
@@ -239,8 +254,8 @@
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="15" column="58" selection-start-line="15" selection-start-column="58" selection-end-line="15" selection-end-column="58" />
+ <state relative-caret-position="247">
+ <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
<folding />
</state>
</provider>
@@ -2133,7 +2148,7 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1176" extended-state="7" />
+ <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -2488,14 +2503,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="15" column="58" selection-start-line="15" selection-start-column="58" selection-end-line="15" selection-end-column="58" />
- <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="475">
@@ -2518,10 +2525,18 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="247">
+ <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="836">
- <caret line="44" column="87" selection-start-line="44" selection-start-column="87" selection-end-line="44" selection-end-column="87" />
+ <state relative-caret-position="817">
+ <caret line="46" column="101" selection-start-line="46" selection-start-column="101" selection-end-line="46" selection-end-column="101" />
<folding />
</state>
</provider>
--
Gitblit v1.8.0