From c7caa54d8d58af6159f2c758ad5d6687d461a333 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 10:53:23 +0800
Subject: [PATCH]
---
RtspFace/PL_Paint.cpp | 157 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 117 insertions(+), 40 deletions(-)
diff --git a/RtspFace/PL_Paint.cpp b/RtspFace/PL_Paint.cpp
index e9318aa..acfd90c 100644
--- a/RtspFace/PL_Paint.cpp
+++ b/RtspFace/PL_Paint.cpp
@@ -2,15 +2,34 @@
#include "MaterialBuffer.h"
#include "logger.h"
#include "MediaHelper.h"
-#include "CvUtil/CvxText.h"
#include <string.h> // for memcpy
#include <opencv2/core/mat.hpp>
#include <opencv2/imgproc.hpp>
+#ifdef ENABLE_WTEXT
+#include "CvUtil/CvxText.h"
+#endif
-~PLPLContext::PLPLContext()
+PLPLType::PLPLType(const char* _val_s)
{
- delete (CvxText*)cvxText;
+ for (int i = 0; i < sizeof(val_s); i++)
+ val_s[i] = _val_s[i];
+}
+
+PLPLType::PLPLType(const wchar_t* _val_s)
+{
+ //wchar_t* w_val_s = (wchar_t*)val_s;
+ //for (int i = 0; i < sizeof(val_s) / sizeof(wchar_t); i++)
+ // w_val_s[i] = _val_s[i];
+
+ memcpy(val_s, _val_s, sizeof(val_s));
+}
+
+PLPLContext::~PLPLContext()
+{
+#ifdef ENABLE_WTEXT
+ delete (CvxText*)cvxText;
cvxText = nullptr;
+#endif
}
struct PL_Paint_Internal
@@ -85,17 +104,13 @@
in->config = *config;
}
- if(in->config.plplCtx->cvxText != nullptr)
+#ifdef ENABLE_WTEXT
+ if(in->config.plplCtx->cvxText != nullptr)
{
delete (CvxText*)in->config.plplCtx->cvxText;
}
-
- if(in->config.fontPath.empty())
- {
- LOG_ERROR << "fontPath is null!" << LOG_ENDL;
- return false;
- }
- else if (in->config.fontPath == " ")
+
+ if(!in->config.fontPath.empty())
{
CvxText* cvxText = new CvxText(in->config.fontPath.c_str());
in->config.plplCtx->cvxText = cvxText;
@@ -103,6 +118,7 @@
CvScalar font = cvScalar(40, 1, 0.2, 1);
cvxText->setFont(0, &font);
}
+#endif
return true;
}
@@ -167,6 +183,27 @@
return true;
}
+bool plplDraw_Rect_RGB565(PLPLContext* plplCtx, MB_Frame* paintMb, int& paramOffset)
+{
+ int LTX = plplCtx->params[paramOffset + 0].val_i;
+ int LTY = plplCtx->params[paramOffset + 1].val_i;
+ int RBX = plplCtx->params[paramOffset + 2].val_i;
+ int RBY = plplCtx->params[paramOffset + 3].val_i;
+ paramOffset += 4;
+
+ int src_width = paintMb->width;
+ int src_height = paintMb->height;
+ uint8_t* src_rgb = (uint8_t*)(paintMb->buffer);
+ cv::Mat rgbMat(cv::Size(src_width, src_height), CV_16UC1, src_rgb);
+
+ // void rectangle(Mat& img, Point pt1, Point pt2, const Scalar& color, int thickness=1, int lineType=8, int shift=0)
+
+ const uint16_t RGB565 = plplCtx->color_front.toRGB565();
+ cv::rectangle(rgbMat, cv::Point(LTX, LTY), cv::Point(RBX, RBY), CV_RGB(RGB565, RGB565, RGB565), 4);
+
+ return true;
+}
+
bool plplDraw_Text_YUV420(PLPLContext* plplCtx, MB_Frame* paintMb, int& paramOffset)
{
return false;
@@ -193,13 +230,58 @@
cv::putText(yMat, TXT, cv::Point(LTX, LTY), CV_FONT_HERSHEY_COMPLEX, 1, CV_RGB(Y, Y, Y));
cv::putText(uvMat, TXT, cv::Point(MH_SUBSAMPLE1(LTX, 2), MH_SUBSAMPLE1(LTY, 2)), CV_FONT_HERSHEY_COMPLEX, 0.5, CV_RGB(UV, UV, UV));
-
+
return true;
+}
+
+bool plplDraw_Text_RGB565(PLPLContext* plplCtx, MB_Frame* paintMb, int& paramOffset)
+{
+ int LTX = plplCtx->params[paramOffset + 0].val_i;
+ int LTY = plplCtx->params[paramOffset + 1].val_i;
+ const char* TXT = plplCtx->params[paramOffset + 2].val_s;
+ paramOffset += 3;
+
+ int src_width = paintMb->width;
+ int src_height = paintMb->height;
+ uint8_t* src_rgb = (uint8_t*)(paintMb->buffer);
+ cv::Mat rgbMat(cv::Size(src_width, src_height), CV_16UC1, src_rgb);
+
+ const uint16_t RGB565 = plplCtx->color_front.toRGB565();
+ cv::putText(rgbMat, TXT, cv::Point(LTX, LTY), CV_FONT_HERSHEY_COMPLEX, 1, CV_RGB(RGB565, RGB565, RGB565));
+
+ return true;
+}
+
+bool plplDraw_WText_RGB565(PLPLContext* plplCtx, MB_Frame* paintMb, int& paramOffset)
+{
+#ifdef ENABLE_WTEXT
+ int LTX = plplCtx->params[paramOffset + 0].val_i;
+ int LTY = plplCtx->params[paramOffset + 1].val_i;
+ const char* WTXT = plplCtx->params[paramOffset + 2].val_s;
+ paramOffset += 3;
+
+ int src_width = paintMb->width;
+ int src_height = paintMb->height;
+ uint8_t* src_rgb = (uint8_t*)(paintMb->buffer);
+ cv::Mat rgbMat(cv::Size(src_width, src_height), CV_16UC1, src_rgb);
+
+ // void rectangle(Mat& img, Point pt1, Point pt2, const Scalar& color, int thickness=1, int lineType=8, int shift=0)
+
+ const uint16_t RGB565 = plplCtx->color_front.toRGB565();
+
+ CvxText* cvText = (CvxText*)plplCtx->cvxText;
+ cvText->putText(rgbMat, (const wchar_t*)WTXT, cv::Point(LTX, LTY), CV_RGB(RGB565, RGB565, RGB565));
+
+ return true;
+#else
+ return false;
+#endif
}
bool plplDraw_WText_NV12(PLPLContext* plplCtx, MB_Frame* paintMb, int& paramOffset)
{
- int LTX = plplCtx->params[paramOffset + 0].val_i;
+#ifdef ENABLE_WTEXT
+ int LTX = plplCtx->params[paramOffset + 0].val_i;
int LTY = plplCtx->params[paramOffset + 1].val_i;
const char* WTXT = plplCtx->params[paramOffset + 2].val_s;
paramOffset += 3;
@@ -215,15 +297,18 @@
const uint16_t Y = plplCtx->color_front.toY();
const uint16_t UV = plplCtx->color_front.toUV();
-
+
CvxText* cvText = (CvxText*)plplCtx->cvxText;
cvText->putText(yMat, (const wchar_t*)WTXT, cv::Point(LTX, LTY), CV_RGB(Y, Y, Y)); // L"涓枃ABCDabcd"
cvText->putText(uvMat, (const wchar_t*)WTXT, cv::Point(MH_SUBSAMPLE1(LTX, 2), MH_SUBSAMPLE1(LTY, 2)), CV_RGB(UV, UV, UV)); // L"涓枃ABCDabcd"
-
+
return true;
+#else
+ return false;
+#endif
}
-bool plplExecutor_YUV(PL_Paint_Internal *in)
+bool plpl_executor(PL_Paint_Internal *in)
{
MB_Frame* paintMb = &(in->lastMbfBuffOrigin);
int ret = true;
@@ -296,6 +381,8 @@
ret = plplDraw_Rect_YUV420(plplCtx, paintMb, paramOffset);
else if (paintMb->type == MB_Frame::MBFT_NV12)
ret = plplDraw_Rect_NV12(plplCtx, paintMb, paramOffset);
+ else if (paintMb->type == MB_Frame::MBFT_RGB565)
+ ret = plplDraw_Rect_RGB565(plplCtx, paintMb, paramOffset);
else
ret = false;
break;
@@ -306,14 +393,18 @@
ret = plplDraw_Text_YUV420(plplCtx, paintMb, paramOffset);
else if (paintMb->type == MB_Frame::MBFT_NV12)
ret = plplDraw_Text_NV12(plplCtx, paintMb, paramOffset);
+ else if (paintMb->type == MB_Frame::MBFT_RGB565)
+ ret = plplDraw_Text_RGB565(plplCtx, paintMb, paramOffset);
else
ret = false;
break;
case PLPLC_WTEXT:
//WTEXT LTX,LTY,"STR"
- if (paintMb->type == MB_Frame::MBFT_NV12)
+ if (paintMb->type == MB_Frame::MBFT_NV12)
ret = plplDraw_WText_NV12(plplCtx, paintMb, paramOffset);
+ else if (paintMb->type == MB_Frame::MBFT_RGB565)
+ ret = plplDraw_WText_RGB565(plplCtx, paintMb, paramOffset);
else
ret = false;
break;
@@ -323,26 +414,10 @@
return ret;
}
-/*static*/ bool PL_Paint::pay_breaker_MBFT_YUV(const PipeMaterial* pm, void* args)
+/*static*/ bool PL_Paint::pay_breaker_MBFT(const PipeMaterial* pm, void* args)
{
PL_Paint_Internal* in = (PL_Paint_Internal*)args;
-
- if (pm->type != PipeMaterial::PMT_FRAME)
- {
- LOG_ERROR << "Only support PMT_FRAME" << LOG_ENDL;
- return false;
- }
-
- if (pm->buffer == nullptr)
- return false;
-
- MB_Frame* frame = (MB_Frame*)pm->buffer;
- if (frame->type != MB_Frame::MBFT_YUV420 && frame->type != MB_Frame::MBFT_NV12)
- {
- LOG_ERROR << "Only support MBFT_YUV420 and MBFT_NV12" << LOG_ENDL;
- in->payError = true;
- return false;
- }
+ MB_Frame* frame = (MB_Frame*)pm->buffer;
in->lastMbfBuffOrigin.type = frame->type;
in->lastMbfBuffOrigin.buffer = frame->buffer;
@@ -351,7 +426,7 @@
in->lastMbfBuffOrigin.height = frame->height;
in->lastMbfBuffOrigin.pts = frame->pts;
- in->payError = !plplExecutor_YUV(in);
+ in->payError = !plpl_executor(in);
return false;
}
@@ -360,11 +435,13 @@
{
PL_Paint_Internal* in = (PL_Paint_Internal*)internal;
in->payError = true;
- pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_YUV420, PL_Paint::pay_breaker_MBFT_YUV, in);
- pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_NV12, PL_Paint::pay_breaker_MBFT_YUV, in);
+ if (in->payError)
+ pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_YUV420, PL_Paint::pay_breaker_MBFT, in);
+ if (in->payError)
+ pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_NV12, PL_Paint::pay_breaker_MBFT, in);
+ if (in->payError)
+ pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_RGB565, PL_Paint::pay_breaker_MBFT, in);
- //#todo support RGB
-
return !(in->payError);
}
--
Gitblit v1.8.0