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/CameraWrapperServer.cpp |   73 +++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
index 8f7266b..0cf6a61 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
@@ -6,11 +6,12 @@
 #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>
 #include <PL_RTSPServer2.h>
+#include <iostream>
+
 CameraWrapper::~CameraWrapper()
 {
 	stop();
@@ -95,13 +96,12 @@
     PipeLine::register_global_elem_creator("PL_RTSPClient", create_PL_RTSPClient);
     PipeLine::register_global_elem_creator("PL_AndroidMediaCodecDecoder", create_PL_AndroidMediaCodecDecoder);
     PipeLine::register_global_elem_creator("PL_AndroidSurfaceViewRender", create_PL_AndroidSurfaceViewRender);
-    PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
-    //PipeLine::register_global_elem_creator("PL_SensetimeFaceTrackMitiTrd", create_PL_SensetimeFaceTrackMultiTrd);
+    //PipeLine::register_global_elem_creator("PL_SensetimeFaceTrack", create_PL_SensetimeFaceTrack);
+    PipeLine::register_global_elem_creator("PL_SensetimeFaceTrackMitiTrd", create_PL_SensetimeFaceTrackMultiTrd);
     PipeLine::register_global_elem_creator("PL_Gainer", create_PL_Gainer);
     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);
     PipeLine::register_global_elem_creator("PL_BlockGrouping", create_PL_BlockGrouping);
 	PipeLine::register_global_elem_creator("PL_AndroidMediaCodecEncoder", create_PL_AndroidMediaCodecEncoder);
 	PipeLine::register_global_elem_creator("PL_RTSPServer2", create_PL_RTSPServer2);
@@ -182,13 +182,15 @@
 		//}
 
 		PL_AndroidMediaCodecEncoder_Config amceCfg;
-		amceCfg.ak_bit_rate = 5000000; // 512KB
+		amceCfg.ak_bit_rate = 512 * 1024 * 8; // 512KB
 		amceCfg.ak_color_format = 21; // COLOR_FormatYUV420SemiPlanar;
-		amceCfg.ak_frame_rate = 25;
+		amceCfg.ak_frame_rate = 40;
 		amceCfg.ak_height = 480;
-		amceCfg.ak_i_frame_interval = 20;
+		amceCfg.ak_i_frame_interval = 1;
 		amceCfg.ak_mime = "video/avc";
 		amceCfg.ak_width = 640;
+		amceCfg.codecProfileLevel.profile = Android_CodecProfileLevel::AVCProfileBaseline;
+		amceCfg.codecProfileLevel.level = Android_CodecProfileLevel::AVCLevel1;
 		PL_AndroidMediaCodecEncoder* plAMCE = (PL_AndroidMediaCodecEncoder*)pipeLineRender->push_elem("PL_AndroidMediaCodecEncoder");
 		ret = plAMCE->init(&amceCfg);
 		if (!ret)
@@ -199,7 +201,7 @@
 
 		PL_RTSPServer2* plRtspServer = (PL_RTSPServer2*)pipeLineRender->push_elem("PL_RTSPServer2");
 		RTSPServer2Config rtspServerConfig;
-		//rtspServerConfig.syncDeliverFrame = false;
+		//rtspServerConfig.payBlockFullQueue = true;
 		ret = plRtspServer->init(&rtspServerConfig);
 		if (!ret)
 		{
@@ -242,20 +244,20 @@
     //}
 
 #ifdef USE_ST_SDK
-    PL_SensetimeFaceTrack *sfTrack = (PL_SensetimeFaceTrack *) pipeLineDecoderDetector->push_elem("PL_SensetimeFaceTrack");//#todo   use multi
-    ret = sfTrack->init(&sftConfig);
-    if (!ret)
-    {
-        LOG_ERROR << "pipeLineDecoderDetector.sfTrack.init error" << LOG_ENDL;
-        return false;
-    }
-    //PL_SensetimeFaceTrackMultiTrd *sfTrack = (PL_SensetimeFaceTrackMultiTrd *) pipeLineDecoderDetector->push_elem("PL_SensetimeFaceTrackMitiTrd");
+    //PL_SensetimeFaceTrack *sfTrack = (PL_SensetimeFaceTrack *) pipeLineDecoderDetector->push_elem("PL_SensetimeFaceTrack");//#todo   use multi
     //ret = sfTrack->init(&sftConfig);
     //if (!ret)
     //{
     //    LOG_ERROR << "pipeLineDecoderDetector.sfTrack.init error" << LOG_ENDL;
     //    return false;
     //}
+    PL_SensetimeFaceTrackMultiTrd *sfTrack = (PL_SensetimeFaceTrackMultiTrd *) pipeLineDecoderDetector->push_elem("PL_SensetimeFaceTrackMitiTrd");
+    ret = sfTrack->init(&sftConfig);
+    if (!ret)
+    {
+        LOG_ERROR << "pipeLineDecoderDetector.sfTrack.init error" << LOG_ENDL;
+        return false;
+    }
 #endif
 
     return ret;
@@ -275,7 +277,6 @@
 {
     if (faceLabels.size() > 32)
         faceLabels.clear();
-
     faceLabels.insert(std::make_pair(st_track_id, label));
 }
 
@@ -374,21 +375,41 @@
     CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
     if (cameraWrapper.faceCacheLocked)
         return false;
-
     int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
     if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
         return false;
     cameraWrapper.faceCache.cachePm(*pm);
     //remote call start, 涓轰簡淇濊瘉閫氱敤鎬э紝鏈皢浠ヤ笅姝ラ灏佸叆RtspFaceDetectClient
-    RtspFaceDetectClient* client = getRtspFaceDetectClient();
-    if (client == nullptr)
-        return false;
+    //#todo 浼樺寲灏佽
+    try
+    {
+        LOG_INFO <<"try start"<< LOG_ENDL;
 
-    auto request = client->fireFaceCountListenerRequest();
-    request.setCameraIndex(cameraWrapper.cameraIdx);
-    request.setFaceCount(cameraWrapper.faceCache.getFaceCount(*pm));
-    auto sendAct = request.send();
-    sendAct.wait(client->getWaitScope());
+//        RtspFaceDetect::Client* rClient = getRtspFaceDetectClient()->getClient();
+//        auto& waitScope = getRtspFaceDetectClient()->getWaitScope();
+
+       RtspFaceDetectClient* client = getRtspFaceDetectClient();
+       RtspFaceDetect::Client rClient = client->getEzRpcClient()->getMain<RtspFaceDetect>();
+       auto& waitScope = client->getWaitScope();
+
+       auto  request = rClient.fireFaceCountListenerRequest();
+       request.setCameraIndex(cameraWrapper.cameraIdx);
+       request.setFaceCount(faceCount);
+       LOG_INFO <<"!!!!!"<<cameraWrapper.cameraIdx << "+" << faceCount << LOG_ENDL;
+       LOG_INFO <<"call client : i have face!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+       auto sendAct = request.send();
+       sendAct.ignoreResult().wait(waitScope);
+    }
+    catch (const kj::Exception& e)
+    {
+        LOG_INFO <<"catch!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+        LOG_ERROR << "catch!!!" <<e.getDescription().cStr() << LOG_ENDL;
+        std::cout << e.getDescription().cStr() << std::endl;
+        return false;
+    }
+    catch (std::exception e){
+        LOG_ERROR << "catch!!!" <<e.what() << LOG_ENDL;
+    }
     //remote call end
     return true;
 }

--
Gitblit v1.8.0