-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding extension of calcHist, bug fixes and other suggestions
- Loading branch information
1 parent
7554d15
commit cef8d77
Showing
10 changed files
with
183 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* | ||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
#ifndef OPENCV_FASTCV_HISTOGRAM_HPP | ||
#define OPENCV_FASTCV_HISTOGRAM_HPP | ||
|
||
#include <opencv2/core.hpp> | ||
|
||
namespace cv { | ||
namespace fastcv { | ||
|
||
//! @addtogroup fastcv | ||
//! @{ | ||
|
||
/** | ||
* @brief Calculates histogram of input image. This function implements specific use case of | ||
* 256-bin histogram calculation for 8u single channel images in an optimized way. | ||
* @param _src Intput image with type CV_8UC1 | ||
* @param _hist Output histogram of type int of 256 bins | ||
*/ | ||
CV_EXPORTS_W void calcHist( InputArray _src, OutputArray _hist ); | ||
//! @} | ||
|
||
} // fastcv:: | ||
} // cv:: | ||
|
||
#endif // OPENCV_FASTCV_HISTOGRAM_HPP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
#include "perf_precomp.hpp" | ||
|
||
namespace opencv_test { | ||
|
||
typedef std::tuple<cv::Size> HistogramPerfParams; | ||
typedef perf::TestBaseWithParam<HistogramPerfParams> HistogramPerfTest; | ||
|
||
|
||
PERF_TEST_P(HistogramPerfTest, run, | ||
testing::Values(perf::szQVGA, perf::szVGA, perf::sz720p, perf::sz1080p) | ||
) | ||
{ | ||
auto p = GetParam(); | ||
cv::Size size = std::get<0>(p); | ||
|
||
RNG& rng = cv::theRNG(); | ||
Mat src(size, CV_8UC1); | ||
cvtest::randUni(rng, src, Scalar::all(0), Scalar::all(256)); | ||
Mat hist(1, 256, CV_32SC1); | ||
|
||
for (; next(); ) | ||
{ | ||
startTimer(); | ||
cv::fastcv::calcHist(src, hist); | ||
stopTimer(); | ||
} | ||
|
||
SANITY_CHECK_NOTHING(); | ||
} | ||
|
||
} // namespace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
#include "precomp.hpp" | ||
|
||
namespace cv { | ||
namespace fastcv { | ||
|
||
class FcvHistogramLoop_Invoker : public cv::ParallelLoopBody | ||
{ | ||
public: | ||
|
||
FcvHistogramLoop_Invoker(const uchar * src_data_, size_t src_step_, int width_, int height_, int32_t* gl_hist_, int stripeHeight_, cv::Mutex* histogramLock, int nStripes_): | ||
cv::ParallelLoopBody(), src_data(src_data_), src_step(src_step_), width(width_), height(height_), gl_hist(gl_hist_), stripeHeight(stripeHeight_), histogramLock_(histogramLock), nStripes(nStripes_) | ||
{ | ||
} | ||
|
||
virtual void operator()(const cv::Range& range) const CV_OVERRIDE | ||
{ | ||
int height_ = stripeHeight; | ||
if(range.end == nStripes) | ||
height_ += (height % nStripes); | ||
const uchar* yS = src_data; | ||
int32_t l_hist[256] = {0}; | ||
fcvImageIntensityHistogram(yS, src_step, 0, range.start, width, height_, l_hist); | ||
cv::AutoLock lock(*histogramLock_); | ||
|
||
for( int i = 0; i < 256; i++ ) | ||
gl_hist[i] += l_hist[i]; | ||
} | ||
|
||
private: | ||
const uchar * src_data; | ||
const size_t src_step; | ||
const int width; | ||
const int height; | ||
int32_t *gl_hist; | ||
int ret; | ||
int stripeHeight; | ||
cv::Mutex* histogramLock_; | ||
int nStripes; | ||
|
||
FcvHistogramLoop_Invoker(const FcvHistogramLoop_Invoker &); // = delete; | ||
const FcvHistogramLoop_Invoker& operator= (const FcvHistogramLoop_Invoker &); // = delete; | ||
}; | ||
|
||
void calcHist( InputArray _src, OutputArray _hist ) | ||
{ | ||
INITIALIZATION_CHECK; | ||
|
||
CV_Assert(!_src.empty()); | ||
int type = _src.type(); | ||
CV_Assert(type == CV_8UC1); | ||
|
||
_hist.create( cv::Size(256, 1), CV_32SC1 ); | ||
Mat src = _src.getMat(); | ||
Mat hist = _hist.getMat(); | ||
|
||
for( int i = 0; i < 256; i++ ) | ||
hist.ptr<int>()[i] = 0; | ||
|
||
cv::Mutex histogramLockInstance; | ||
|
||
int nStripes = cv::getNumThreads();//(src.cols*src.rows)/(1<<8); | ||
int stripeHeight = src.rows / nStripes; | ||
|
||
cv::parallel_for_(cv::Range(0, nStripes), | ||
FcvHistogramLoop_Invoker(src.data, src.step[0], src.cols, src.rows, hist.ptr<int>(), stripeHeight, &histogramLockInstance, nStripes), nStripes); | ||
} | ||
|
||
} // fastcv:: | ||
} // cv:: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters