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

remove hardcoded values

Browse Source
This commit is contained in:
marina.kolpakova 2012-11-14 14:36:59 +04:00
parent 8acfbde68e
commit a30bbda3bd
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gpu/src/cuda/isf-sc.cu
View File

@ -181,6 +181,7 @@ __device void CascadeInvoker<Policy>::detect(Detection* objects, const uint ndet
int st = level.octave * level.step; int st = level.octave * level.step;
const int stEnd = st + level.step; const int stEnd = st + level.step;
const int hogluvStep = gridDim.y * Policy::STA_Y;
float confidence = 0.f; float confidence = 0.f;
for(; st < stEnd; st += Policy::WARP) for(; st < stEnd; st += Policy::WARP)
{ {
@ -189,13 +190,13 @@ __device void CascadeInvoker<Policy>::detect(Detection* objects, const uint ndet
Node node = nodes[nId]; Node node = nodes[nId];
float threshold = rescale<isUp>(level, node); float threshold = rescale<isUp>(level, node);
int sum = get<isUp>(x, y + (node.threshold >> 28) * 120, node.rect); int sum = get<isUp>(x, y + (node.threshold >> 28) * hogluvStep, node.rect);
int next = 1 + (int)(sum >= threshold); int next = 1 + (int)(sum >= threshold);
node = nodes[nId + next]; node = nodes[nId + next];
threshold = rescale<isUp>(level, node); threshold = rescale<isUp>(level, node);
sum = get<isUp>(x, y + (node.threshold >> 28) * 120, node.rect); sum = get<isUp>(x, y + (node.threshold >> 28) * hogluvStep, node.rect);
const int lShift = (next - 1) * 2 + (int)(sum >= threshold); const int lShift = (next - 1) * 2 + (int)(sum >= threshold);
float impact = leaves[(st + threadIdx.x) * 4 + lShift]; float impact = leaves[(st + threadIdx.x) * 4 + lShift];

2
modules/gpu/src/icf.hpp
View File

@ -130,7 +130,7 @@ struct CascadeInvoker
{ {
CascadeInvoker(): levels(0), stages(0), nodes(0), leaves(0), scales(0) {} CascadeInvoker(): levels(0), stages(0), nodes(0), leaves(0), scales(0) {}
CascadeInvoker(const PtrStepSzb& _levels, const PtrStepSzb& _octaves, const PtrStepSzf& _stages, CascadeInvoker(const PtrStepSzb& _levels, const PtrStepSzf& _stages,
const PtrStepSzb& _nodes, const PtrStepSzf& _leaves) const PtrStepSzb& _nodes, const PtrStepSzf& _leaves)
: levels((const Level*)_levels.ptr()), : levels((const Level*)_levels.ptr()),
stages((const float*)_stages.ptr()), stages((const float*)_stages.ptr()),

11
modules/gpu/src/softcascade.cpp
View File

@ -316,7 +316,7 @@ struct cv::gpu::SCascade::Fields
cudaMemset(count.data, 0, sizeof(Detection)); cudaMemset(count.data, 0, sizeof(Detection));
cudaSafeCall( cudaGetLastError()); cudaSafeCall( cudaGetLastError());
device::icf::CascadeInvoker<device::icf::GK107PolicyX4> invoker device::icf::CascadeInvoker<device::icf::GK107PolicyX4> invoker
= device::icf::CascadeInvoker<device::icf::GK107PolicyX4>(levels, octaves, stages, nodes, leaves); = device::icf::CascadeInvoker<device::icf::GK107PolicyX4>(levels, stages, nodes, leaves);
invoker(roi, hogluv, objects, count, downscales, stream); invoker(roi, hogluv, objects, count, downscales, stream);
} }
@ -414,7 +414,7 @@ private:
void integrate(const int fh, const int fw, Stream& s) void integrate(const int fh, const int fw, Stream& s)
{ {
GpuMat channels(plane, cv::Rect(0, 0, fw, fh * Fields::HOG_LUV_BINS)); GpuMat channels(plane, cv::Rect(0, 0, fw, fh * Fields::HOG_LUV_BINS));
cv::gpu::resize(channels, shrunk, cv::Size(), 0.25, 0.25, CV_INTER_AREA, s); cv::gpu::resize(channels, shrunk, cv::Size(), 1.f / shrinkage, 1.f / shrinkage, CV_INTER_AREA, s);
if (info.majorVersion() < 3) if (info.majorVersion() < 3)
cv::gpu::integralBuffered(shrunk, hogluv, integralBuffer, s); cv::gpu::integralBuffered(shrunk, hogluv, integralBuffer, s);
@ -518,7 +518,7 @@ void cv::gpu::SCascade::detect(InputArray image, InputArray _rois, OutputArray _
GpuMat tmp = GpuMat(objects, cv::Rect(0, 0, sizeof(Detection), 1)); GpuMat tmp = GpuMat(objects, cv::Rect(0, 0, sizeof(Detection), 1));
objects = GpuMat(objects, cv::Rect( sizeof(Detection), 0, objects.cols - sizeof(Detection), 1)); objects = GpuMat(objects, cv::Rect( sizeof(Detection), 0, objects.cols - sizeof(Detection), 1));
cudaStream_t stream = StreamAccessor::getStream(s); cudaStream_t stream = StreamAccessor::getStream(s);
flds.detect(rois, tmp, objects, stream); flds.detect(rois, tmp, objects, stream);
@ -527,13 +527,14 @@ void cv::gpu::SCascade::detect(InputArray image, InputArray _rois, OutputArray _
void cv::gpu::SCascade::genRoi(InputArray _roi, OutputArray _mask, Stream& stream) const void cv::gpu::SCascade::genRoi(InputArray _roi, OutputArray _mask, Stream& stream) const
{ {
CV_Assert(fields); CV_Assert(fields);
int shr = (*fields).shrinkage;
const GpuMat roi = _roi.getGpuMat(); const GpuMat roi = _roi.getGpuMat();
_mask.create( roi.cols / 4, roi.rows / 4, roi.type() ); _mask.create( roi.cols / shr, roi.rows / shr, roi.type() );
GpuMat mask = _mask.getGpuMat(); GpuMat mask = _mask.getGpuMat();
cv::gpu::GpuMat tmp; cv::gpu::GpuMat tmp;
cv::gpu::resize(roi, tmp, cv::Size(), 0.25, 0.25, CV_INTER_AREA, stream); cv::gpu::resize(roi, tmp, cv::Size(), 1.f / shr, 1.f / shr, CV_INTER_AREA, stream);
cv::gpu::transpose(tmp, mask, stream); cv::gpu::transpose(tmp, mask, stream);
} }