From fa4bbbf0b448dad155a05f0d3cc27fb118ba6053 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 18:18:46 +0800
Subject: [PATCH] update librtspface.so
---
VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 168 insertions(+), 11 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
index 3b1797f..719b236 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.cpp
@@ -14,6 +14,10 @@
#include "PbFaceList.pb.h"
#include <libyuv.h>
+#define SUBSAMPLE(v, a) ((((v) + (a) - 1)) / (a))
+
+//#define YUV420_TO_RGB888 1
+#define YUV420_TO_RGB565 1
struct FcPmBreackerContext
{
@@ -46,10 +50,8 @@
faceFeatures.clear();
}
- bool convertYUV420ToRGB()
+ bool convertYUV420ToRGB888()
{
-#define SUBSAMPLE(v, a) ((((v) + (a) - 1)) / (a))
-
int src_height = height;
int src_width = width;
const uint8* src_y = (const uint8*)(frameYUV);
@@ -62,8 +64,36 @@
frameRGB, 3 * src_width,
src_width, src_height);
frameRGBSize = src_height * src_width * 3;
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/face-%u.rgb", ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(frameRGB, 1, frameRGBSize, pFile);
+ // fclose(pFile);
+ // if (f > 20)exit(0);
+ //}
+
return true;
}
+
+ bool convertYUV420ToRGB565()
+ {
+ int src_height = height;
+ int src_width = width;
+ const uint8* src_y = (const uint8*)(frameYUV);
+ const uint8* src_u = (const uint8*)(src_y + (src_height * src_width));
+ const uint8* src_v = (const uint8*)(src_u + (src_height * src_width / 4));
+
+ libyuv::I420ToRGB565(src_y, src_width,
+ src_u, SUBSAMPLE(src_width, 2),
+ src_v, SUBSAMPLE(src_width, 2),
+ frameRGB, 2 * src_width,
+ src_width, src_height);
+ frameRGBSize = src_height * src_width * 2;
+ return true;
+ }
};
bool fc_pm_breaker_ptr(const PipeMaterial* pm, void* args)
@@ -102,6 +132,13 @@
ctx->dataAvailable &= true;
return true;
+}
+
+NativeImgIdx::operator std::string() const
+{
+ char buf[256];
+ sprintf(buf, "offset=%d, size=%d, type=%d, width=%d, height=%d", offset, size, type, width, height);
+ return std::string(buf);
}
#ifdef USE_ST_SDK
@@ -150,18 +187,30 @@
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));
-
+ cv::Mat roiMat1(yMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
+ cv::Mat roiMat(roiMat1.clone()); // #todo copy data should be avoid!!!!
+ size_t s = roiMat.total() * roiMat.elemSize();
+
PbFaceList_FaceListImage pbFaceListImage;
pbFaceListImage.set_idx(i);
- pbFaceListImage.set_size(roiMat.elemSize());
+ pbFaceListImage.set_size(s);
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.add_img(roiMat.ptr(), roiMat.total() * roiMat.elemSize());
+ pbFaceListImage.add_img(roiMat.ptr(), s);
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/face-%u.yuv", ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(roiMat.ptr(), 1, s, pFile);
+ // fclose(pFile);
+ // if (f > 20)exit(0);
+ //}
}
size_t s = pbFaceList.ByteSize();
@@ -171,14 +220,18 @@
return buffMaxSize > 0;
}
+#ifdef YUV420_TO_RGB888
+
bool FaceCache::getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize)
{
FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);
+ if (!ctx.dataAvailable)
+ return false;
if (ctx.frameRGBSize == 0)
{
//#todo should optimize not convert the whole image
- if (! ctx.convertYUV420ToRGB())
+ if (! ctx.convertYUV420ToRGB888())
return false;
}
@@ -189,12 +242,13 @@
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));
+ cv::Mat roiMat1(rgbMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
+ cv::Mat roiMat(roiMat1.clone()); // #todo copy data should be avoid!!!!
NativeImgIdx imgidx;
imgidx.offset = offset;
imgidx.size = roiMat.total() * roiMat.elemSize();
- imgidx.type = MB_Frame::MBFT_RGB;
+ imgidx.type = MB_Frame::MBFT_RGB888;
imgidx.width = roiMat.cols;
imgidx.height = roiMat.rows;
@@ -207,10 +261,113 @@
return false;
}
- memcpy(buffImg + imgidx.offset, roiMat.ptr(), imgidx.size);
+
+ uint8_t* pbuf = buffImg + imgidx.offset;
+ memcpy(pbuf, roiMat.ptr(), imgidx.size);
+
+ //uint8_t* pbuf = buffImg + imgidx.offset;
+ //cv::Mat roiMat1(roiMat.cols, roiMat.rows, CV_8UC3, pbuf);
+ //pbuf[0]=123;
+ //roiMat.copyTo(roiMat1);
+ //memcpy(buffImg + imgidx.offset, roiMat.ptr(), imgidx.size);
+
+ //uint8_t* pbuf = buffImg + imgidx.offset;
+ //for(size_t r = 0; r < roiMat.rows; r++)
+ //{
+ // const uint8_t* pcol = roiMat.ptr<uint8_t>(r);
+ // memcpy(pbuf, pcol, roiMat.cols);
+ // pbuf += roiMat.cols;
+ //}
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/face-%u.rgb", ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(pbuf, 1, imgidx.size, pFile);
+ // fclose(pFile);
+ // if (f > 20)exit(0);
+ //}
+
imgIdxes.push_back(imgidx);
offset = newSize;
}
+ buffImgMaxSize = offset;
return true;
}
+
+#elif YUV420_TO_RGB565
+
+bool FaceCache::getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize)
+{
+ FcPmBreackerContext& ctx(*(FcPmBreackerContext*)_ctx);
+ if (!ctx.dataAvailable)
+ return false;
+
+ if (ctx.frameRGBSize == 0)
+ {
+ //#todo should optimize not convert the whole image
+ if (! ctx.convertYUV420ToRGB565())
+ return false;
+ }
+
+ imgIdxes.clear();
+ size_t offset = 0;
+
+ cv::Mat rgbMat(cv::Size(ctx.width, ctx.height), CV_16UC1, 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 roiMat1(rgbMat, cv::Rect(faceRect.leftTop.x, faceRect.leftTop.y, faceRect.rightBottom.x - faceRect.leftTop.x, faceRect.rightBottom.y - faceRect.leftTop.y));
+ cv::Mat roiMat(roiMat1.clone()); // #todo copy data should be avoid!!!!
+
+ NativeImgIdx imgidx;
+ imgidx.offset = offset;
+ imgidx.size = roiMat.total() * roiMat.elemSize();
+ imgidx.type = MB_Frame::MBFT_RGB565;
+ imgidx.width = roiMat.cols;
+ imgidx.height = roiMat.rows;
+
+ const size_t newSize = imgidx.offset + imgidx.size;
+
+ //isContinuous
+ if (newSize > buffImgMaxSize)
+ {
+ LOG_ERROR << "FaceCache::getFaceListImage buffImgMaxSize truncated" << LOG_ENDL;
+ return false;
+ }
+
+ /*
+ uint8_t* pbuf = buffImg + imgidx.offset;
+ uint8_t* psrc = ctx.frameRGB + (ctx.width * faceRect.leftTop.y + faceRect.leftTop.x) * 2;
+ for (int row = 0; row < faceRect.height(); row++)
+ {
+ memcpy(pbuf, psrc, imgidx.width * 2);
+ pbuf += imgidx.width * 2;
+ psrc += ctx.width * 2;
+ }
+ */
+
+ uint8_t* pbuf = buffImg + imgidx.offset;
+ memcpy(pbuf, roiMat.ptr(), imgidx.size);
+
+ //{
+ // static size_t f = 0;
+ // char fname[50];
+ // sprintf(fname, "/sdcard/face-%u.rgb565", ++f);
+ // FILE *pFile = fopen(fname, "wb");
+ // fwrite(pbuf, 1, imgidx.size, pFile);
+ // fclose(pFile);
+ // if (f > 20)exit(0);
+ //}
+
+ imgIdxes.push_back(imgidx);
+ offset = newSize;
+ }
+
+ buffImgMaxSize = offset;
+ return true;
+}
+
+#endif
--
Gitblit v1.8.0