Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
584eed63
Commit
584eed63
authored
Jan 12, 2015
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cvtColor Lab 2 RGB u8
parent
05e21015
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
96 additions
and
2 deletions
+96
-2
perf_cvt_color.cpp
modules/imgproc/perf/perf_cvt_color.cpp
+1
-1
color.cpp
modules/imgproc/src/color.cpp
+95
-1
No files found.
modules/imgproc/perf/perf_cvt_color.cpp
View file @
584eed63
...
...
@@ -204,7 +204,7 @@ PERF_TEST_P(Size_CvtMode, cvtColor8u,
)
{
Size
sz
=
GetParam
();
int
mode
=
COLOR_
HLS
2RGB
;
int
mode
=
COLOR_
Lab
2RGB
;
ChPair
ch
=
getConversionInfo
(
mode
);
mode
%=
COLOR_COLORCVT_MAX
;
...
...
modules/imgproc/src/color.cpp
View file @
584eed63
...
...
@@ -5331,14 +5331,51 @@ struct Lab2RGB_b
v_scale
=
vdupq_n_f32
(
255.
f
);
v_alpha
=
vdup_n_u8
(
ColorChannel
<
uchar
>::
max
());
v_128
=
vdupq_n_f32
(
128.0
f
);
#elif CV_SSE2
v_scale_inv
=
_mm_set1_ps
(
100.
f
/
255.
f
);
v_scale
=
_mm_set1_ps
(
255.
f
);
v_128
=
_mm_set1_ps
(
128.0
f
);
v_zero
=
_mm_setzero_si128
();
#endif
}
#if CV_SSE2
// 16s x 8
void
process
(
__m128i
v_r
,
__m128i
v_g
,
__m128i
v_b
,
float
*
buf
)
const
{
__m128
v_r0
=
_mm_cvtepi32_ps
(
_mm_unpacklo_epi16
(
v_r
,
v_zero
));
__m128
v_g0
=
_mm_cvtepi32_ps
(
_mm_unpacklo_epi16
(
v_g
,
v_zero
));
__m128
v_b0
=
_mm_cvtepi32_ps
(
_mm_unpacklo_epi16
(
v_b
,
v_zero
));
__m128
v_r1
=
_mm_cvtepi32_ps
(
_mm_unpackhi_epi16
(
v_r
,
v_zero
));
__m128
v_g1
=
_mm_cvtepi32_ps
(
_mm_unpackhi_epi16
(
v_g
,
v_zero
));
__m128
v_b1
=
_mm_cvtepi32_ps
(
_mm_unpackhi_epi16
(
v_b
,
v_zero
));
v_r0
=
_mm_mul_ps
(
v_r0
,
v_scale_inv
);
v_r1
=
_mm_mul_ps
(
v_r1
,
v_scale_inv
);
v_g0
=
_mm_sub_ps
(
v_g0
,
v_128
);
v_g1
=
_mm_sub_ps
(
v_g1
,
v_128
);
v_b0
=
_mm_sub_ps
(
v_b0
,
v_128
);
v_b1
=
_mm_sub_ps
(
v_b1
,
v_128
);
_MM_INTERLIV_PS
(
v_r0
,
v_r1
,
v_g0
,
v_g1
,
v_b0
,
v_b1
)
_mm_store_ps
(
buf
,
v_r0
);
_mm_store_ps
(
buf
+
4
,
v_r1
);
_mm_store_ps
(
buf
+
8
,
v_g0
);
_mm_store_ps
(
buf
+
12
,
v_g1
);
_mm_store_ps
(
buf
+
16
,
v_b0
);
_mm_store_ps
(
buf
+
20
,
v_b1
);
}
#endif
void
operator
()(
const
uchar
*
src
,
uchar
*
dst
,
int
n
)
const
{
int
i
,
j
,
dcn
=
dstcn
;
uchar
alpha
=
ColorChannel
<
uchar
>::
max
();
float
buf
[
3
*
BLOCK_SIZE
];
CV_DECL_ALIGNED
(
16
)
float
buf
[
3
*
BLOCK_SIZE
];
for
(
i
=
0
;
i
<
n
;
i
+=
BLOCK_SIZE
,
src
+=
BLOCK_SIZE
*
3
)
{
...
...
@@ -5364,6 +5401,38 @@ struct Lab2RGB_b
v_dst
.
val
[
2
]
=
vsubq_f32
(
vcvtq_f32_u32
(
vmovl_u16
(
vget_high_u16
(
v_t2
))),
v_128
);
vst3q_f32
(
buf
+
j
+
12
,
v_dst
);
}
#elif CV_SSE2
for
(
;
j
<=
(
dn
-
32
)
*
3
;
j
+=
96
)
{
__m128i
v_r0
=
_mm_loadu_si128
((
__m128i
const
*
)(
src
+
j
));
__m128i
v_r1
=
_mm_loadu_si128
((
__m128i
const
*
)(
src
+
j
+
16
));
__m128i
v_g0
=
_mm_loadu_si128
((
__m128i
const
*
)(
src
+
j
+
32
));
__m128i
v_g1
=
_mm_loadu_si128
((
__m128i
const
*
)(
src
+
j
+
48
));
__m128i
v_b0
=
_mm_loadu_si128
((
__m128i
const
*
)(
src
+
j
+
64
));
__m128i
v_b1
=
_mm_loadu_si128
((
__m128i
const
*
)(
src
+
j
+
80
));
_MM_DEINTERLIV_EPI8
(
v_r0
,
v_r1
,
v_g0
,
v_g1
,
v_b0
,
v_b1
)
process
(
_mm_unpacklo_epi8
(
v_r0
,
v_zero
),
_mm_unpacklo_epi8
(
v_g0
,
v_zero
),
_mm_unpacklo_epi8
(
v_b0
,
v_zero
),
buf
+
j
);
process
(
_mm_unpackhi_epi8
(
v_r0
,
v_zero
),
_mm_unpackhi_epi8
(
v_g0
,
v_zero
),
_mm_unpackhi_epi8
(
v_b0
,
v_zero
),
buf
+
j
+
24
);
process
(
_mm_unpacklo_epi8
(
v_r1
,
v_zero
),
_mm_unpacklo_epi8
(
v_g1
,
v_zero
),
_mm_unpacklo_epi8
(
v_b1
,
v_zero
),
buf
+
j
+
48
);
process
(
_mm_unpackhi_epi8
(
v_r1
,
v_zero
),
_mm_unpackhi_epi8
(
v_g1
,
v_zero
),
_mm_unpackhi_epi8
(
v_b1
,
v_zero
),
buf
+
j
+
72
);
}
#endif
for
(
;
j
<
dn
*
3
;
j
+=
3
)
...
...
@@ -5404,6 +5473,28 @@ struct Lab2RGB_b
vst3_u8
(
dst
,
v_dst
);
}
}
#elif CV_SSE2
if
(
dcn
==
3
)
{
for
(
;
j
<=
(
dn
*
3
-
16
);
j
+=
16
,
dst
+=
16
)
{
__m128
v_src0
=
_mm_mul_ps
(
_mm_load_ps
(
buf
+
j
),
v_scale
);
__m128
v_src1
=
_mm_mul_ps
(
_mm_load_ps
(
buf
+
j
+
4
),
v_scale
);
__m128
v_src2
=
_mm_mul_ps
(
_mm_load_ps
(
buf
+
j
+
8
),
v_scale
);
__m128
v_src3
=
_mm_mul_ps
(
_mm_load_ps
(
buf
+
j
+
12
),
v_scale
);
__m128i
v_dst0
=
_mm_packs_epi32
(
_mm_cvtps_epi32
(
v_src0
),
_mm_cvtps_epi32
(
v_src1
));
__m128i
v_dst1
=
_mm_packs_epi32
(
_mm_cvtps_epi32
(
v_src2
),
_mm_cvtps_epi32
(
v_src3
));
_mm_storeu_si128
((
__m128i
*
)
dst
,
_mm_packus_epi16
(
v_dst0
,
v_dst1
));
}
int
jr
=
j
%
3
;
if
(
jr
)
dst
-=
jr
,
j
-=
jr
;
}
#endif
for
(
;
j
<
dn
*
3
;
j
+=
3
,
dst
+=
dcn
)
...
...
@@ -5423,6 +5514,9 @@ struct Lab2RGB_b
#if CV_NEON
float32x4_t
v_scale
,
v_scale_inv
,
v_128
;
uint8x8_t
v_alpha
;
#elif CV_SSE2
__m128
v_scale
,
v_scale_inv
,
v_128
;
__m128i
v_zero
;
#endif
};
...
...
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