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

TAPI: stitching: optimize exposure

Browse Source
This commit is contained in:
Alexander Alekhin 2014-02-27 18:09:56 +04:00 committed by Andrey Pavlenko
parent 2737e3c99b
commit 7a5c1babde
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp
View File

@ -97,7 +97,7 @@ public:
private: private:
int bl_width_, bl_height_; int bl_width_, bl_height_;
std::vector<Mat_<float> > gain_maps_; std::vector<UMat> gain_maps_;
}; };
} // namespace detail } // namespace detail

25
modules/stitching/src/exposure_compensate.cpp
View File

@ -208,11 +208,14 @@ void BlocksGainCompensator::feed(const std::vector<Point> &corners, const std::v
for (int img_idx = 0; img_idx < num_images; ++img_idx) for (int img_idx = 0; img_idx < num_images; ++img_idx)
{ {
Size bl_per_img = bl_per_imgs[img_idx]; Size bl_per_img = bl_per_imgs[img_idx];
gain_maps_[img_idx].create(bl_per_img); gain_maps_[img_idx].create(bl_per_img, CV_32F);
for (int by = 0; by < bl_per_img.height; ++by) {
for (int bx = 0; bx < bl_per_img.width; ++bx, ++bl_idx) Mat_<float> gain_map = gain_maps_[img_idx].getMat(ACCESS_WRITE);
gain_maps_[img_idx](by, bx) = static_cast<float>(gains[bl_idx]); for (int by = 0; by < bl_per_img.height; ++by)
for (int bx = 0; bx < bl_per_img.width; ++bx, ++bl_idx)
gain_map(by, bx) = static_cast<float>(gains[bl_idx]);
}
sepFilter2D(gain_maps_[img_idx], gain_maps_[img_idx], CV_32F, ker, ker); sepFilter2D(gain_maps_[img_idx], gain_maps_[img_idx], CV_32F, ker, ker);
sepFilter2D(gain_maps_[img_idx], gain_maps_[img_idx], CV_32F, ker, ker); sepFilter2D(gain_maps_[img_idx], gain_maps_[img_idx], CV_32F, ker, ker);
@ -222,16 +225,16 @@ void BlocksGainCompensator::feed(const std::vector<Point> &corners, const std::v
void BlocksGainCompensator::apply(int index, Point /*corner*/, InputOutputArray _image, InputArray /*mask*/) void BlocksGainCompensator::apply(int index, Point /*corner*/, InputOutputArray _image, InputArray /*mask*/)
{ {
Mat image = _image.getMat(); CV_Assert(_image.type() == CV_8UC3);
CV_Assert(image.type() == CV_8UC3); UMat u_gain_map;
if (gain_maps_[index].size() == _image.size())
Mat_<float> gain_map; u_gain_map = gain_maps_[index];
if (gain_maps_[index].size() == image.size())
gain_map = gain_maps_[index];
else else
resize(gain_maps_[index], gain_map, image.size(), 0, 0, INTER_LINEAR); resize(gain_maps_[index], u_gain_map, _image.size(), 0, 0, INTER_LINEAR);
Mat_<float> gain_map = u_gain_map.getMat(ACCESS_READ);
Mat image = _image.getMat();
for (int y = 0; y < image.rows; ++y) for (int y = 0; y < image.rows; ++y)
{ {
const float* gain_row = gain_map.ptr<float>(y); const float* gain_row = gain_map.ptr<float>(y);