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

Merge 7d0fec4859 into 9e18169959

Browse Source
This commit is contained in:
Kumataro 2025-06-04 20:58:28 -03:00 committed by GitHub
commit e135cc6540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/imgproc/src/demosaicing.cpp
View File

@ -1075,20 +1075,8 @@ static void Bayer2RGB_( const Mat& srcmat, Mat& dstmat, int code )
/////////////////// Demosaicing using Variable Number of Gradients ///////////////////////
static void Bayer2RGB_VNG_8u( const Mat& _srcmat, Mat& dstmat, int code )
static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code )
{
// for too small images use the simple interpolation algorithm
if( MIN(_srcmat.size().width, _srcmat.size().height) < 8 )
{
Bayer2RGB_<uchar, SIMDBayerInterpolator_8u>( _srcmat, dstmat, code );
return;
}
// VNG uses a 5x5 filter to calculate the gradient around the target pixel.
// To make it simple for edge pixels, 2 pixel paddings are added using reflection.
cv::Mat srcmat;
copyMakeBorder(_srcmat, srcmat, 2, 2, 2, 2, BORDER_REFLECT_101);
const uchar* bayer = srcmat.ptr();
int bstep = (int)srcmat.step;
uchar* dst = dstmat.ptr();
@ -1098,6 +1086,13 @@ static void Bayer2RGB_VNG_8u( const Mat& _srcmat, Mat& dstmat, int code )
int blueIdx = code == COLOR_BayerBG2BGR_VNG || code == COLOR_BayerGB2BGR_VNG ? 0 : 2;
bool greenCell0 = code != COLOR_BayerBG2BGR_VNG && code != COLOR_BayerRG2BGR_VNG;
// for too small images use the simple interpolation algorithm
if( MIN(size.width, size.height) < 8 )
{
Bayer2RGB_<uchar, SIMDBayerInterpolator_8u>( srcmat, dstmat, code );
return;
}
const int brows = 3, bcn = 7;
int N = size.width, N2 = N*2, N3 = N*3, N4 = N*4, N5 = N*5, N6 = N*6, N7 = N*7;
int i, bufstep = N7*bcn;
@ -1106,7 +1101,7 @@ static void Bayer2RGB_VNG_8u( const Mat& _srcmat, Mat& dstmat, int code )
for( int y = 2; y < size.height - 2; y++ )
{
uchar* dstrow = dst + dststep*(y - 2); // srcmat has 2 pixel paddings, but dstmat has no padding.
uchar* dstrow = dst + dststep*y + 6;
const uchar* srow;
for( int dy = (y == 2 ? -1 : 1); dy <= 1; dy++ )
@ -1588,9 +1583,24 @@ static void Bayer2RGB_VNG_8u( const Mat& _srcmat, Mat& dstmat, int code )
}
while( i < N - 2 );
// fill the last and the first pixels of row accordingly
for( i = 0; i < 6; i++ )
{
dst[dststep*y + 5 - i] = dst[dststep*y + 8 - i];
dst[dststep*y + (N - 2)*3 + i] = dst[dststep*y + (N - 3)*3 + i];
}
greenCell0 = !greenCell0;
blueIdx ^= 2;
}
// filling the first and the last rows
for( i = 0; i < size.width*3; i++ )
{
dst[i] = dst[i + dststep] = dst[i + dststep*2];
dst[i + dststep*(size.height-2)] =
dst[i + dststep*(size.height-1)] = dst[i + dststep*(size.height-3)];
}
}
//////////////////////////////// Edge-Aware Demosaicing //////////////////////////////////

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

@ -1921,8 +1921,8 @@ TEST_P(Imgproc_ColorBayerVNG_Codes, regression27225)
cv::Mat out;
EXPECT_NO_THROW(cv::cvtColor(in, out, codeVNG));
for(int iy=0; iy < out.size().height; iy++) {
for(int ix=0; ix < out.size().width; ix++) {
for(int iy=2; iy < out.size().height-2; iy++) {
for(int ix=2; ix < out.size().width-2; ix++) {
// Avoid to test around main diagonal pixels.
if(cv::abs(ix - iy) < margin) {
continue;
@ -1951,8 +1951,6 @@ TEST_P(Imgproc_ColorBayerVNG_Codes, regression27225_small)
Mat diff;
absdiff(outVNG, outINT, diff);
imwrite("outVNG.png", outVNG);
imwrite("outINT.png", outINT);
EXPECT_EQ(0, countNonZero(diff.reshape(1) > 1));
}