Skip to content

O
opencv
Commit 0293912e authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Parallel version of YUV->RGB conversion for Android camera

parent 30f9710d
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 138 deletions
modules/highgui/src/cap_android.cpp
View file @ 0293912e
...@@ -117,9 +117,7 @@ private: ...@@ -117,9 +117,7 @@ private:
void prepareCacheForYUV420i(int width, int height); void prepareCacheForYUV420i(int width, int height);
static bool convertYUV420i2Grey(int width, int height, const unsigned char* yuv, cv::Mat& resmat); 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 convertYUV420i2BGR888(int width, int height, const unsigned char* yuv, cv::Mat& resmat, bool inRGBorder);
static bool convertYUV420i2RGB888(int width, int height, const unsigned char* yuv, cv::Mat& resmat);
friend class HighguiAndroidCameraActivity; friend class HighguiAndroidCameraActivity;
}; };
...@@ -356,7 +354,7 @@ IplImage* CvCapture_Android::retrieveFrame( int outputType ) ...@@ -356,7 +354,7 @@ IplImage* CvCapture_Android::retrieveFrame( int outputType )
{ {
case CV_CAP_ANDROID_COLOR_FRAME: case CV_CAP_ANDROID_COLOR_FRAME:
if (!m_hasColor) 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; return NULL;
image = m_frameColor.getIplImagePtr(); image = m_frameColor.getIplImagePtr();
break; break;
...@@ -368,7 +366,7 @@ IplImage* CvCapture_Android::retrieveFrame( int outputType ) ...@@ -368,7 +366,7 @@ IplImage* CvCapture_Android::retrieveFrame( int outputType )
break; break;
case CV_CAP_ANDROID_COLOR_FRAME_RGB: case CV_CAP_ANDROID_COLOR_FRAME_RGB:
if (!m_hasColor) 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; return NULL;
image = m_frameColor.getIplImagePtr(); image = m_frameColor.getIplImagePtr();
break; break;
...@@ -459,80 +457,64 @@ bool CvCapture_Android::convertYUV420i2Grey(int width, int height, const unsigne ...@@ -459,80 +457,64 @@ bool CvCapture_Android::convertYUV420i2Grey(int width, int height, const unsigne
return !resmat.empty(); return !resmat.empty();
} }
bool CvCapture_Android::convertYUV420i2BGR888(int width, int height, const unsigned char* yuv, cv::Mat& resmat) template<int R>
struct YUV420i2BGR888Invoker
{ {
if (yuv == 0) return false; cv::Mat& dst;
CV_Assert(width % 2 == 0 && height % 2 == 0); unsigned char* my1, *muv;
int width;
resmat.create(height, width, CV_8UC3);
YUV420i2BGR888Invoker(cv::Mat& _dst, int _width, unsigned char* _y1, unsigned char* _uv)
unsigned char* y1 = (unsigned char*)yuv; : dst(_dst), my1(_y1), muv(_uv), width(_width) {}
unsigned char* uv = y1 + width * height;
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) //B = 1.164(Y - 16) + 2.018(U - 128)
//R = 1.164(Y - 16) + 1.596(V - 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* y1 = my1 + range.begin() * width, *uv = muv + range.begin() * width / 2;
unsigned char* row1 = resmat.ptr<unsigned char>(j);
unsigned char* row2 = resmat.ptr<unsigned char>(j+1); for (int j = range.begin(); j < range.end(); j+=2, y1+=width*2, uv+=width)
unsigned char* y2 = y1 + width; {
unsigned char* row1 = dst.ptr<unsigned char>(j);
for(int i = 0; i < width; i+=2,row1+=6,row2+=6) unsigned char* row2 = dst.ptr<unsigned char>(j+1);
{ unsigned char* y2 = y1 + width;
// unsigned char cr = uv[i];
// unsigned char cb = uv[i+1]; for(int i = 0; i < width; i+=2,row1+=6,row2+=6)
{
// row1[0] = y1[i]; int cr = uv[i] - 128;
// row1[1] = cr; int cb = uv[i+1] - 128;
// row1[2] = cb;
int ruv = 409 * cr + 128;
// row1[3] = y1[i+1]; int guv = 128 - 100 * cb - 208 * cr;
// row1[4] = cr; int buv = 516 * cb + 128;
// row1[5] = cb;
int y00 = (y1[i] - 16) * 298;
// row2[0] = y2[i]; row1[0+R] = clamp((y00 + buv) >> 8);
// row2[1] = cr; row1[1] = clamp((y00 + guv) >> 8);
// row2[2] = cb; row1[2-R] = clamp((y00 + ruv) >> 8);
// row2[3] = y2[i+1]; int y01 = (y1[i+1] - 16) * 298;
// row2[4] = cr; row1[3+R] = clamp((y01 + buv) >> 8);
// row2[5] = cb; row1[4] = clamp((y01 + guv) >> 8);
row1[5-R] = clamp((y01 + ruv) >> 8);
int cr = uv[i] - 128;
int cb = uv[i+1] - 128; int y10 = (y2[i] - 16) * 298;
row2[0+R] = clamp((y10 + buv) >> 8);
int ruv = 409 * cr + 128; row2[1] = clamp((y10 + guv) >> 8);
int guv = 128 - 100 * cb - 208 * cr; row2[2-R] = clamp((y10 + ruv) >> 8);
int buv = 516 * cb + 128;
int y11 = (y2[i+1] - 16) * 298;
int y00 = (y1[i] - 16) * 298; row2[3+R] = clamp((y11 + buv) >> 8);
row1[0] = clamp((y00 + buv) >> 8); row2[4] = clamp((y11 + guv) >> 8);
row1[1] = clamp((y00 + guv) >> 8); row2[5-R] = clamp((y11 + ruv) >> 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();
}
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; if (yuv == 0) return false;
CV_Assert(width % 2 == 0 && height % 2 == 0); CV_Assert(width % 2 == 0 && height % 2 == 0);
...@@ -542,70 +524,14 @@ bool CvCapture_Android::convertYUV420i2RGB888(int width, int height, const unsig ...@@ -542,70 +524,14 @@ bool CvCapture_Android::convertYUV420i2RGB888(int width, int height, const unsig
unsigned char* y1 = (unsigned char*)yuv; unsigned char* y1 = (unsigned char*)yuv;
unsigned char* uv = y1 + width * height; unsigned char* uv = y1 + width * height;
//B = 1.164(Y - 16) + 2.018(U - 128) if (inRGBorder)
//G = 1.164(Y - 16) - 0.813(V - 128) - 0.391(U - 128) cv::parallel_for(cv::BlockedRange(0, height, 2), YUV420i2BGR888Invoker<0>(resmat, width, y1, uv));
//R = 1.164(Y - 16) + 1.596(V - 128) else
cv::parallel_for(cv::BlockedRange(0, height, 2), YUV420i2BGR888Invoker<2>(resmat, width, y1, uv));
for (int j = 0; j < height; j+=2, y1+=width*2, uv+=width)
{
unsigned char* row1 = resmat.ptr<unsigned char>(j);
unsigned char* row2 = resmat.ptr<unsigned char>(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);
}
}
return !resmat.empty(); return !resmat.empty();
} }
CvCapture* cvCreateCameraCapture_Android( int cameraId ) CvCapture* cvCreateCameraCapture_Android( int cameraId )
{ {
CvCapture_Android* capture = new CvCapture_Android(cameraId); CvCapture_Android* capture = new CvCapture_Android(cameraId);
......
modules/highgui/src/precomp.hpp
View file @ 0293912e
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
#pragma warning( disable: 4251 ) #pragma warning( disable: 4251 )
#endif #endif
#include "cvconfig.h"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/highgui/highgui_c.h" #include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
...@@ -58,7 +60,6 @@ ...@@ -58,7 +60,6 @@
#include <ctype.h> #include <ctype.h>
#include <assert.h> #include <assert.h>
#include "cvconfig.h"
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment