From 92873b5f4cc637dcd03ac9d56cf8ec982df10216 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 17 四月 2017 12:29:55 +0800
Subject: [PATCH] decode bug fix

---
 VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja
index aef2abe..72a6c57 100644
--- a/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja
+++ b/VisitFace/RtspNativeCodec/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja
@@ -92,6 +92,16 @@
   OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\Logger\src
   TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
   TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.pdb
+build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/MediaHelper.cpp
+  DEFINES = -Drtspface_EXPORTS
+  DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\MediaHelper.cpp.o.d
+  FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security  -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security   -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -Wall -UNDEBUG -O0 -O0  -fPIC
+  INCLUDES = -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+  IN_ABS = D:\workspace\proxy\RtspFace\MediaHelper.cpp
+  OBJECT_DIR = CMakeFiles\rtspface.dir
+  OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
+  TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
+  TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.pdb
 build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_RTSPClient.cpp
   DEFINES = -Drtspface_EXPORTS
   DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_RTSPClient.cpp.o.d
@@ -108,6 +118,16 @@
   FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security  -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security   -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -Wall -UNDEBUG -O0 -O0  -fPIC
   INCLUDES = -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
   IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidMediaCodecDecoder.cpp
+  OBJECT_DIR = CMakeFiles\rtspface.dir
+  OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
+  TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
+  TARGET_PDB = D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.pdb
+build CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o: CXX_COMPILER__rtspface D$:/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp
+  DEFINES = -Drtspface_EXPORTS
+  DEP_FILE = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace\PL_AndroidSurfaceViewRender.cpp.o.d
+  FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security  -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security   -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -Wall -UNDEBUG -O0 -O0  -fPIC
+  INCLUDES = -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/BasicUsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/include -ID:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/include -ID:/workspace/proxy/RtspFace -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/include -isystem D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+  IN_ABS = D:\workspace\proxy\RtspFace\PL_AndroidSurfaceViewRender.cpp
   OBJECT_DIR = CMakeFiles\rtspface.dir
   OBJECT_FILE_DIR = CMakeFiles\rtspface.dir\D_\workspace\proxy\RtspFace
   TARGET_COMPILE_PDB = CMakeFiles\rtspface.dir\
@@ -130,10 +150,10 @@
 #############################################
 # Link the shared library D:\workspace\proxy\VisitFace\RtspNativeCodec\app\build\intermediates\cmake\debug\obj\armeabi-v7a\librtspface.so
 
-build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/FaceCache.cpp.o CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o | D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so
+build D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/build/intermediates/cmake/debug/obj/armeabi-v7a/librtspface.so: CXX_SHARED_LIBRARY_LINKER__rtspface CMakeFiles/rtspface.dir/RtspNativeCodecJNI.cpp.o CMakeFiles/rtspface.dir/CameraWrapper.cpp.o CMakeFiles/rtspface.dir/FaceCache.cpp.o CMakeFiles/rtspface.dir/PbFaceList.pb.cc.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PipeLine.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/Logger/src/logger.cc.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/MediaHelper.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_RTSPClient.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidMediaCodecDecoder.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_AndroidSurfaceViewRender.cpp.o CMakeFiles/rtspface.dir/D_/workspace/proxy/RtspFace/PL_SensetimeFaceTrack.cpp.o | D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a/libopencv_java3.so D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a/libprotobuf.so D$:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a/libcvface_api.so
   LANGUAGE_COMPILE_FLAGS = -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security  -g -DANDROID -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Wa,--noexecstack -Wformat -Werror=format-security   -g -O0 -std=c++11 -DUSE_ST_SDK -DUSE_OPENCV -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static  -Wall -UNDEBUG -O0 -O0
   LINK_FLAGS = -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
-  LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a -lopencv_java3 -lprotobuf -lcvface_api -lm "D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a"
+  LINK_LIBRARIES = -landroid -llog -lmediandk -lOpenMAXAL -ljnigraphics D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libliveMedia.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libgroupsock.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libBasicUsageEnvironment.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/live555/lib/armeabi-v7a/libUsageEnvironment.a D:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/libyuv/lib/armeabi-v7a/libyuv_static.a -lopencv_java3 -lprotobuf -lcvface_api -lm "D:/Android/adk/ndk-bundle/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a/libgnustl_static.a"
   LINK_PATH = -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/opencv/lib/armeabi-v7a  -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/armeabi-v7a  -LD:/workspace/proxy/VisitFace/RtspNativeCodec/app/libs/st_face/lib/armeabi-v7a
   OBJECT_DIR = CMakeFiles\rtspface.dir
   POST_BUILD = cd .

--
Gitblit v1.8.0