Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
dbfec2a8
Commit
dbfec2a8
authored
Feb 01, 2017
by
Angie Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add convolve-round experiment
Change-Id: I02a019b1c11b3ee4ae32d424cb6ef2f8ae554824
parent
c957af9c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
14 deletions
+11
-14
av1/common/convolve.c
av1/common/convolve.c
+2
-2
av1/common/convolve.h
av1/common/convolve.h
+2
-6
av1/common/reconinter.c
av1/common/reconinter.c
+6
-6
configure
configure
+1
-0
No files found.
av1/common/convolve.c
View file @
dbfec2a8
...
...
@@ -197,7 +197,7 @@ void av1_convolve_vert_facade(const uint8_t *src, int src_stride, uint8_t *dst,
}
}
#if CONVOLVE_
POST_
ROUND
ING
#if
CONFIG_
CONVOLVE_ROUND
void
av1_convolve_rounding
(
const
int32_t
*
src
,
int
src_stride
,
uint8_t
*
dst
,
int
dst_stride
,
int
w
,
int
h
)
{
int
r
,
c
;
...
...
@@ -208,7 +208,7 @@ void av1_convolve_rounding(const int32_t *src, int src_stride, uint8_t *dst,
}
}
}
#endif // CONVOLVE_
POST_
ROUND
ING
#endif //
CONFIG_
CONVOLVE_ROUND
void
av1_convolve
(
const
uint8_t
*
src
,
int
src_stride
,
uint8_t
*
dst
,
int
dst_stride
,
int
w
,
int
h
,
...
...
av1/common/convolve.h
View file @
dbfec2a8
...
...
@@ -17,10 +17,6 @@
extern
"C"
{
#endif
#if CONFIG_DUAL_FILTER
#define CONVOLVE_POST_ROUNDING 1
#endif
typedef
enum
CONVOLVE_OPT
{
// indicate the results in dst buf is rounded by FILTER_BITS or not
CONVOLVE_OPT_ROUND
,
...
...
@@ -41,7 +37,7 @@ static INLINE ConvolveParams get_conv_params(int ref) {
return
conv_params
;
}
#if CONVOLVE_
POST_
ROUND
ING
#if
CONFIG_
CONVOLVE_ROUND
static
INLINE
ConvolveParams
get_conv_params_no_round
(
int
ref
,
int32_t
*
dst
,
int
dst_stride
)
{
ConvolveParams
conv_params
;
...
...
@@ -54,7 +50,7 @@ static INLINE ConvolveParams get_conv_params_no_round(int ref, int32_t *dst,
void
av1_convolve_rounding
(
const
int32_t
*
src
,
int
src_stride
,
uint8_t
*
dst
,
int
dst_stride
,
int
w
,
int
h
);
#endif // CONVOLVE_
POST_
ROUND
ING
#endif //
CONFIG_
CONVOLVE_ROUND
void
av1_convolve
(
const
uint8_t
*
src
,
int
src_stride
,
uint8_t
*
dst
,
int
dst_stride
,
int
w
,
int
h
,
...
...
av1/common/reconinter.c
View file @
dbfec2a8
...
...
@@ -917,9 +917,9 @@ void build_inter_predictors(MACROBLOCKD *xd, int plane,
uint8_t
*
pre
[
2
];
MV32
scaled_mv
[
2
];
SubpelParams
subpel_params
[
2
];
#if CONVOLVE_
POST_
ROUND
ING
#if
CONFIG_
CONVOLVE_ROUND
int32_t
tmp_dst
[
MAX_SB_SIZE
*
MAX_SB_SIZE
];
#endif // CONVOLVE_
POST_
ROUND
ING
#endif //
CONFIG_
CONVOLVE_ROUND
for
(
ref
=
0
;
ref
<
1
+
is_compound
;
++
ref
)
{
const
struct
scale_factors
*
const
sf
=
&
xd
->
block_refs
[
ref
]
->
sf
;
...
...
@@ -971,12 +971,12 @@ void build_inter_predictors(MACROBLOCKD *xd, int plane,
for
(
ref
=
0
;
ref
<
1
+
is_compound
;
++
ref
)
{
const
struct
scale_factors
*
const
sf
=
&
xd
->
block_refs
[
ref
]
->
sf
;
struct
buf_2d
*
const
pre_buf
=
&
pd
->
pre
[
ref
];
#if CONVOLVE_
POST_
ROUND
ING
#if
CONFIG_
CONVOLVE_ROUND
ConvolveParams
conv_params
=
get_conv_params_no_round
(
ref
,
tmp_dst
,
MAX_SB_SIZE
);
#else
ConvolveParams
conv_params
=
get_conv_params
(
ref
);
#endif // CONVOLVE_
POST_
ROUND
ING
#endif //
CONFIG_
CONVOLVE_ROUND
#if CONFIG_EXT_INTER
if
(
ref
&&
is_masked_compound_type
(
mi
->
mbmi
.
interinter_compound_data
.
type
))
...
...
@@ -1009,7 +1009,7 @@ void build_inter_predictors(MACROBLOCKD *xd, int plane,
subpel_params
[
ref
].
xs
,
subpel_params
[
ref
].
ys
,
xd
);
}
#if CONVOLVE_
POST_
ROUND
ING
#if
CONFIG_
CONVOLVE_ROUND
// TODO(angiebird): This part needs optimization
#if CONFIG_AOM_HIGHBITDEPTH
if
(
!
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
))
...
...
@@ -1017,7 +1017,7 @@ void build_inter_predictors(MACROBLOCKD *xd, int plane,
#else
av1_convolve_rounding
(
tmp_dst
,
MAX_SB_SIZE
,
dst
,
dst_buf
->
stride
,
w
,
h
);
#endif
#endif // CONVOLVE_
POST_
ROUND
ING
#endif //
CONFIG_
CONVOLVE_ROUND
}
}
...
...
configure
View file @
dbfec2a8
...
...
@@ -254,6 +254,7 @@ EXPERIMENT_LIST="
rect_tx
ref_mv
dual_filter
convolve_round
ext_tx
tx64x64
sub8x8_mc
...
...
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