From 5e9814a090f20c2b9c39d6efdc9a732b6097ee7d Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 20:12:53 +0800
Subject: [PATCH] aaa

---
 RtspFace/PL_Paint.cpp |   33 ++++++++-------------------------
 1 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/RtspFace/PL_Paint.cpp b/RtspFace/PL_Paint.cpp
index c6fb45c..acfd90c 100644
--- a/RtspFace/PL_Paint.cpp
+++ b/RtspFace/PL_Paint.cpp
@@ -308,7 +308,7 @@
 #endif
 }
 
-bool plplExecutor_YUV(PL_Paint_Internal *in)
+bool plpl_executor(PL_Paint_Internal *in)
 {
 	MB_Frame* paintMb = &(in->lastMbfBuffOrigin);
 	int ret = true;
@@ -426,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;
 }
@@ -435,29 +435,12 @@
 {
 	PL_Paint_Internal* in = (PL_Paint_Internal*)internal;
 	in->payError = true;
-
-    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;
-    switch(frame->type)
-    {
-        case MB_Frame::MBFT_YUV420:
-        case MB_Frame::MBFT_NV12:
-        case MB_Frame::MBFT_RGB565:
-            pm.breake(PipeMaterial::PMT_FRAME, MB_Frame::MBFT_RGB565, PL_Paint::pay_breaker_MBFT, in);
-            return !(in->payError);
-        default:
-            LOG_ERROR << "Only support MBFT_YUV420 / MBFT_NV12 / MBFT_RGB565" << LOG_ENDL;
-            in->payError = true;
-            break;
-    }
+	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);
 
 	return !(in->payError);
 }

--
Gitblit v1.8.0