generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace uyvy_to_rgb24 by tested and conformant cvtColor

Browse Source
This commit is contained in:
Pavel Rojtberg 2015-10-31 23:56:15 +01:00
parent ad68b79630
commit 05f52b697f
1 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/videoio/src/cap_v4l.cpp
View File

@ -1066,60 +1066,17 @@ yuv411p_to_rgb24(int width, int height,
} }
/* convert from 4:2:2 YUYV interlaced to RGB24 */ /* convert from 4:2:2 YUYV interlaced to RGB24 */
/* based on ccvt_yuyv_bgr32() from camstream */
#define SAT(c) \
if (c & (~255)) { if (c < 0) c = 0; else c = 255; }
static void static void
yuyv_to_rgb24(int width, int height, unsigned char* src, unsigned char* dst) { yuyv_to_rgb24(int width, int height, unsigned char* src, unsigned char* dst) {
cvtColor(Mat(height, width, CV_8UC2, src), Mat(height, width, CV_8UC3, dst), cvtColor(Mat(height, width, CV_8UC2, src), Mat(height, width, CV_8UC3, dst),
COLOR_YUV2BGR_YUYV); COLOR_YUV2BGR_YUYV);
} }
static void static inline void
uyvy_to_rgb24 (int width, int height, unsigned char *src, unsigned char *dst) uyvy_to_rgb24 (int width, int height, unsigned char *src, unsigned char *dst)
{ {
unsigned char *s; cvtColor(Mat(height, width, CV_8UC2, src), Mat(height, width, CV_8UC3, dst),
unsigned char *d; COLOR_YUV2BGR_UYVY);
int l, c;
int r, g, b, cr, cg, cb, y1, y2;
l = height;
s = src;
d = dst;
while (l--) {
c = width >> 1;
while (c--) {
cb = ((*s - 128) * 454) >> 8;
cg = (*s++ - 128) * 88;
y1 = *s++;
cr = ((*s - 128) * 359) >> 8;
cg = (cg + (*s++ - 128) * 183) >> 8;
y2 = *s++;
r = y1 + cr;
b = y1 + cb;
g = y1 - cg;
SAT(r);
SAT(g);
SAT(b);
*d++ = b;
*d++ = g;
*d++ = r;
r = y2 + cr;
b = y2 + cb;
g = y2 - cg;
SAT(r);
SAT(g);
SAT(b);
*d++ = b;
*d++ = g;
*d++ = r;
}
}
} }
#ifdef HAVE_JPEG #ifdef HAVE_JPEG