mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13668 from alalek:imgproc_rgb2yuv_regression

Browse Source
This commit is contained in:
Alexander Alekhin 2019-01-21 18:10:25 +00:00
commit 20d82cf6d5
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/imgproc/src/color_yuv.cpp
View File

@ -446,8 +446,8 @@ struct RGB2YCrCb_i<uchar>
swap(sr0, sb0); swap(sr1, sb1); swap(sr0, sb0); swap(sr1, sb1);
} }
v_uint32 cr00, cr01, cr10, cr11; v_int32 cr00, cr01, cr10, cr11;
v_uint32 cb00, cb01, cb10, cb11; v_int32 cb00, cb01, cb10, cb11;
// delta + descaleShift == descaleShift*(half*2+1) // delta + descaleShift == descaleShift*(half*2+1)
{ {
@ -460,15 +460,15 @@ struct RGB2YCrCb_i<uchar>
v_zip(sb0, vdescale, bd00, bd01); v_zip(sb0, vdescale, bd00, bd01);
v_zip(sb1, vdescale, bd10, bd11); v_zip(sb1, vdescale, bd10, bd11);
cr00 = v_reinterpret_as_u32(v_dotprod(rd00, c3h)); cr00 = v_dotprod(rd00, c3h);
cr01 = v_reinterpret_as_u32(v_dotprod(rd01, c3h)); cr01 = v_dotprod(rd01, c3h);
cr10 = v_reinterpret_as_u32(v_dotprod(rd10, c3h)); cr10 = v_dotprod(rd10, c3h);
cr11 = v_reinterpret_as_u32(v_dotprod(rd11, c3h)); cr11 = v_dotprod(rd11, c3h);
cb00 = v_reinterpret_as_u32(v_dotprod(bd00, c4h)); cb00 = v_dotprod(bd00, c4h);
cb01 = v_reinterpret_as_u32(v_dotprod(bd01, c4h)); cb01 = v_dotprod(bd01, c4h);
cb10 = v_reinterpret_as_u32(v_dotprod(bd10, c4h)); cb10 = v_dotprod(bd10, c4h);
cb11 = v_reinterpret_as_u32(v_dotprod(bd11, c4h)); cb11 = v_dotprod(bd11, c4h);
} }
v_uint8 cr, cb; v_uint8 cr, cb;
@ -483,12 +483,12 @@ struct RGB2YCrCb_i<uchar>
cb10 = cb10 >> shift; cb10 = cb10 >> shift;
cb11 = cb11 >> shift; cb11 = cb11 >> shift;
v_uint16 cr0, cr1, cb0, cb1; v_int16 cr0, cr1, cb0, cb1;
cr0 = v_pack(cr00, cr01); cr1 = v_pack(cr10, cr11); cr0 = v_pack(cr00, cr01); cr1 = v_pack(cr10, cr11);
cb0 = v_pack(cb00, cb01); cb1 = v_pack(cb10, cb11); cb0 = v_pack(cb00, cb01); cb1 = v_pack(cb10, cb11);
cr = v_pack(cr0, cr1); cr = v_pack_u(cr0, cr1);
cb = v_pack(cb0, cb1); cb = v_pack_u(cb0, cb1);
if(yuvOrder) if(yuvOrder)
{ {

10
modules/imgproc/test/test_color.cpp
View File

@ -3062,4 +3062,14 @@ TEST(ImgProc_BGR2RGBA, 3ch24ch)
EXPECT_DOUBLE_EQ(cvtest::norm(expected - dst, NORM_INF), 0.); EXPECT_DOUBLE_EQ(cvtest::norm(expected - dst, NORM_INF), 0.);
} }
TEST(ImgProc_RGB2YUV, regression_13668)
{
Mat src(Size(32, 4), CV_8UC3, Scalar(9, 250, 82)); // Ensure that SIMD code path works
Mat dst;
cvtColor(src, dst, COLOR_RGB2YUV);
Vec3b res = dst.at<Vec3b>(0, 0);
Vec3b ref(159, 90, 0);
EXPECT_EQ(res, ref);
}
}} // namespace }} // namespace