From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 8922d56..f733384 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -6,8 +6,8 @@
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti -Wall -UNDEBUG")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22 -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")
-set(WORKSPACE_PATH "E:/Documents/works")
-set(ARCH "arm64-v8a")
+set(WORKSPACE_PATH "D:/workspace/proxy")
+set(ARCH "armeabi-v7a")
include_directories(
"${WORKSPACE_PATH}/RtspFace"
@@ -36,14 +36,12 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/include"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/inc"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/include"
-
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/include/freetype2"
)
add_library(rtspface_server SHARED
RtspNativeCodecJNIServer.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncServer.cpp
RemoteFunc.cpp
CameraWrapperServer.cpp
@@ -54,41 +52,38 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
"${WORKSPACE_PATH}/RtspFace/MediaHelper.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PreAllocBufferQueue.cpp"
"${WORKSPACE_PATH}/RtspFace/GraphicHelper.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_Gainer.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_Scale.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_ColorConv.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_Paint.cpp"
- "${WORKSPACE_PATH}/RtspFace/PL_V4L2Source.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_BlockGrouping.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Queue.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Fork2.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecEncoder.cpp"
- "${WORKSPACE_PATH}/RtspFace/PL_RTSPServer.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_RTSPServer2.cpp"
"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
"${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
-
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Capture.cpp"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Device.cpp"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Output.cpp"
"${WORKSPACE_PATH}/RtspFace/CvUtil/CvxText.cpp"
"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveServerMediaSubsession.cpp"
"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/LiveRTSPServer.cpp"
"${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/FFmpegH264Source.cpp"
+ "${WORKSPACE_PATH}/RtspFace/FFmpegRTSPServer/H264FramedSource.cpp"
)
# Include libraries needed for native-codec-jni lib
@@ -113,13 +108,14 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/protobuf/lib/${ARCH}/libprotobuf.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
-
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-async-0.7-dev.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
@@ -130,6 +126,7 @@
add_library(rtspface_client SHARED
RtspNativeCodecJNIClient.cpp
+ RemoteMethod.capnp.cpp
RemoteFuncClient.cpp
RemoteFunc.cpp
CameraWrapperClient.cpp
@@ -140,7 +137,6 @@
cpu_sched_test.cpp
serial.c
TeleWrapper.cpp
- RemoteMethod.proto.cpp
AppConfig.cpp
"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
@@ -150,12 +146,12 @@
"${WORKSPACE_PATH}/RtspFace/PL_RTSPClient.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidMediaCodecDecoder_ndk.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_AndroidSurfaceViewRender.cpp"
+ "${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrack.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_SensetimeFaceTrackMultiTrd.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_Gainer.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_Scale.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_ColorConv.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_Paint.cpp"
- "${WORKSPACE_PATH}/RtspFace/PL_V4L2Source.cpp"
"${WORKSPACE_PATH}/RtspFace/PL_BlockGrouping.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Queue.cpp"
#"${WORKSPACE_PATH}/RtspFace/PL_Fork2.cpp"
@@ -163,11 +159,6 @@
"${WORKSPACE_PATH}/FaceServer/proto_hton_ntoh.cpp"
"${WORKSPACE_PATH}/FaceServer/PbFaceList.pb.cc"
-
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Capture.cpp"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Device.cpp"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2MmapDevice.cpp"
- "${WORKSPACE_PATH}/RtspFace/libv4l2cpp/src/V4l2Output.cpp"
"${WORKSPACE_PATH}/RtspFace/CvUtil/CvxText.cpp"
@@ -196,12 +187,15 @@
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
- "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
- #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-json-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-rpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.7-dev.so"
+ "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-async-0.7-dev.so"
+
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
#"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
--
Gitblit v1.8.0