Skip to content

fix redundant func in image pre-process #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lexuszhi1990 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix redundant func in image pre-process #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions prj_ncnn/cpp/DBface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,20 @@ int DBface::pre_process(ncnn::Mat image, ncnn::Mat &out) {
ncnn::resize_bilinear(image, in, fixed_w, fixed_h);
}

int c, h, w;
c = in.c;
h = in.h;
w = in.w;
float *data = (float *)(in.data);

for (int i = 0; i < c; ++i) {
for (int j = 0; j < h; ++j) {
for (int k = 0; k < w; ++k) {
data[i*h*w + j*w + k] /= 255;
in.substract_mean_normalize(mean_value, std_value);

#ifdef DEBUG
{
for (int c = 0; c < in.c; c++)
{
const ncnn::Mat m = in.channel(c);
const float* ptr = m.row(0);
{
printf("in %d %f\n", 0, ptr[0]);
}
}
}

in.substract_mean_normalize(mean_value, std_value);
#endif

image_h = in.h;
image_w = in.w;
Expand Down
4 changes: 2 additions & 2 deletions prj_ncnn/cpp/DBface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class DBface{

ncnn::Net net;

const float mean_value[3] = {0.408f, 0.447f, 0.47f};
const float std_value[3] = {1/0.289f, 1/0.274f, 1/0.278f};
const float mean_value[3] = {0.408f * 255.0, 0.447f * 255.0, 0.47f * 255.0};
const float std_value[3] = {1 / 0.289f / 255.0, 1 / 0.274f / 255.0, 1 / 0.278f / 255.0};
int fixed_h = 2220; // for fixed size inference
int fixed_w = 3072;
float fix_scale_h = 1.f;
Expand Down