Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

TAPI: stitching: blender: fix OpenCL path & adjust test condition

Browse Source
pull/2565/head
Alexander Alekhin 11 years ago committed by Andrey Pavlenko
parent e6cc1be7e8
commit 026b13b3db
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      modules/stitching/src/opencl/multibandblend.cl
  2. 4
      modules/stitching/test/test_blenders.cpp

8
modules/stitching/src/opencl/multibandblend.cl
Unescape View File

@ -222,7 +222,7 @@
#define workType TYPE(weight_T1, src_CN) #define workType TYPE(weight_T1, src_CN)
#define convertSrcToWorkType CONVERT_TO(workType) #define convertSrcToWorkType CONVERT_TO(workType)
#define convertWorkTypeToDstType CONVERT(workType, dst_T) #define convertToDstType CONVERT_TO(dst_T) // sat_rte provides incompatible results with CPU path
__kernel void feed( __kernel void feed(
DECLARE_MAT_ARG(src), DECLARE_MAT_ARG(weight), DECLARE_MAT_ARG(src), DECLARE_MAT_ARG(weight),
@ -241,7 +241,7 @@ __kernel void feed(
weight_T w = LOAD_MAT_AT(weight, weight_byteOffset); weight_T w = LOAD_MAT_AT(weight, weight_byteOffset);
workType src_value = convertSrcToWorkType(LOAD_MAT_AT(src, src_byteOffset)); workType src_value = convertSrcToWorkType(LOAD_MAT_AT(src, src_byteOffset));
STORE_MAT_AT(dst, dst_byteOffset, LOAD_MAT_AT(dst, dst_byteOffset) + convertWorkTypeToDstType(src_value * w)); STORE_MAT_AT(dst, dst_byteOffset, LOAD_MAT_AT(dst, dst_byteOffset) + convertToDstType(src_value * w));
STORE_MAT_AT(dstWeight, dstWeight_byteOffset, LOAD_MAT_AT(dstWeight, dstWeight_byteOffset) + w); STORE_MAT_AT(dstWeight, dstWeight_byteOffset, LOAD_MAT_AT(dstWeight, dstWeight_byteOffset) + w);
} }
} }
@ -252,7 +252,7 @@ __kernel void feed(
#define workType TYPE(weight_T1, mat_CN) #define workType TYPE(weight_T1, mat_CN)
#define convertSrcToWorkType CONVERT_TO(workType) #define convertSrcToWorkType CONVERT_TO(workType)
#define convertWorkTypeToDstType CONVERT(workType, mat_T) #define convertToDstType CONVERT_TO(mat_T) // sat_rte provides incompatible results with CPU path
#if weight_DEPTH >= CV_32F #if weight_DEPTH >= CV_32F
#define WEIGHT_EPS 1e-5f #define WEIGHT_EPS 1e-5f
@ -275,7 +275,7 @@ __kernel void normalizeUsingWeightMap(
weight_T w = LOAD_MAT_AT(weight, weight_byteOffset); weight_T w = LOAD_MAT_AT(weight, weight_byteOffset);
workType value = convertSrcToWorkType(LOAD_MAT_AT(mat, mat_byteOffset)); workType value = convertSrcToWorkType(LOAD_MAT_AT(mat, mat_byteOffset));
value = value / (w + WEIGHT_EPS); value = value / (w + WEIGHT_EPS);
STORE_MAT_AT(mat, mat_byteOffset, convertWorkTypeToDstType(value)); STORE_MAT_AT(mat, mat_byteOffset, convertToDstType(value));
} }
} }

4
modules/stitching/test/test_blenders.cpp
Unescape View File

@ -73,6 +73,6 @@ TEST(MultiBandBlender, CanBlendTwoImages)
Mat result; result_s.convertTo(result, CV_8U); Mat result; result_s.convertTo(result, CV_8U);
Mat expected = imread(string(cvtest::TS::ptr()->get_data_path()) + "stitching/baboon_lena.png"); Mat expected = imread(string(cvtest::TS::ptr()->get_data_path()) + "stitching/baboon_lena.png");
double rmsErr = cvtest::norm(expected, result, NORM_L2) / sqrt(double(expected.size().area())); double psnr = cvtest::PSNR(expected, result);
ASSERT_LT(rmsErr, 1e-3); EXPECT_GE(psnr, 50);
} }

Write Preview
Loading…
Cancel
Save