From a05971bb73cced9426e11e26708a3f3cd2c3fc17 Mon Sep 17 00:00:00 2001 From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674> Date: 星期二, 11 四月 2017 17:02:07 +0800 Subject: [PATCH] add release --- VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.h | 20 VisitFace/RtspNativeCodec/release/app-debug10.apk | 0 VisitFace/RtspNativeCodec/app/src/main/assets/license-49.lic | 56 ++++ VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock | 0 VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock | 0 VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin | 0 VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties | 2 VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp | 34 +- VisitFace/RtspNativeCodec/.idea/workspace.xml | 521 ++++++++------------------------------- VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin | 0 VisitFace/RtspNativeCodec/release/app-debug49.apk | 0 VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps | 0 /dev/null | 44 --- VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties | 4 VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 7 VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin | 0 VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log | 20 + VisitFace/RtspNativeCodec/app/src/main/assets/license-10.lic | 56 ++++ VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin | 0 VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock | 0 VisitFace/RtspNativeCodec/app/app.iml | 16 21 files changed, 288 insertions(+), 492 deletions(-) diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin index 3d28ddd..3bd24c7 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileHashes.bin Binary files differ diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin index c6226be..d90336e 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/fileSnapshots.bin Binary files differ diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin index 86aaf8a..b929d06 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.bin Binary files differ diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock index 855f840..4b98c50 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/taskArtifacts/taskArtifacts.lock Binary files differ diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin index 3beb7ad..d5fb1a5 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin Binary files differ diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index 6f6b830..9a580cf 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock Binary files differ diff --git a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index 4acd7fb..0c2f927 100644 --- a/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock +++ b/VisitFace/RtspNativeCodec/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock Binary files differ diff --git a/VisitFace/RtspNativeCodec/.idea/workspace.xml b/VisitFace/RtspNativeCodec/.idea/workspace.xml index 4027331..e62654a 100644 --- a/VisitFace/RtspNativeCodec/.idea/workspace.xml +++ b/VisitFace/RtspNativeCodec/.idea/workspace.xml @@ -10,9 +10,11 @@ </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$/release" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/release/app-debug.apk" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/assets/license.lic" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/com/bsk" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" /> @@ -21,9 +23,6 @@ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/.ninja_deps" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/.ninja_deps" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug-androidTest.ap_" afterPath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug-androidTest.ap_" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/app/build/intermediates/res/resources-debug.ap_" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" afterPath="$PROJECT_DIR$/../../RtspFace/MaterialBuffer.h" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" afterPath="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.h" /> @@ -35,48 +34,16 @@ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" afterPath="$PROJECT_DIR$/../../RtspFace/live555/testProgs/testRTSPClient.hpp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../RtspFace/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/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.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/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/x86/.ninja_log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/.ninja_log" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/CMakeFiles/CMakeOutput.log" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/android_gradle_build.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/build.ninja" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/x86/cmake_build_command.txt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt" /> - <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/release/armeabi-v7a/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/CMakeCache.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/CMakeCache.txt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/CMakeFiles/CMakeOutput.log" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/CMakeFiles/CMakeOutput.log" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/android_gradle_build.json" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/build.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/build.ninja" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/cmake_build_command.txt" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/cmake_build_command.txt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/cmake_install.cmake" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/cmake_install.cmake" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/rules.ninja" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/x86/rules.ninja" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" /> <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/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" /> - <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/FaceCache.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/assets/license.lic" afterPath="$PROJECT_DIR$/app/src/main/assets/license.lic" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" afterPath="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" /> </list> <ignored path="RtspNativeCodec.iws" /> <ignored path=".idea/workspace.xml" /> @@ -111,18 +78,29 @@ <file leaf-file-name="NativeCodec.java" pinned="false" current-in-tab="true"> <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="315"> - <caret line="80" column="13" selection-start-line="80" selection-start-column="13" selection-end-line="80" selection-end-column="13" /> - <folding /> + <state relative-caret-position="418"> + <caret line="197" column="43" selection-start-line="197" selection-start-column="43" selection-end-line="197" selection-end-column="43" /> + <folding> + <element signature="e#4018#5463#0" expanded="true" /> + <element signature="e#5462#5463#0" expanded="true" /> + <element signature="e#5728#5878#0" expanded="true" /> + <element signature="e#5877#5878#0" expanded="true" /> + <element signature="e#5917#6067#0" expanded="true" /> + <element signature="e#6066#6067#0" expanded="true" /> + <element signature="e#6228#7921#0" expanded="true" /> + <element signature="e#7920#7921#0" expanded="true" /> + <element signature="e#8034#8284#0" expanded="true" /> + <element signature="e#8283#8284#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> <file leaf-file-name="RtspFaceNative.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java"> + <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="524"> - <caret line="37" column="68" selection-start-line="37" selection-start-column="68" selection-end-line="37" selection-end-column="68" /> + <state relative-caret-position="532"> + <caret line="37" column="63" selection-start-line="37" selection-start-column="63" selection-end-line="37" selection-end-column="63" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -133,12 +111,9 @@ <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="571"> + <state relative-caret-position="5054"> <caret line="266" column="0" selection-start-line="266" selection-start-column="0" selection-end-line="266" selection-end-column="0" /> - <folding> - <element signature="e#3032#3090#0" expanded="true" /> - <marker date="1491898455822" expanded="true" signature="849:943" ph="..." /> - </folding> + <folding /> </state> </provider> </entry> @@ -146,8 +121,8 @@ <file leaf-file-name="RtspNativeCodecJNI.h" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="480"> - <caret line="33" column="118" selection-start-line="33" selection-start-column="118" selection-end-line="33" selection-end-column="118" /> + <state relative-caret-position="266"> + <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" /> <folding /> </state> </provider> @@ -169,7 +144,7 @@ <file leaf-file-name="jni.h" pinned="false" current-in-tab="false"> <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="294"> + <state relative-caret-position="893"> <caret line="47" column="28" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="28" /> <folding /> </state> @@ -179,7 +154,7 @@ <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="-603"> + <state relative-caret-position="1349"> <caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" /> <folding> <element signature="e#0#26#0" expanded="true" /> @@ -191,7 +166,7 @@ <file leaf-file-name="FaceCache.cpp" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="228"> + <state relative-caret-position="3287"> <caret line="173" column="16" selection-start-line="173" selection-start-column="16" selection-end-line="173" selection-end-column="16" /> <folding> <element signature="e#0#22#0" expanded="true" /> @@ -203,7 +178,7 @@ <file leaf-file-name="PbFaceList.pb.h" pinned="false" current-in-tab="false"> <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"> + <state relative-caret-position="12388"> <caret line="652" column="0" selection-start-line="652" selection-start-column="0" selection-end-line="652" selection-end-column="0" /> <folding /> </state> @@ -1904,13 +1879,14 @@ <option value="$PROJECT_DIR$/app/build.gradle" /> <option value="$PROJECT_DIR$/../../RtspFace/PL_AndroidMediaCodecDecoder.cpp" /> <option value="$PROJECT_DIR$/../../RtspFace/PL_SensetimeFaceTrack.cpp" /> - <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" /> <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.h" /> <option value="$PROJECT_DIR$/app/src/main/cpp/CameraWrapper.cpp" /> <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h" /> - <option value="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" /> <option value="$PROJECT_DIR$/app/src/main/cpp/FaceCache.cpp" /> <option value="$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.cpp" /> + <option value="$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/com/example/nativecodec/NativeCodec.java" /> </list> </option> </component> @@ -1918,7 +1894,7 @@ <component name="ProjectFrameBounds"> <option name="x" value="-8" /> <option name="y" value="-8" /> - <option name="width" value="1936" /> + <option name="width" value="1932" /> <option name="height" value="1176" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> @@ -1946,10 +1922,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> - <pane id="PackagesPane" /> - <pane id="AndroidView" /> <pane id="Scope" /> + <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -1974,132 +1948,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> - <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> - <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="com" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="nativecodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="RtspNativeCodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="RtspNativeCodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="com" /> - <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> - </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> @@ -2116,136 +1964,12 @@ <PATH_ELEMENT> <option name="myItemId" value="app" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="RtspNativeCodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="RtspNativeCodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="RtspNativeCodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="com" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="nativecodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="RtspNativeCodec" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="com" /> - <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="cpp" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> + <pane id="Scratches" /> + <pane id="AndroidView" /> </panes> </component> <component name="PropertiesComponent"> @@ -2256,7 +1980,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="RunManager" selected="Android App.app"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> @@ -2637,7 +2361,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" /> + <frame x="-8" y="-8" width="1932" height="1176" extended-state="1" /> <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" /> @@ -2645,21 +2369,20 @@ <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29400197" sideWeight="0.34381664" 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="true" show_stripe_button="true" weight="0.29400197" sideWeight="0.65618336" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29301867" sideWeight="0.23504274" 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="true" show_stripe_button="true" weight="0.29301867" sideWeight="0.76495725" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4936034" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32940018" sideWeight="0.4978678" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36479843" sideWeight="0.48933902" 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.2521322" 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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25160256" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="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="false" show_stripe_button="true" weight="0.2979351" sideWeight="0.5442431" 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="false" show_stripe_button="true" weight="0.2979351" sideWeight="0.54220086" 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" /> @@ -2671,6 +2394,7 @@ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="Vcs.Log.UiProperties"> @@ -2686,7 +2410,7 @@ </component> <component name="XDebuggerManager"> <breakpoint-manager> - <option name="time" value="314" /> + <option name="time" value="315" /> </breakpoint-manager> <watches-manager /> </component> @@ -2787,7 +2511,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="250"> <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" /> - <folding /> </state> </provider> </entry> @@ -2803,7 +2526,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2811,7 +2533,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2819,7 +2540,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="228"> <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2827,7 +2547,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2835,7 +2554,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2843,7 +2561,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2851,7 +2568,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2867,7 +2583,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2899,7 +2614,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="190"> <caret line="1362" column="9" selection-start-line="1362" selection-start-column="9" selection-end-line="1362" selection-end-column="9" /> - <folding /> </state> </provider> </entry> @@ -2907,7 +2621,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="437"> <caret line="110" column="46" selection-start-line="110" selection-start-column="46" selection-end-line="110" selection-end-column="46" /> - <folding /> </state> </provider> </entry> @@ -2931,7 +2644,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="285"> <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2939,7 +2651,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="228"> <caret line="33" column="23" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="23" /> - <folding /> </state> </provider> </entry> @@ -2947,7 +2658,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="228"> <caret line="963" column="0" selection-start-line="963" selection-start-column="0" selection-end-line="963" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2955,7 +2665,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="265"> <caret line="222" column="7" selection-start-line="222" selection-start-column="7" selection-end-line="222" selection-end-column="7" /> - <folding /> </state> </provider> </entry> @@ -2963,7 +2672,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="532"> <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" /> - <folding /> </state> </provider> </entry> @@ -2971,7 +2679,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="228"> <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2998,7 +2705,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="228"> <caret line="198" column="8" selection-start-line="198" selection-start-column="8" selection-end-line="198" selection-end-column="8" /> - <folding /> </state> </provider> </entry> @@ -3006,7 +2712,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="247"> <caret line="814" column="0" selection-start-line="814" selection-start-column="0" selection-end-line="814" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -3014,6 +2719,56 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="513"> <caret line="1447" column="0" selection-start-line="1447" selection-start-column="0" selection-end-line="1447" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/cpp/PbFaceList.pb.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="12388"> + <caret line="652" column="0" selection-start-line="652" selection-start-column="0" selection-end-line="652" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="893"> + <caret line="47" column="28" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1768"> + <caret line="119" column="4" selection-start-line="119" selection-start-column="4" selection-end-line="119" selection-end-column="4" /> + </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="1349"> + <caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" /> + <folding> + <element signature="e#0#26#0" expanded="true" /> + </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="3287"> + <caret line="173" column="16" selection-start-line="173" selection-start-column="16" selection-end-line="173" selection-end-column="16" /> + <folding> + <element signature="e#0#22#0" 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="5054"> + <caret line="266" column="0" selection-start-line="266" selection-start-column="0" selection-end-line="266" selection-end-column="0" /> <folding /> </state> </provider> @@ -3029,84 +2784,40 @@ </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="652" column="0" selection-start-line="652" selection-start-column="0" selection-end-line="652" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://D:/Android/adk/ndk-bundle/platforms/android-22/arch-arm/usr/include/jni.h"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="294"> - <caret line="47" column="28" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="28" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/src/main/cpp/RtspNativeCodecJNI.h"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="480"> - <caret line="33" column="118" selection-start-line="33" selection-start-column="118" selection-end-line="33" selection-end-column="118" /> + <state relative-caret-position="266"> + <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/libs/libyuv/include/libyuv/convert_from.h"> + <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="1768"> - <caret line="119" column="4" selection-start-line="119" selection-start-column="4" selection-end-line="119" selection-end-column="4" /> - <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="-603"> - <caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" /> - <folding> - <element signature="e#0#26#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="524"> - <caret line="37" column="68" selection-start-line="37" selection-start-column="68" selection-end-line="37" selection-end-column="68" /> + <state relative-caret-position="532"> + <caret line="37" column="63" selection-start-line="37" selection-start-column="63" selection-end-line="37" selection-end-column="63" /> <folding> <element signature="imports" expanded="true" /> </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="228"> - <caret line="173" column="16" selection-start-line="173" selection-start-column="16" selection-end-line="173" selection-end-column="16" /> - <folding> - <element signature="e#0#22#0" 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="571"> - <caret line="266" column="0" selection-start-line="266" selection-start-column="0" selection-end-line="266" selection-end-column="0" /> - <folding> - <element signature="e#3032#3090#0" expanded="true" /> - <marker date="1491898455822" expanded="true" signature="849:943" ph="..." /> - </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="315"> - <caret line="80" column="13" selection-start-line="80" selection-start-column="13" selection-end-line="80" selection-end-column="13" /> - <folding /> + <state relative-caret-position="418"> + <caret line="197" column="43" selection-start-line="197" selection-start-column="43" selection-end-line="197" selection-end-column="43" /> + <folding> + <element signature="e#4018#5463#0" expanded="true" /> + <element signature="e#5462#5463#0" expanded="true" /> + <element signature="e#5728#5878#0" expanded="true" /> + <element signature="e#5877#5878#0" expanded="true" /> + <element signature="e#5917#6067#0" expanded="true" /> + <element signature="e#6066#6067#0" expanded="true" /> + <element signature="e#6228#7921#0" expanded="true" /> + <element signature="e#7920#7921#0" expanded="true" /> + <element signature="e#8034#8284#0" expanded="true" /> + <element signature="e#8283#8284#0" expanded="true" /> + </folding> </state> </provider> </entry> diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps index 09253d1..b8bc2a8 100644 --- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps +++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps Binary files differ diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log index c2d269a..55ffc1d 100644 --- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log +++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log @@ -52,3 +52,23 @@ 14 1955 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c 751 3147 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6 3147 3540 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb +108 789 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438 +16 827 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b +3 832 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345 +94 1510 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634 +832 1649 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717 +789 1718 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b +104 1818 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0 +12 1869 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c +827 3118 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6 +3118 3513 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb +15 737 0 CMakeFiles/rtspface.dir/CameraWrapper.cpp.o d92dd1d04b5c0345 +12 772 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o a3171a496028d438 +31 856 0 CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o 8a466329a73b562b +25 1328 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o 1249e538330ec634 +856 1585 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o ca99d0cff4f6b717 +737 1649 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o 6a2338c361fc9c0b +4 1666 0 CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o a4c0dfab93cb91a0 +18 1692 0 CMakeFiles/rtspface.dir/FaceCache.cpp.o 29bbc5d44de1c4c +772 2984 0 CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o c6ac00204ba57dc6 +2984 3480 0 D:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so 268359c47689b5cb diff --git a/VisitFace/RtspNativeCodec/app/app.iml b/VisitFace/RtspNativeCodec/app/app.iml index ab3d316..e400c16 100644 --- a/VisitFace/RtspNativeCodec/app/app.iml +++ b/VisitFace/RtspNativeCodec/app/app.iml @@ -77,14 +77,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> @@ -93,6 +85,14 @@ <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" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/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" /> diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties index 549a70c..8d76d9e 100644 --- a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Tue Apr 11 16:21:09 CST 2017 +#Tue Apr 11 16:56:40 CST 2017 diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index a9f5ebf..b4258a2 100644 --- a/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/VisitFace/RtspNativeCodec/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,6 +1,6 @@ -#Tue Apr 11 16:21:09 CST 2017 +#Tue Apr 11 16:56:40 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-mdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi\\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 D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi\\ic_launcher.png D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\layout\\main.xml=D\:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\build\\intermediates\\res\\merged\\debug\\layout\\main.xml diff --git a/VisitFace/RtspNativeCodec/app/src/main/assets/license-10.lic b/VisitFace/RtspNativeCodec/app/src/main/assets/license-10.lic new file mode 100644 index 0000000..e5da436 --- /dev/null +++ b/VisitFace/RtspNativeCodec/app/src/main/assets/license-10.lic @@ -0,0 +1,56 @@ +############################################################ +# SenseTime License +# License Product: FaceSdk +# Expiration: 20170309~20170609 +# License SN: 0baf0fc8-79ca-4184-9ea9-43291557b191 +############################################################ +sGfdd5sxA8NCweDGA+vU2qzOgOjTn64wtsOftvbVw+MzmQXlL9gGE+JsM0nU +lOHN/Ai/mjyyPqGW4W5FxJgLnqgzp2g09JkRdjXGle8IEY8ag4wXH8LUT+XY +OXBBvilrGRazpr4ni1SVkpgxTHoX3GdBY09aLCaJ9uCj1p7uErIgjhC2AQAA +AAEAAAABJioS4yQz2pTIieigSTrt4ANVz5LRRa52XLWQvB2azvNdASaqkN2B +qMLx/Hy1Bq6TLqWxL0paF9Xj5t/xptpwmax0BxY+Dn4rsdJj4PnChey1B2Hx +OLlVDQUj+oZ3lgpzi1wdFp8RLKEDJVa5WRuiV8Po3o+JrDz5DvX+FJIKyrgF +5piZ69rc/zi0ohoz3VqCCr1OEUv4XSpDkK/g+1NkBHvco/EZe8wLoh0R7nQR +7yHAzGQRZMEBTaduWIATW1PeBQJxUjKGCv57aCB5jeGk0wg/60/4702f2Dth +RpZOeMvfbYedzag4SKaHN5rQ9jE+L0dCqREJvkfUVMYJ8wyvAQABAAAAAAAD +AAAAAAAAAAAAAAAdFrdcj38Pba/zw3OZ/zBgEZR1PVWeUBie2oiKNyH5oui3 +TgKfJH5wsLTGRPVm9S7pvOYfkLzS36uvuwvzZDyuWR2Z4LhnnZuPmaVqjKCs +8vqKNKoYMjqRuKlLc/y+lAk4U/2HGWDkWruVyV2pwqQhUEreQjDI3kFfwPtR +Ku7yaU4WpTKlQnuqI0Obs6/RqzM+XXs3TfxMOQAiBu+kWzaZTC19BtXMPFrN +fAjbMnQde9bo7miN0Suho+Y+NJZgyHmTyQ== +------------------------------------------------------------ +sGfdd4ync6ncI3nEVcIUuDiB2p7YiL+mf00nQjQQvJDzvxzxFPvWImdrzRrz +SsYr6tyb7VKTFrtomRgHb6rAdQ73f6PjkCrObDuTl8VuM5ZWsQ3+L2elXInc +CERoBcK8QD/vnFDJZrbMIVYnp/3nMfrbH4dlfsNiRjGCSKc2wfBXOc3mAQAA +AAEAAACfjNAHR/gO6dqbIlC8U/1fwvD36bQEhb4W1dCHwbF/z6XaS7IMvYQc +t3y7lDyrbWeD4WE5b5chSLgza2yF0MRicANpv7p0juOxC7UW8wAlS9Kc4fZL +PqwJAHZQX6Lvq1RyMZdRYgXfS3G9IKHjzxM0Ffzouj3ZDKxE5u+Aggxjx8CL +EGYtcutF6ucUDrxbrVxKzP1s6xTcoKg2leRaum7D6wJQrfSMjFJd6Y3t1bWz +Ta4Nwez/On6PNmGkKwf/FZtay1cp33pMzTRbciDCBuDVnzqnbLhRrRJBJwrK +IFTZETbC3EU9z62mbMOrRU6DumwmO4/JH6Y6SdG0jcNZgHiXAQABAAAAAAAD +AAAAAAAAAAAAAABaGOJAie6YMETNu9Z7SRpvDvpF+/CVNzjmbD07Pf0yCcgV +teA61Pju5L3m4SEMmmc5bQd+lCbi3iJJla6B00nvIn9oJDW5yyHeAEbD7fGz +jnMGlhA6TBroyrMS0Ioc7kWV+jPNMqpH12+/d72mSjJxzoAcJCEVrdZXQM/x +acx2zjEcCTUmB1Am6kwN3JwRkLYbmvuX3BYEFmdb/asfbrqY7XEg0QM979yt +lfDfiMbabiEq+07Hw4JNIFBpJH48gsONtIVp1z/Q4JKgWJePjCN4uqAzXjm7 +OTwMy9UMwQZVvXa2uvdEBsK9uD1RZhDhhCM9cmQxSQlsPvPuBVngDk+7WfqJ +XX/t8Gvr9BHyTpfr9F9g+ycHN7I= +------------------------------------------------------------ +sGfdd4Fe9oocogLnYQ59ArGgQKZgRCwY1h0JC23QtuxsPIcNKl4rwZPH02cD +e1r9yzrKdfqa/id6YP0f7R/6AH8IEiirh9EQukp949gghfioKV0vo1it7e5h +iW9K/BUM9HzoOgU+4iEyIxMtrFo09phlZ3dmxH9+KK/zMGjq1qDhzP5HAQAA +AAIAAAATCj8tV78KWnxnSrRrOjCQRsPz27khcaJu8lU7ORB4s8cRmtC7uuHg +PG0GZ7Yq3zZiCbLpBtc0FXO72Z+GoOWnRWPCQPu9f68g+tmktumYPNAJfwnk +Uh8Kzw2c7eazZqkpkjEH/Jutm565lM44VfQsSiq+0A261gwnLPbE/qfnMco6 +EOh9yiYAUAjLUFxTInYoM/S5+LlEz6Jz6EcZQ/fLDFM1tdjmQ7+wTZtLdgA8 ++woa2FG7ecDoMfCATjFC0RaZ1h5mpkxlF6Xsnne1byv0aq9VZPlx/iPR6LH6 +KMH9b2tliTaT0sMtL72CRIYaIc8ZehMSf/J+/REE4IQlqFYNAAAAAAAAAAAA +AAAAAAAAAAAAAACWfOAu1U4FAvnXksEU4tgu80iw+XXs+isP26LjV1v568dR +sDx9/WFT9hL6sRPhswcCNms3tHxtzvfniL29/Hqyn5/BkiP+p5R/TSbxXpPY +r/tg/ppy7X7SqzQK05Gnh+spLtpoHuwBQe0y4KcKK5klX4QH/bytbjM3APPj +HRuSUeSqsmcsfn0EhQc35sXPhcDkOlwvpySoZaa1dzfvJQUeZp9e48NiKEIg +24dYQ570QtH7CS1LK893zOCceh/YDFUesaU0TKUHMfpeOqC3M25rY4rtNLbU +Ewzn9KUossbGMDekCX1QrmWxIB8Kjawh3/9ZK8ROG23/xCeRz0d4xjd8HSZ3 +Vo6ksi49hXOG6L13EzlqMTItaj/+t4J+sxgjweYSzwWfewMYK7YTTabbD3CD +ZJCcQI3A6e5VbjFF4gYVxOYYVxMo +############################################################ \ No newline at end of file diff --git a/VisitFace/RtspNativeCodec/app/src/main/assets/license-49.lic b/VisitFace/RtspNativeCodec/app/src/main/assets/license-49.lic new file mode 100644 index 0000000..5c0a241 --- /dev/null +++ b/VisitFace/RtspNativeCodec/app/src/main/assets/license-49.lic @@ -0,0 +1,56 @@ +############################################################ +# SenseTime License +# License Product: FaceSdk +# Expiration: 20170309~20170609 +# License SN: 14ae89b6-d0b1-42f5-b5dc-e90da799a7a5 +############################################################ +sGfdd5sxA8NCweDGA+vU2qzOgOjTn64wtsOftvbVw+MzmQXlL9gGE+JsM0nU +lOHN/Ai/mjyyPqGW4W5FxJgLnqgzp2g09JkRdjXGle8IEY8ag4wXH8LUT+XY +OXBBvilrGRazpr4ni1SVkpgxTHoX3GdBY09aLCaJ9uCj1p7uErIgjhC2AQAA +AAEAAAABJioS4yQz2pTIieigSTrt4ANVz5LRRa52XLWQvB2azvNdASaqkN2B +qMLx/Hy1Bq6TLqWxL0paF9Xj5t/xptpwmax0BxY+Dn4rsdJj4PnChey1B2Hx +OLlVDQUj+oZ3lgpzi1wdFp8RLKEDJVa5WRuiV8Po3o+JrDz5DvX+FJIKyrgF +5piZ69rc/zi0ohoz3VqCCr1OEUv4XSpDkK/g+1NkBHvco/EZe8wLoh0R7nQR +7yHAzGQRZMEBTaduWIATW1PeBQJxUjKGCv57aCB5jeGk0wg/60/4702f2Dth +RpZOeMvfbYedzag4SKaHN5rQ9jE+L0dCqREJvkfUVMYJ8wyvAQABAAAAAAAD +AAAAAAAAAAAAAAAdFrdcj38Pba/zw3OZ/zBgEZR1PVWeUBie2oiKNyH5oui3 +TgKfJH5wsLTGRPVm9S7pvOYfkLzS36uvuwvzZDyuWR2Z4LhnnZuPmaVqjKCs +8vqKNKoYMjqRuKlLc/y+lAk4U/2HGWDkWruVyV2pwqQhUEreQjDI3kFfwPtR +Ku7yaU4WpTKlQnuqI0Obs6/RqzM+XXs3TfxMOQAiBu+kWzaZTC19BtXMPFrN +fAjbMnQde9bo7miN0Suho+Y+NJZgyHmTyQ== +------------------------------------------------------------ +sGfdd4ync6ncI3nEVcIUuDiB2p7YiL+mf00nQjQQvJDzvxzxFPvWImdrzRrz +SsYr6tyb7VKTFrtomRgHb6rAdQ73f6PjkCrObDuTl8VuM5ZWsQ3+L2elXInc +CERoBcK8QD/vnFDJZrbMIVYnp/3nMfrbH4dlfsNiRjGCSKc2wfBXOc3mAQAA +AAEAAACfjNAHR/gO6dqbIlC8U/1fwvD36bQEhb4W1dCHwbF/z6XaS7IMvYQc +t3y7lDyrbWeD4WE5b5chSLgza2yF0MRicANpv7p0juOxC7UW8wAlS9Kc4fZL +PqwJAHZQX6Lvq1RyMZdRYgXfS3G9IKHjzxM0Ffzouj3ZDKxE5u+Aggxjx8CL +EGYtcutF6ucUDrxbrVxKzP1s6xTcoKg2leRaum7D6wJQrfSMjFJd6Y3t1bWz +Ta4Nwez/On6PNmGkKwf/FZtay1cp33pMzTRbciDCBuDVnzqnbLhRrRJBJwrK +IFTZETbC3EU9z62mbMOrRU6DumwmO4/JH6Y6SdG0jcNZgHiXAQABAAAAAAAD +AAAAAAAAAAAAAABaGOJAie6YMETNu9Z7SRpvDvpF+/CVNzjmbD07Pf0yCcgV +teA61Pju5L3m4SEMmmc5bQd+lCbi3iJJla6B00nvIn9oJDW5yyHeAEbD7fGz +jnMGlhA6TBroyrMS0Ioc7kWV+jPNMqpH12+/d72mSjJxzoAcJCEVrdZXQM/x +acx2zjEcCTUmB1Am6kwN3JwRkLYbmvuX3BYEFmdb/asfbrqY7XEg0QM979yt +lfDfiMbabiEq+07Hw4JNIFBpJH48gsONtIVp1z/Q4JKgWJePjCN4uqAzXjm7 +OTwMy9UMwQZVvXa2uvdEBsK9uD1RZhDhhCM9cmQxSQlsPvPuBVngDk+7WfqJ +XX/t8Gvr9BHyTpfr9F9g+ycHN7I= +------------------------------------------------------------ +sGfdd3OIUWMCLXf/o4G/f5lt6ipLkrqT/L9Zkl9fwbbJR/VONusfzfZB+SUr +95sbzUOeKrZadFhs8XmmAXNGc1z5I0iJqSVWu6IjYH6trmKnk3pCfl/3rnVs +qZMloeMJubgtRUdIIS4jNsGtid2Dl+KVob27EV+fLjzxPQ4Zn1oBy4L8AQAA +AAIAAAAujA5xmDR0k8dXShvZNH+qpmB9gbRkcJCrYr8d2Y2MwCc1SwtX16eG +4rVNXNm/HtmrsDsUJc9tl8S3Z+Nfq+OzWs6URDi1KqNF3OTNIxL6YYWXd69X +gppavOlgMEvqmlc/bPCAKZSPBwyYmhg1BasbHrW8QyAEPlhdU/8Ux7bpJJts +CtzhN/v4lkONFgnzO5fN3/RkuMWWXJB5976MOwbkaYmY14wwIdfxiZkVPAky +a+/uSwMRGitV49uzvf/SAG9X+v6y/5fF9WSkVu7b16L+0mGQYPsVtxB6HrBa +j3aCmseYn9XGoQHbfNhs3f/oXMomPhvMb4GWcppE54TN2HG3AAAAAAAAAAAA +AAAAAAAAAAAAAADxIei32vzWb2S7VRvCiwpp9fKV1Wctf94YLlCthD+CJWs7 +sxTelKa6FYHgxtPHYeaWCoDUUdw1QiaXSLU12EjA9tUT2Vgw2IaFYBjwdt6l +LUtwwOmU7II/9phEmS0/+1CzK0k9FsHYU2dE76YRAC6RDXtmxRa5HkiFCsWK +0DnTQQvXbZPi/bjgM+w+qKfH+SKwi0iQsmAu2Gpo4M/CS0Y+nlaL2PnUPD4m +xT5pAzdUYEE1+flUv6ywtJJWBDrl6o/TwAVk3HD4sJyjQzblgwRV0hFQtRf7 +xiTERonp5XBHTtya4uglYOaiMTFsyF8TNihqGTqeBOeULtEOg2EhaDWYcSxI +CYLR/0hPbi9CRLPmFCHM1N+zSFNC1Q9oJ/eK56AQMhmM9PkzSuu0/PKVTFzr +eqoMNtWRLZYBWomx+CiBqwH0vuox +############################################################ \ No newline at end of file diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp index 46a4e73..2e93c7a 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.cpp @@ -20,7 +20,7 @@ extern "C" { -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_init(JNIEnv *env, jclass clazz) +void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz) { g_logger.set_level(VERBOSE); @@ -41,9 +41,9 @@ } // set the surface -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface) +void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setSurface" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; @@ -59,9 +59,9 @@ LOGP(DEBUG, "@@@ setsurface %p", cameraWrapper.window); } -jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri) +jboolean Java_cn_com_basic_face_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_createPlayer" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_createPlayer" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; @@ -107,9 +107,9 @@ } // shut down the native media system -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_shutdown(JNIEnv* env, jclass clazz, jint cameraIdx) +void Java_cn_com_basic_face_util_RtspFaceNative_shutdown(JNIEnv* env, jclass clazz, jint cameraIdx) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_shutdown" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_shutdown" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; @@ -145,9 +145,9 @@ return true; } -jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcName) +jboolean Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcName) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setFaceCallback" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]); @@ -181,9 +181,9 @@ cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, 0); } -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx) +void Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_lockFace" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_lockFace" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]); @@ -191,9 +191,9 @@ cameraWrapper.lockFace(); } -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx) +void Java_cn_com_basic_face_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_releaseFace" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_releaseFace" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]); @@ -201,9 +201,9 @@ cameraWrapper.releaseFace(); } -jint Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb) +jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceList" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceList" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]); @@ -233,9 +233,9 @@ } } -jint Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages) +jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages) { - LOG_DEBUG << "@@@ Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages" << LOG_ENDL; + LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL; assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT); cameraIdx -= 1; CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]); diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.h index 55f7689..5f91ed7 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.h +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNI.h @@ -9,29 +9,29 @@ { //com_example_nativecodec_NativeCodec -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_init(JNIEnv *env, jclass clazz); +void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz); // set the surface -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface); +void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx, jobject surface); -jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri); +jboolean Java_cn_com_basic_face_util_RtspFaceNative_createPlayer(JNIEnv* env, jclass clazz, jint cameraIdx, jstring uri); // shut down the native media system -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_shutdown(JNIEnv* env, jclass clazz, jint cameraIdx); +void Java_cn_com_basic_face_util_RtspFaceNative_shutdown(JNIEnv* env, jclass clazz, jint cameraIdx); -typedef void (* Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_FaceCallback_func)(int cameraIdx, int count); +typedef void (* Java_cn_com_basic_face_util_RtspFaceNative_FaceCallback_func)(int cameraIdx, int count); -jboolean Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcNamec); +jboolean Java_cn_com_basic_face_util_RtspFaceNative_setFaceCallback(JNIEnv* env, jclass clazz, jint cameraIdx, jstring className, jstring funcNamec); -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx); +void Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv* env, jclass clazz, jint cameraIdx); -void Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx); +void Java_cn_com_basic_face_util_RtspFaceNative_releaseFace(JNIEnv* env, jclass clazz, jint cameraIdx); // get face list protobuf -jint Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb); +jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv* env, jclass clazz, jint cameraIdx, jbyteArray faceListPb); // get 2-dimension byte array of ARGB images -jint Java_com_bsk_zhangbo_demoforbsk_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages); +jint Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv* env, jclass clazz, jint cameraIdx, jintArray faceImagesIdx, jbyteArray faceImages); } diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java b/VisitFace/RtspNativeCodec/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java deleted file mode 100644 index a9b16d6..0000000 --- a/VisitFace/RtspNativeCodec/app/src/main/java/com/bsk/zhangbo/demoforbsk/util/RtspFaceNative.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.bsk.zhangbo.demoforbsk.util; - -import android.util.Log; -import android.view.Surface; - -/** - * Created by houxiao on 2017/3/21 0021. - */ - -public class RtspFaceNative { - - //cn.com.basic.face.util.RtspFaceNative - - - public static native void init(); - public static native void setSurface(int cameraIdx, Surface surface); - public static native boolean createPlayer(int cameraIdx, String uri); - public static native void shutdown(int cameraIdx); - // typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count); - public static native boolean setFaceCallback(int cameraIdx, String className, String funcName); - public static native void lockFace(int cameraIdx); - public static native void releaseFace(int cameraIdx); - public static native int getFaceList(int cameraIdx, byte[] faceListPb); - public static native int getFaceImages(int cameraIdx, int[] faceImagesIdx, byte[] faceImages); - - public static void faceCallBack(int cameraIdx, int count) - { - Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraIdx + ", count=" + count); - - lockFace(cameraIdx); - - byte[] faceListPb = new byte[1024 * 1024 * 1]; - int s = getFaceList(cameraIdx, faceListPb); - Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s); - - int[] faceImagesIdx = new int[10]; - byte[] faceImages = new byte[1024 * 1024 * 1]; - int c = getFaceImages(cameraIdx, faceImagesIdx, faceImages); - Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c); - - releaseFace(cameraIdx); - } - -} diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java index c5f565b..2775aac 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java +++ b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java @@ -17,7 +17,6 @@ package com.example.nativecodec; import android.app.Activity; -import android.content.res.AssetManager; import android.graphics.SurfaceTexture; import android.os.Bundle; import android.util.Log; @@ -33,9 +32,7 @@ import android.widget.RadioButton; import android.widget.Spinner; -import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative; - -import java.io.IOException; +import cn.com.basic.face.util.RtspFaceNative; public class NativeCodec extends Activity { static final String TAG = "NativeCodec"; @@ -198,7 +195,7 @@ //mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream"); //mCreated = createPlayer(1, "rtsp://192.168.1.56:8554"); - RtspFaceNative.setFaceCallback(1, "com/bsk/zhangbo/demoforbsk/util/RtspFaceNative", "faceCallBack"); + RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack"); //byte[] arr = new byte[5]; //arr[0] = 3; arr[1] = 4; arr[2] = 5; diff --git a/VisitFace/RtspNativeCodec/release/app-debug10.apk b/VisitFace/RtspNativeCodec/release/app-debug10.apk new file mode 100644 index 0000000..4fd3eb7 --- /dev/null +++ b/VisitFace/RtspNativeCodec/release/app-debug10.apk Binary files differ diff --git a/VisitFace/RtspNativeCodec/release/app-debug49.apk b/VisitFace/RtspNativeCodec/release/app-debug49.apk new file mode 100644 index 0000000..9355dc2 --- /dev/null +++ b/VisitFace/RtspNativeCodec/release/app-debug49.apk Binary files differ -- Gitblit v1.8.0