Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
a29472ab
You need to sign in or sign up before continuing.
Commit
a29472ab
authored
Nov 10, 2013
by
Davis King
Browse files
Made extract_fhog_features() and resize_image() a little faster.
parent
d92b33de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
28 deletions
+26
-28
dlib/image_transforms/fhog.h
dlib/image_transforms/fhog.h
+22
-22
dlib/image_transforms/interpolation.h
dlib/image_transforms/interpolation.h
+4
-6
No files found.
dlib/image_transforms/fhog.h
View file @
a29472ab
...
@@ -403,8 +403,8 @@ namespace dlib
...
@@ -403,8 +403,8 @@ namespace dlib
// We will use bilinear interpolation to add into the histogram bins.
// We will use bilinear interpolation to add into the histogram bins.
// So first we precompute the values needed to determine how much each
// So first we precompute the values needed to determine how much each
// pixel votes into each bin.
// pixel votes into each bin.
simd4f
xp
=
(
xx
+
0.5
)
/
(
float
)
cell_size
-
0.5
;
simd4f
xp
=
(
xx
+
0.5
)
/
(
float
)
cell_size
+
0.5
;
simd4
f
ixp
=
floor
(
xp
);
simd4
i
ixp
=
simd4i
(
xp
);
simd4f
vx0
=
xp
-
ixp
;
simd4f
vx0
=
xp
-
ixp
;
simd4f
vx1
=
1.0
f
-
vx0
;
simd4f
vx1
=
1.0
f
-
vx0
;
...
@@ -438,31 +438,31 @@ namespace dlib
...
@@ -438,31 +438,31 @@ namespace dlib
simd4f
v00
=
vy0
*
vx0
;
simd4f
v00
=
vy0
*
vx0
;
float
_best_o
[
4
];
best_o
.
store
(
_best_o
);
float
_best_o
[
4
];
best_o
.
store
(
_best_o
);
float
_ixp
[
4
];
ixp
.
store
(
_ixp
);
int32
_ixp
[
4
];
ixp
.
store
(
_ixp
);
float
_v11
[
4
];
v11
.
store
(
_v11
);
float
_v11
[
4
];
v11
.
store
(
_v11
);
float
_v01
[
4
];
v01
.
store
(
_v01
);
float
_v01
[
4
];
v01
.
store
(
_v01
);
float
_v10
[
4
];
v10
.
store
(
_v10
);
float
_v10
[
4
];
v10
.
store
(
_v10
);
float
_v00
[
4
];
v00
.
store
(
_v00
);
float
_v00
[
4
];
v00
.
store
(
_v00
);
hist
[
iyp
+
1
]
[
_ixp
[
0
]
+
1
](
_best_o
[
0
])
+=
_v11
[
0
];
hist
[
iyp
+
1
]
[
_ixp
[
0
]
](
_best_o
[
0
])
+=
_v11
[
0
];
hist
[
iyp
+
1
+
1
][
_ixp
[
0
]
+
1
](
_best_o
[
0
])
+=
_v01
[
0
];
hist
[
iyp
+
1
+
1
][
_ixp
[
0
]
](
_best_o
[
0
])
+=
_v01
[
0
];
hist
[
iyp
+
1
]
[
_ixp
[
0
]
+
2
](
_best_o
[
0
])
+=
_v10
[
0
];
hist
[
iyp
+
1
]
[
_ixp
[
0
]
+
1
](
_best_o
[
0
])
+=
_v10
[
0
];
hist
[
iyp
+
1
+
1
][
_ixp
[
0
]
+
2
](
_best_o
[
0
])
+=
_v00
[
0
];
hist
[
iyp
+
1
+
1
][
_ixp
[
0
]
+
1
](
_best_o
[
0
])
+=
_v00
[
0
];
hist
[
iyp
+
1
]
[
_ixp
[
1
]
+
1
](
_best_o
[
1
])
+=
_v11
[
1
];
hist
[
iyp
+
1
]
[
_ixp
[
1
]
](
_best_o
[
1
])
+=
_v11
[
1
];
hist
[
iyp
+
1
+
1
][
_ixp
[
1
]
+
1
](
_best_o
[
1
])
+=
_v01
[
1
];
hist
[
iyp
+
1
+
1
][
_ixp
[
1
]
](
_best_o
[
1
])
+=
_v01
[
1
];
hist
[
iyp
+
1
]
[
_ixp
[
1
]
+
2
](
_best_o
[
1
])
+=
_v10
[
1
];
hist
[
iyp
+
1
]
[
_ixp
[
1
]
+
1
](
_best_o
[
1
])
+=
_v10
[
1
];
hist
[
iyp
+
1
+
1
][
_ixp
[
1
]
+
2
](
_best_o
[
1
])
+=
_v00
[
1
];
hist
[
iyp
+
1
+
1
][
_ixp
[
1
]
+
1
](
_best_o
[
1
])
+=
_v00
[
1
];
hist
[
iyp
+
1
]
[
_ixp
[
2
]
+
1
](
_best_o
[
2
])
+=
_v11
[
2
];
hist
[
iyp
+
1
]
[
_ixp
[
2
]
](
_best_o
[
2
])
+=
_v11
[
2
];
hist
[
iyp
+
1
+
1
][
_ixp
[
2
]
+
1
](
_best_o
[
2
])
+=
_v01
[
2
];
hist
[
iyp
+
1
+
1
][
_ixp
[
2
]
](
_best_o
[
2
])
+=
_v01
[
2
];
hist
[
iyp
+
1
]
[
_ixp
[
2
]
+
2
](
_best_o
[
2
])
+=
_v10
[
2
];
hist
[
iyp
+
1
]
[
_ixp
[
2
]
+
1
](
_best_o
[
2
])
+=
_v10
[
2
];
hist
[
iyp
+
1
+
1
][
_ixp
[
2
]
+
2
](
_best_o
[
2
])
+=
_v00
[
2
];
hist
[
iyp
+
1
+
1
][
_ixp
[
2
]
+
1
](
_best_o
[
2
])
+=
_v00
[
2
];
hist
[
iyp
+
1
]
[
_ixp
[
3
]
+
1
](
_best_o
[
3
])
+=
_v11
[
3
];
hist
[
iyp
+
1
]
[
_ixp
[
3
]
](
_best_o
[
3
])
+=
_v11
[
3
];
hist
[
iyp
+
1
+
1
][
_ixp
[
3
]
+
1
](
_best_o
[
3
])
+=
_v01
[
3
];
hist
[
iyp
+
1
+
1
][
_ixp
[
3
]
](
_best_o
[
3
])
+=
_v01
[
3
];
hist
[
iyp
+
1
]
[
_ixp
[
3
]
+
2
](
_best_o
[
3
])
+=
_v10
[
3
];
hist
[
iyp
+
1
]
[
_ixp
[
3
]
+
1
](
_best_o
[
3
])
+=
_v10
[
3
];
hist
[
iyp
+
1
+
1
][
_ixp
[
3
]
+
2
](
_best_o
[
3
])
+=
_v00
[
3
];
hist
[
iyp
+
1
+
1
][
_ixp
[
3
]
+
1
](
_best_o
[
3
])
+=
_v00
[
3
];
}
}
// Now process the right columns that don't fit into simd registers.
// Now process the right columns that don't fit into simd registers.
for
(;
x
<
visible_nc
;
x
++
)
for
(;
x
<
visible_nc
;
x
++
)
...
...
dlib/image_transforms/interpolation.h
View file @
a29472ab
...
@@ -653,10 +653,9 @@ namespace dlib
...
@@ -653,10 +653,9 @@ namespace dlib
for
(;
c
<
num_simd_blocks
;
c
+=
4
)
for
(;
c
<
num_simd_blocks
;
c
+=
4
)
{
{
_x
+=
_x_scale
;
_x
+=
_x_scale
;
simd4f
_left
=
floor
(
_x
);
simd4i
left
=
simd4i
(
_x
);
simd4i
left
=
simd4i
(
_left
);
simd4f
_lr_frac
=
_x
-
_
left
;
simd4f
_lr_frac
=
_x
-
left
;
simd4f
_inv_lr_frac
=
1
-
_lr_frac
;
simd4f
_inv_lr_frac
=
1
-
_lr_frac
;
simd4i
right
=
left
+
1
;
simd4i
right
=
left
+
1
;
...
@@ -752,9 +751,8 @@ namespace dlib
...
@@ -752,9 +751,8 @@ namespace dlib
for
(;
c
<
num_simd_blocks
;
c
+=
4
)
for
(;
c
<
num_simd_blocks
;
c
+=
4
)
{
{
_x
+=
_x_scale
;
_x
+=
_x_scale
;
simd4f
_left
=
floor
(
_x
);
simd4i
left
=
simd4i
(
_x
);
simd4i
left
=
simd4i
(
_left
);
simd4f
lr_frac
=
_x
-
left
;
simd4f
lr_frac
=
_x
-
_left
;
simd4f
_inv_lr_frac
=
1
-
lr_frac
;
simd4f
_inv_lr_frac
=
1
-
lr_frac
;
simd4i
right
=
left
+
1
;
simd4i
right
=
left
+
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment