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

[move sift.cpp] Use TLS instead of mutex in SIFT

Browse Source 
original commit: ab43a3b2d9
This commit is contained in:
Woody Chow 2017-05-31 15:08:32 +09:00
parent b6d636214e
commit 0f0dea79fc
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/features2d/src/sift.cpp
View File

@ -550,8 +550,7 @@ public:
double _sigma, double _sigma,
const std::vector<Mat>& _gauss_pyr, const std::vector<Mat>& _gauss_pyr,
const std::vector<Mat>& _dog_pyr, const std::vector<Mat>& _dog_pyr,
std::vector<KeyPoint>& _keypoints, TLSData<std::vector<KeyPoint> > &_tls_kpts_struct)
Mutex &_mutex)
: o(_o), : o(_o),
i(_i), i(_i),
@ -565,8 +564,7 @@ public:
sigma(_sigma), sigma(_sigma),
gauss_pyr(_gauss_pyr), gauss_pyr(_gauss_pyr),
dog_pyr(_dog_pyr), dog_pyr(_dog_pyr),
keypoints(_keypoints), tls_kpts_struct(_tls_kpts_struct) { }
mutex(_mutex) { }
void operator()( const cv::Range& range ) const void operator()( const cv::Range& range ) const
{ {
const int begin = range.start; const int begin = range.start;
@ -579,6 +577,8 @@ public:
const Mat& prev = dog_pyr[idx-1]; const Mat& prev = dog_pyr[idx-1];
const Mat& next = dog_pyr[idx+1]; const Mat& next = dog_pyr[idx+1];
std::vector<KeyPoint> *tls_kpts = tls_kpts_struct.get();
KeyPoint kpt; KeyPoint kpt;
for( int r = begin; r < end; r++) for( int r = begin; r < end; r++)
{ {
@ -636,8 +636,7 @@ public:
if(std::abs(kpt.angle - 360.f) < FLT_EPSILON) if(std::abs(kpt.angle - 360.f) < FLT_EPSILON)
kpt.angle = 0.f; kpt.angle = 0.f;
{ {
AutoLock autoLock(mutex); tls_kpts->push_back(kpt);
keypoints.push_back(kpt);
} }
} }
} }
@ -655,8 +654,7 @@ private:
double sigma; double sigma;
const std::vector<Mat>& gauss_pyr; const std::vector<Mat>& gauss_pyr;
const std::vector<Mat>& dog_pyr; const std::vector<Mat>& dog_pyr;
std::vector<KeyPoint>& keypoints; TLSData<std::vector<KeyPoint> > &tls_kpts_struct;
Mutex &mutex;
}; };
// //
@ -669,7 +667,7 @@ void SIFT_Impl::findScaleSpaceExtrema( const std::vector<Mat>& gauss_pyr, const
const int threshold = cvFloor(0.5 * contrastThreshold / nOctaveLayers * 255 * SIFT_FIXPT_SCALE); const int threshold = cvFloor(0.5 * contrastThreshold / nOctaveLayers * 255 * SIFT_FIXPT_SCALE);
keypoints.clear(); keypoints.clear();
Mutex mutex; TLSData<std::vector<KeyPoint> > tls_kpts_struct;
for( int o = 0; o < nOctaves; o++ ) for( int o = 0; o < nOctaves; o++ )
for( int i = 1; i <= nOctaveLayers; i++ ) for( int i = 1; i <= nOctaveLayers; i++ )
@ -686,8 +684,14 @@ void SIFT_Impl::findScaleSpaceExtrema( const std::vector<Mat>& gauss_pyr, const
contrastThreshold, contrastThreshold,
edgeThreshold, edgeThreshold,
sigma, sigma,
gauss_pyr, dog_pyr, keypoints, mutex)); gauss_pyr, dog_pyr, tls_kpts_struct));
} }
std::vector<std::vector<KeyPoint>*> kpt_vecs;
tls_kpts_struct.gather(kpt_vecs);
for (size_t i = 0; i < kpt_vecs.size(); ++i) {
keypoints.insert(keypoints.end(), kpt_vecs[i]->begin(), kpt_vecs[i]->end());
}
} }