From 0293912ea4d1e7ea0f07a53b960b3460441cca91 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 16 May 2011 14:14:06 +0000 Subject: [PATCH] Parallel version of YUV->RGB conversion for Android camera --- modules/highgui/src/cap_android.cpp | 200 ++++++++++++------------------------ modules/highgui/src/precomp.hpp | 3 +- 2 files changed, 65 insertions(+), 138 deletions(-) diff --git a/modules/highgui/src/cap_android.cpp b/modules/highgui/src/cap_android.cpp index b6c3f63..4f4296b 100644 --- a/modules/highgui/src/cap_android.cpp +++ b/modules/highgui/src/cap_android.cpp @@ -117,9 +117,7 @@ private: void prepareCacheForYUV420i(int width, int height); static bool convertYUV420i2Grey(int width, int height, const unsigned char* yuv, cv::Mat& resmat); - static bool convertYUV420i2BGR888(int width, int height, const unsigned char* yuv, cv::Mat& resmat); - static bool convertYUV420i2RGB888(int width, int height, const unsigned char* yuv, cv::Mat& resmat); - + static bool convertYUV420i2BGR888(int width, int height, const unsigned char* yuv, cv::Mat& resmat, bool inRGBorder); friend class HighguiAndroidCameraActivity; }; @@ -356,7 +354,7 @@ IplImage* CvCapture_Android::retrieveFrame( int outputType ) { case CV_CAP_ANDROID_COLOR_FRAME: if (!m_hasColor) - if (!(m_hasColor = convertYUV420i2BGR888(m_width, m_height, current_frameYUV420i, m_frameColor.mat))) + if (!(m_hasColor = convertYUV420i2BGR888(m_width, m_height, current_frameYUV420i, m_frameColor.mat, false))) return NULL; image = m_frameColor.getIplImagePtr(); break; @@ -368,7 +366,7 @@ IplImage* CvCapture_Android::retrieveFrame( int outputType ) break; case CV_CAP_ANDROID_COLOR_FRAME_RGB: if (!m_hasColor) - if (!(m_hasColor = convertYUV420i2RGB888(m_width, m_height, current_frameYUV420i, m_frameColor.mat))) + if (!(m_hasColor = convertYUV420i2BGR888(m_width, m_height, current_frameYUV420i, m_frameColor.mat, true))) return NULL; image = m_frameColor.getIplImagePtr(); break; @@ -459,80 +457,64 @@ bool CvCapture_Android::convertYUV420i2Grey(int width, int height, const unsigne return !resmat.empty(); } -bool CvCapture_Android::convertYUV420i2BGR888(int width, int height, const unsigned char* yuv, cv::Mat& resmat) +template +struct YUV420i2BGR888Invoker { - if (yuv == 0) return false; - CV_Assert(width % 2 == 0 && height % 2 == 0); - - resmat.create(height, width, CV_8UC3); - - unsigned char* y1 = (unsigned char*)yuv; - unsigned char* uv = y1 + width * height; - - //B = 1.164(Y - 16) + 2.018(U - 128) - //G = 1.164(Y - 16) - 0.813(V - 128) - 0.391(U - 128) - //R = 1.164(Y - 16) + 1.596(V - 128) - - for (int j = 0; j < height; j+=2, y1+=width*2, uv+=width) - { - unsigned char* row1 = resmat.ptr(j); - unsigned char* row2 = resmat.ptr(j+1); - unsigned char* y2 = y1 + width; - - for(int i = 0; i < width; i+=2,row1+=6,row2+=6) - { -// unsigned char cr = uv[i]; -// unsigned char cb = uv[i+1]; - -// row1[0] = y1[i]; -// row1[1] = cr; -// row1[2] = cb; - -// row1[3] = y1[i+1]; -// row1[4] = cr; -// row1[5] = cb; - -// row2[0] = y2[i]; -// row2[1] = cr; -// row2[2] = cb; - -// row2[3] = y2[i+1]; -// row2[4] = cr; -// row2[5] = cb; - - int cr = uv[i] - 128; - int cb = uv[i+1] - 128; - - int ruv = 409 * cr + 128; - int guv = 128 - 100 * cb - 208 * cr; - int buv = 516 * cb + 128; - - int y00 = (y1[i] - 16) * 298; - row1[0] = clamp((y00 + buv) >> 8); - row1[1] = clamp((y00 + guv) >> 8); - row1[2] = clamp((y00 + ruv) >> 8); - - int y01 = (y1[i+1] - 16) * 298; - row1[3] = clamp((y01 + buv) >> 8); - row1[4] = clamp((y01 + guv) >> 8); - row1[5] = clamp((y01 + ruv) >> 8); - - int y10 = (y2[i] - 16) * 298; - row2[0] = clamp((y10 + buv) >> 8); - row2[1] = clamp((y10 + guv) >> 8); - row2[2] = clamp((y10 + ruv) >> 8); - - int y11 = (y2[i+1] - 16) * 298; - row2[3] = clamp((y11 + buv) >> 8); - row2[4] = clamp((y11 + guv) >> 8); - row2[5] = clamp((y11 + ruv) >> 8); - } - } - - return !resmat.empty(); -} + cv::Mat& dst; + unsigned char* my1, *muv; + int width; + + YUV420i2BGR888Invoker(cv::Mat& _dst, int _width, unsigned char* _y1, unsigned char* _uv) + : dst(_dst), my1(_y1), muv(_uv), width(_width) {} + + void operator()(const cv::BlockedRange& range) const + { + //B = 1.164(Y - 16) + 2.018(U - 128) + //G = 1.164(Y - 16) - 0.813(V - 128) - 0.391(U - 128) + //R = 1.164(Y - 16) + 1.596(V - 128) + + unsigned char* y1 = my1 + range.begin() * width, *uv = muv + range.begin() * width / 2; + + for (int j = range.begin(); j < range.end(); j+=2, y1+=width*2, uv+=width) + { + unsigned char* row1 = dst.ptr(j); + unsigned char* row2 = dst.ptr(j+1); + unsigned char* y2 = y1 + width; + + for(int i = 0; i < width; i+=2,row1+=6,row2+=6) + { + int cr = uv[i] - 128; + int cb = uv[i+1] - 128; + + int ruv = 409 * cr + 128; + int guv = 128 - 100 * cb - 208 * cr; + int buv = 516 * cb + 128; + + int y00 = (y1[i] - 16) * 298; + row1[0+R] = clamp((y00 + buv) >> 8); + row1[1] = clamp((y00 + guv) >> 8); + row1[2-R] = clamp((y00 + ruv) >> 8); + + int y01 = (y1[i+1] - 16) * 298; + row1[3+R] = clamp((y01 + buv) >> 8); + row1[4] = clamp((y01 + guv) >> 8); + row1[5-R] = clamp((y01 + ruv) >> 8); + + int y10 = (y2[i] - 16) * 298; + row2[0+R] = clamp((y10 + buv) >> 8); + row2[1] = clamp((y10 + guv) >> 8); + row2[2-R] = clamp((y10 + ruv) >> 8); + + int y11 = (y2[i+1] - 16) * 298; + row2[3+R] = clamp((y11 + buv) >> 8); + row2[4] = clamp((y11 + guv) >> 8); + row2[5-R] = clamp((y11 + ruv) >> 8); + } + } + } +}; -bool CvCapture_Android::convertYUV420i2RGB888(int width, int height, const unsigned char* yuv, cv::Mat& resmat) ///TODO: FIXME: copiued from BGR variant +bool CvCapture_Android::convertYUV420i2BGR888(int width, int height, const unsigned char* yuv, cv::Mat& resmat, bool inRGBorder) { if (yuv == 0) return false; CV_Assert(width % 2 == 0 && height % 2 == 0); @@ -542,70 +524,14 @@ bool CvCapture_Android::convertYUV420i2RGB888(int width, int height, const unsig unsigned char* y1 = (unsigned char*)yuv; unsigned char* uv = y1 + width * height; - //B = 1.164(Y - 16) + 2.018(U - 128) - //G = 1.164(Y - 16) - 0.813(V - 128) - 0.391(U - 128) - //R = 1.164(Y - 16) + 1.596(V - 128) - - for (int j = 0; j < height; j+=2, y1+=width*2, uv+=width) - { - unsigned char* row1 = resmat.ptr(j); - unsigned char* row2 = resmat.ptr(j+1); - unsigned char* y2 = y1 + width; - - for(int i = 0; i < width; i+=2,row1+=6,row2+=6) - { -// unsigned char cr = uv[i]; -// unsigned char cb = uv[i+1]; - -// row1[0] = y1[i]; -// row1[1] = cr; -// row1[2] = cb; - -// row1[3] = y1[i+1]; -// row1[4] = cr; -// row1[5] = cb; - -// row2[0] = y2[i]; -// row2[1] = cr; -// row2[2] = cb; - -// row2[3] = y2[i+1]; -// row2[4] = cr; -// row2[5] = cb; - - int cr = uv[i] - 128; - int cb = uv[i+1] - 128; - - int buv = 409 * cr + 128; - int guv = 128 - 100 * cb - 208 * cr; - int ruv = 516 * cb + 128; - - int y00 = (y1[i] - 16) * 298; - row1[0] = clamp((y00 + buv) >> 8); - row1[1] = clamp((y00 + guv) >> 8); - row1[2] = clamp((y00 + ruv) >> 8); - - int y01 = (y1[i+1] - 16) * 298; - row1[3] = clamp((y01 + buv) >> 8); - row1[4] = clamp((y01 + guv) >> 8); - row1[5] = clamp((y01 + ruv) >> 8); - - int y10 = (y2[i] - 16) * 298; - row2[0] = clamp((y10 + buv) >> 8); - row2[1] = clamp((y10 + guv) >> 8); - row2[2] = clamp((y10 + ruv) >> 8); - - int y11 = (y2[i+1] - 16) * 298; - row2[3] = clamp((y11 + buv) >> 8); - row2[4] = clamp((y11 + guv) >> 8); - row2[5] = clamp((y11 + ruv) >> 8); - } - } + if (inRGBorder) + cv::parallel_for(cv::BlockedRange(0, height, 2), YUV420i2BGR888Invoker<0>(resmat, width, y1, uv)); + else + cv::parallel_for(cv::BlockedRange(0, height, 2), YUV420i2BGR888Invoker<2>(resmat, width, y1, uv)); return !resmat.empty(); } - CvCapture* cvCreateCameraCapture_Android( int cameraId ) { CvCapture_Android* capture = new CvCapture_Android(cameraId); diff --git a/modules/highgui/src/precomp.hpp b/modules/highgui/src/precomp.hpp index da53711..2c58838 100644 --- a/modules/highgui/src/precomp.hpp +++ b/modules/highgui/src/precomp.hpp @@ -46,6 +46,8 @@ #pragma warning( disable: 4251 ) #endif +#include "cvconfig.h" + #include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui_c.h" #include "opencv2/imgproc/imgproc_c.h" @@ -58,7 +60,6 @@ #include #include -#include "cvconfig.h" #if defined WIN32 || defined _WIN32 #define WIN32_LEAN_AND_MEAN -- 2.7.4