From 63d598d4443f906b34bedaf49e870b7a2be1a5c8 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 四月 2017 12:14:30 +0800
Subject: [PATCH] bug fix for android device
---
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp | 104 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
index 0b8e658..160ed07 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
@@ -5,6 +5,14 @@
#include <logger.h>
#include <Logger/src/logger.hpp>
+#include <opencv/cv.h>
+#include <opencv/cxcore.h>
+#include <opencv/highgui.h>
+
+#include <vector>
+
+#include "PbFaceList.pb.h"
+
struct FcPmBreackerContext
{
uint8_t frameYUV[1920*1080*4];
@@ -12,19 +20,26 @@
uint8_t frameRGB[1920*1080*4];
size_t frameRGBSize;
+
+ size_t width;
+ size_t height;
st_ff_vect_t faceFeatures;
bool dataAvailable;
- FcPmBreackerContext() : frameYUV(), frameYUVSize(0), frameRGB(), frameRGBSize(0), faceFeatures(), dataAvailable(false)
+ FcPmBreackerContext() :
+ frameYUV(), frameYUVSize(0), frameRGB(), frameRGBSize(0),
+ faceFeatures(), width(0), height(0), dataAvailable(false)
{
}
void reset()
{
frameYUVSize = 0;
- frameRGBSize = 0;
+ frameRGBSize = 0;
+ width = 0;
+ height = 0;
dataAvailable = false;
faceFeatures.clear();
}
@@ -63,13 +78,16 @@
return false;
}
- ctx->frameYUVSize = lastFrame->buffSize;
+ ctx->frameYUVSize = lastFrame->buffSize;
+ ctx->width = lastFrame->width;
+ ctx->height = lastFrame->height;
memcpy(ctx->frameYUV, lastFrame->buffer, ctx->frameYUVSize);
ctx->dataAvailable &= true;
return false;
}
+#ifdef USE_ST_SDK
FaceCache::FaceCache() : _ctx(new FcPmBreackerContext)
{
}
@@ -78,10 +96,14 @@
{
delete (FcPmBreackerContext*)_ctx;
}
+#endif
// returns count of face
int FaceCache::cachePm(const PipeMaterial& pm)
{
+ if (_ctx == nullptr)
+ _ctx = new FcPmBreackerContext;
+
FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);
ctx.reset();
ctx.dataAvailable = true;
@@ -94,25 +116,71 @@
return 0;
}
-bool FaceCache::getFaceListPb(uint8_t* buffer, size_t& buffSize)
+bool FaceCache::getFaceListPb(uint8_t* buffer, size_t& buffMaxSize)
{
- return false;
+ FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);
+
+ PbFaceList pbFaceList;
+ pbFaceList.set_image_count(ctx.faceFeatures.size());
+ pbFaceList.set_src_width(ctx.width);
+ pbFaceList.set_src_height(ctx.height);
+
+ cv::Mat yMat(cv::Size(ctx.width, ctx.height), CV_8UC1, ctx.frameYUV);
+
+ for (int i = 0; i < ctx.faceFeatures.size(); i++)
+ {
+ const FaceRect& faceRect(ctx.faceFeatures[i].rect);
+ cv::Mat roiMat(yMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
+
+ PbFaceList_FaceListImage pbFaceListImage;
+ pbFaceListImage.set_idx(i);
+ pbFaceListImage.set_size(roiMat.elemSize());
+ pbFaceListImage.set_type(PbFaceList_FaceListImage_ImageType_IT_Y);
+ pbFaceListImage.set_width(roiMat.cols);
+ pbFaceListImage.set_height(roiMat.rows);
+ pbFaceListImage.set_top_left_x(faceRect.leftTop.x);
+ pbFaceListImage.set_top_left_y(faceRect.leftTop.y);
+
+ pbFaceListImage.set_img(0, roiMat.ptr(), roiMat.elemSize());
+ }
+
+
+ return false;
}
-bool FaceCache::getFaceListImage(int* buffIdx, size_t& count, uint8_t* buffImg, size_t& buffImgSize)
+bool FaceCache::getFaceListImage(int* buffIdx, size_t& count, uint8_t* buffImg, size_t& buffImgMaxSize)
{
- return false;
-}
+ FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);
-bool FaceCache::extractFace()
-{
- FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);
+ if (ctx.frameRGBSize == 0)
+ {
+ if (! ctx.convertYUV420ToRGB())
+ return false;
+ }
- if (ctx.frameRGBSize == 0)
- {
- if (! ctx.convertYUV420ToRGB())
- return false;
- }
-
-
+ count = 0;
+ uint8_t* pBuff = buffImg;
+ size_t totalSize = 0;
+
+ cv::Mat rgbMat(cv::Size(ctx.width, ctx.height), CV_8UC3, ctx.frameRGB);
+ for (st_ff_vect_t::const_iterator ffiter = ctx.faceFeatures.begin(); ffiter != ctx.faceFeatures.end(); ++ffiter)
+ {
+ const FaceRect& faceRect(ffiter->rect);
+ cv::Mat roiMat(rgbMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
+
+ //isContinuous
+ size_t s = roiMat.elemSize();
+ if (totalSize + s <= buffImgMaxSize)
+ {
+ memcpy(pBuff, roiMat.ptr(), s);
+ *buffIdx = int(totalSize);
+
+ pBuff += s;
+ totalSize += s;
+ count++;
+ buffIdx++;
+ }
+ }
+
+ return (count != 0);
}
--
Gitblit v1.8.0