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/CameraWrapperClient.cpp | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp index 6d52346..b81d341 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp @@ -5,7 +5,6 @@ #include <PL_Gainer.h> #include <PL_Paint.h> #include <PL_Scale.h> -#include <PL_V4L2Source.h> #include <PL_BlockGrouping.h> #include <PL_ColorConv.h> #include <PL_AndroidMediaCodecEncoder.h> @@ -103,7 +102,6 @@ PipeLine::register_global_elem_creator("PL_Scale", create_PL_Scale); PipeLine::register_global_elem_creator("PL_ColorConv", create_PL_ColorConv); PipeLine::register_global_elem_creator("PL_Paint", create_PL_Paint); - PipeLine::register_global_elem_creator("PL_V4L2Source", create_PL_V4L2Source); bool ret = initPl_DecoderPl(); if (!ret) @@ -204,13 +202,14 @@ faceCacheLocked = false; } +//#Deprecated void CameraWrapper::setFaceLabel(int st_track_id, const std::wstring& label) { if (faceLabels.size() > 32) faceLabels.clear(); faceLabels.insert(std::make_pair(st_track_id, label)); - LOG_ERROR <<"client setFaceLabel : !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL; + LOG_ERROR <<"client setFaceLabel : !!!!!!"<< LOG_ENDL; } void CameraWrapper::fireFaceCount(int faceCount) @@ -377,6 +376,7 @@ } } +//callback pthread void *CameraWrapper::jni_call_thd(void *arg) { CameraWrapper* cameraWrapper = (CameraWrapper*)arg; @@ -412,7 +412,7 @@ cameraWrapper->javaVM->DetachCurrentThread(); cameraWrapper->faceCountChanged = false; } - usleep(10000); + usleep(50000); } } -- Gitblit v1.8.0